From 8f7f43867c3a3b7ef0257f1702337a6fdbf746f2 Mon Sep 17 00:00:00 2001
From: physics group account <nneveu@slac.stanford.edu>
Date: Fri, 26 Jun 2020 20:53:40 -0700
Subject: [PATCH] Making my devPanel even better

---
 andy/MyFirstCode.py  |  18 ++++++++
 andy/MyFirstCode.pyc | Bin 0 -> 1199 bytes
 andy/MyFirstCode.py~ |  18 ++++++++
 andy/devPanelAndy.ui | 107 +++++++++++++++++++------------------------
 opsDevPanel.ui       |  19 ++++----
 5 files changed, 92 insertions(+), 70 deletions(-)
 create mode 100644 andy/MyFirstCode.py
 create mode 100644 andy/MyFirstCode.pyc
 create mode 100644 andy/MyFirstCode.py~

diff --git a/andy/MyFirstCode.py b/andy/MyFirstCode.py
new file mode 100644
index 0000000..d46784b
--- /dev/null
+++ b/andy/MyFirstCode.py
@@ -0,0 +1,18 @@
+from pydm import Display
+from PyQt5 import QtGui
+
+class Destructor(Display):
+ 
+    def __init__(self, parent=None, args=None):
+      super(Destructor, self).__init__(parent=parent, args=args)
+      self.ui.ETW.clicked.connect(self.AddProgress)
+    
+    def ui_filename(self):
+      return 'devPanelAndy.ui'
+      
+    def AddProgress(self):
+      self.ui.progressBar.setValue(self.ui.progressBar.value() + 1)
+      
+Armageddon = Destructor
+    
+    
diff --git a/andy/MyFirstCode.pyc b/andy/MyFirstCode.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d32038705d4c6d2405797e5914f928fb6e3b620f
GIT binary patch
literal 1199
zcmb_bO>fjN5FIDk7D}u31V@g9OLIWnD#W%xPpr0C1Y!?FQS9Ay$d_WLQl!1LKc)W=
z32}pYPGH3q8hIw;aXjzMNBnO`2S4t<f5~Wke15-XF;J41pn|9rv=k(;_o(ow^l9ny
z-X|q!B}fKzOLRl@c^QxjXgMJ{p+&gILG(|4Lcx~ZXZ1##rbzq2F=5A*z3j9-z>zYx
z?J`@pf6+PTBlDb<BCudkETUTvB$yyWGb}TMF`;-72K;q~R3HGkU@>Q`EH6P@ChJk|
z;r5n8dbIVJz9;w~_bCr3pHRMs@A7@R8B$+_h&HoGs!3Z_Sqq%BU7PR$LIcQjjcQ{L
zTlkVhSK20tg@@Bbgts3)xk_Y(&b}%+*mYH@%-TnMK9zFb*6UUo;}9K+QN=38?HHIL
z%b?5)wxUg4s;JrYMrS5U)6Q&ETSih{&(lg3QCi79df&g(t+5xiRHscJBMXQ@JQ7bu
zh8F!6S1+7!ffgai&&)BlW5_8-Jni(r1DE1MR{u}S6`<3}N*Ah1ONFs8fTtZlRKf9k
z#s)gXOQ4xM+s7<2^(TK?=TgvM>V_l6C_1oaEcJQXx{euTKc+>eTsN;_xlz5R{9-it
zh-FM_=6;cJRFE)_3UW@8vX)(eExItPE9E*C<E{&`tF^QKc@9t*Ko~a=-f{5IA4$R6
u^s<ckJq-7}zp^i5*KS;MOs8#`u9cK^bx(|3G0ukcUjfT8I}s<|<HKKG&GQ5R

literal 0
HcmV?d00001

diff --git a/andy/MyFirstCode.py~ b/andy/MyFirstCode.py~
new file mode 100644
index 0000000..90a13d9
--- /dev/null
+++ b/andy/MyFirstCode.py~
@@ -0,0 +1,18 @@
+from pydm import Display
+from PyQt5 import QtGui
+
+class Destructor(Display):
+ 
+    def __init__(self, parent=None, args=None):
+      super(Destructor, self).__init__(parent=parent, args=args)
+      self.ui.ETW.clicked.connect(self.AddProgress)
+    
+    def ui_filename(self):
+      return 'devPanelAndy.ui'
+      
+    def AddProgress(self):
+      self.ui.progressBar.value() += 1
+      
+Armageddon = Destructor
+    
+    
diff --git a/andy/devPanelAndy.ui b/andy/devPanelAndy.ui
index 995efa8..d41bfb3 100644
--- a/andy/devPanelAndy.ui
+++ b/andy/devPanelAndy.ui
@@ -13,71 +13,56 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="PyDMShellCommand" name="EndTheWorld">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>220</y>
-     <width>621</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="toolTip">
-    <string/>
-   </property>
-   <property name="text">
-    <string>End The World!!!</string>
-   </property>
-   <property name="commands" stdset="0">
-    <stringlist>
-     <string>pydm ~/opsTools/devPanel/example/example.py</string>
-    </stringlist>
-   </property>
-  </widget>
-  <widget class="QProgressBar" name="progressBar">
-   <property name="geometry">
-    <rect>
-     <x>19</x>
-     <y>446</y>
-     <width>601</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="value">
-    <number>27</number>
-   </property>
-   <property name="textDirection">
-    <enum>QProgressBar::TopToBottom</enum>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="enabled">
-    <bool>true</bool>
-   </property>
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>400</y>
-     <width>621</width>
-     <height>27</height>
-    </rect>
-   </property>
-   <property name="frameShape">
-    <enum>QFrame::NoFrame</enum>
-   </property>
-   <property name="text">
-    <string>Progress of current &quot;End The World!!!&quot; process:</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-   </property>
-  </widget>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>400</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="text">
+      <string>Progress of current &quot;End The World!!!&quot; process:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="PyDMPushButton" name="ETW">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="text">
+      <string>End The World!!!</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>27</number>
+     </property>
+     <property name="textDirection">
+      <enum>QProgressBar::TopToBottom</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PyDMShellCommand</class>
+   <class>PyDMPushButton</class>
    <extends>QPushButton</extends>
-   <header>pydm.widgets.shell_command</header>
+   <header>pydm.widgets.pushbutton</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/opsDevPanel.ui b/opsDevPanel.ui
index c37873b..bd88f63 100644
--- a/opsDevPanel.ui
+++ b/opsDevPanel.ui
@@ -14,32 +14,32 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
-    <widget class="PyDMRelatedDisplayButton" name="devPanelExample">
+   <item row="0" column="0">
+    <widget class="PyDMRelatedDisplayButton" name="devPanelLisa">
      <property name="toolTip">
       <string/>
      </property>
      <property name="text">
-      <string>Example Dev Panel</string>
+      <string>Lisa's Dev Panel</string>
      </property>
      <property name="filenames" stdset="0">
       <stringlist>
-       <string>example/example.py</string>
+       <string>lisa/devPanelLisa.ui</string>
       </stringlist>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="PyDMRelatedDisplayButton" name="devPanelLisa">
+   <item row="2" column="0">
+    <widget class="PyDMRelatedDisplayButton" name="devPanelExample">
      <property name="toolTip">
       <string/>
      </property>
      <property name="text">
-      <string>Lisa's Dev Panel</string>
+      <string>Example Dev Panel</string>
      </property>
      <property name="filenames" stdset="0">
       <stringlist>
-       <string>lisa/devPanelLisa.ui</string>
+       <string>example/example.py</string>
       </stringlist>
      </property>
     </widget>
@@ -54,7 +54,8 @@
      </property>
      <property name="filenames" stdset="0">
       <stringlist>
-       <string>andy/devPanelAndy.ui</string>
+       <string>/home/physics/aausherm/devPanel/andy/MyFirstCode.py</string>
+       <string>xterm -T ETW</string>
       </stringlist>
      </property>
     </widget>