Mergi "New Alarm" button fix from S2innovation

tango-controls · Feb 23, 2018 · e7e8e16 · e7e8e16
2 parents 803bdbe + e25eec5
commit e7e8e16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/README → README.rst b/README → README.rst
@@ -25,9 +25,15 @@ The optional panic submodules are:
  panic.ds : PyAlarm device server
  panic.gui :  Placeholder for the PanicGUI application
 
+See the docs at: http://www.pythonhosted.org/panic
+
+Recipes are also available at: https://github.com/tango-controls/PANIC/tree/documentation/doc/recipes
+
 Get the latest release of Panic from: https://github.com/tango-controls/PANIC/releases
+
 See CHANGE log in panic/CHANGES file
 
+
 Other Project pages
 ===================
 

diff --git a/panic/widgets.py b/panic/widgets.py
@@ -111,7 +111,10 @@ def setModel(self,model):
 
     def updateStyle(self,extra=''):
         self.setAlignment(QtCore.Qt.AlignCenter)
-        obj = self.alarm #obj = self.getModelValueObj()
+        if hasattr(self, 'alarm'): 
+            obj = self.alarm 
+        else:
+	    obj = {}
         #print('AlarmValueLabel.updateStyle(%s,%s)'%(type(obj),obj))
         if hasattr(obj,'active'):
             value = obj.active