From 489fcceea2a8e553d37467c8aa6d848467ca0fd8 Mon Sep 17 00:00:00 2001 From: sergirubio Date: Tue, 10 Oct 2017 15:32:58 +0200 Subject: [PATCH 1/4] Update and rename README to README.rst --- README => README.rst | 4 ++++ 1 file changed, 4 insertions(+) rename README => README.rst (93%) diff --git a/README b/README.rst similarity index 93% rename from README rename to README.rst index 01f70260..ac31095e 100644 --- a/README +++ b/README.rst @@ -25,9 +25,13 @@ 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 =================== From 8a30bdbd83e1d01c75bc06e1e0eab00b6c23c65e Mon Sep 17 00:00:00 2001 From: sergirubio Date: Tue, 10 Oct 2017 15:33:49 +0200 Subject: [PATCH 2/4] Update README.rst --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index ac31095e..3ddf351c 100644 --- a/README.rst +++ b/README.rst @@ -26,9 +26,11 @@ The optional panic submodules are: 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 From e25eec54a461ee6a00247ff7b4a135c58a7b1ab1 Mon Sep 17 00:00:00 2001 From: Piotr Goryl Date: Mon, 19 Feb 2018 09:26:07 +0100 Subject: [PATCH 3/4] Fixing new alarm button --- panic/widgets.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/panic/widgets.py b/panic/widgets.py index e19cc2e9..8ed4a352 100644 --- 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 From b201382f23e5c4dc3bff8b233a9c75b4191afc68 Mon Sep 17 00:00:00 2001 From: srubio Date: Fri, 23 Feb 2018 11:23:40 +0100 Subject: [PATCH 4/4] Remove Tabs, simplify check --- panic/widgets.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/panic/widgets.py b/panic/widgets.py index 8ed4a352..d7587ca6 100644 --- a/panic/widgets.py +++ b/panic/widgets.py @@ -111,10 +111,7 @@ def setModel(self,model): def updateStyle(self,extra=''): self.setAlignment(QtCore.Qt.AlignCenter) - if hasattr(self, 'alarm'): - obj = self.alarm - else: - obj = {} + obj = getattr(self,'alarm',None) #print('AlarmValueLabel.updateStyle(%s,%s)'%(type(obj),obj)) if hasattr(obj,'active'): value = obj.active