From 0ca1e862e2c4fcf8aec8a2b4a8b792e2cfb1b378 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Mon, 5 Aug 2019 23:23:17 -0500
Subject: [PATCH] laser gui update

---
 dm/test_laser.ui | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/dm/test_laser.ui b/dm/test_laser.ui
index ce9693e..b1001f6 100644
--- a/dm/test_laser.ui
+++ b/dm/test_laser.ui
@@ -20,7 +20,7 @@
       <x>40</x>
       <y>120</y>
       <width>20</width>
-      <height>120</height>
+      <height>321</height>
      </rect>
     </property>
     <property name="channel" stdset="0">
@@ -30,8 +30,8 @@
    <widget class="caLed" name="caled">
     <property name="geometry">
      <rect>
-      <x>80</x>
-      <y>120</y>
+      <x>70</x>
+      <y>80</y>
       <width>30</width>
       <height>30</height>
      </rect>
@@ -43,50 +43,53 @@
    <widget class="caTextEntry" name="catextentry">
     <property name="geometry">
      <rect>
-      <x>120</x>
-      <y>130</y>
+      <x>110</x>
+      <y>300</y>
       <width>100</width>
       <height>22</height>
      </rect>
     </property>
    </widget>
-   <widget class="caLabel" name="calabel">
+   <widget class="caToggleButton" name="catogglebutton">
     <property name="geometry">
      <rect>
       <x>110</x>
-      <y>180</y>
-      <width>90</width>
-      <height>28</height>
+      <y>130</y>
+      <width>100</width>
+      <height>22</height>
      </rect>
     </property>
+    <property name="text">
+     <string>on/off</string>
+    </property>
     <property name="channel" stdset="0">
-     <string notr="true">daq:l1:gserial</string>
+     <string notr="true">daq:l1:switch</string>
     </property>
    </widget>
-   <widget class="caToggleButton" name="catogglebutton">
+   <widget class="caLineEdit" name="calineedit">
     <property name="geometry">
      <rect>
-      <x>100</x>
-      <y>180</y>
+      <x>110</x>
+      <y>220</y>
       <width>100</width>
-      <height>22</height>
+      <height>20</height>
      </rect>
     </property>
     <property name="channel" stdset="0">
-     <string notr="true">daq:l1:switch</string>
+     <string notr="true">daq:l1:glstat</string>
     </property>
    </widget>
-   <widget class="caLineEdit" name="calineedit">
+   <widget class="caLineEdit" name="calineedit_2">
     <property name="geometry">
      <rect>
       <x>110</x>
-      <y>220</y>
+      <y>250</y>
       <width>100</width>
       <height>20</height>
      </rect>
     </property>
     <property name="channel" stdset="0">
-     <string notr="true">daq:l1:glstat</string>
+     <string notr="true">daq:l1:gcur</string>
     </property>
    </widget>
   </widget>
@@ -102,11 +105,6 @@
    <extends>QCheckBox</extends>
    <header>caToggleButton</header>
   </customwidget>
-  <customwidget>
-   <class>caLabel</class>
-   <extends>QLabel</extends>
-   <header>caLabel</header>
-  </customwidget>
   <customwidget>
    <class>caLed</class>
    <extends>QWidget</extends>
-- 
GitLab