Skip to content
This repository has been archived by the owner on Mar 24, 2022. It is now read-only.

Commit

Permalink
Merge branch 'S2Innovation-s2i-new-alarm-fix' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sergirubio committed Feb 23, 2018
2 parents 803bdbe + b201382 commit e6ca531
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions README → README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
===================

Expand Down
2 changes: 1 addition & 1 deletion panic/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def setModel(self,model):

def updateStyle(self,extra=''):
self.setAlignment(QtCore.Qt.AlignCenter)
obj = self.alarm #obj = self.getModelValueObj()
obj = getattr(self,'alarm',None)
#print('AlarmValueLabel.updateStyle(%s,%s)'%(type(obj),obj))
if hasattr(obj,'active'):
value = obj.active
Expand Down

0 comments on commit e6ca531

Please sign in to comment.