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

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

diff --git a/dm/test_laser.ui b/dm/test_laser.ui
index 1923e62..18cca44 100644
--- a/dm/test_laser.ui
+++ b/dm/test_laser.ui
@@ -17,8 +17,8 @@
    <widget class="QGroupBox" name="groupBox">
     <property name="geometry">
      <rect>
-      <x>40</x>
-      <y>100</y>
+      <x>30</x>
+      <y>120</y>
       <width>241</width>
       <height>381</height>
      </rect>
@@ -43,28 +43,15 @@
      <property name="geometry">
       <rect>
        <x>50</x>
-       <y>40</y>
+       <y>50</y>
        <width>20</width>
-       <height>321</height>
+       <height>311</height>
       </rect>
      </property>
      <property name="channel" stdset="0">
       <string notr="true">daq:l1:glstat</string>
      </property>
     </widget>
-    <widget class="caTextEntry" name="catextentry">
-     <property name="geometry">
-      <rect>
-       <x>169</x>
-       <y>150</y>
-       <width>51</width>
-       <height>22</height>
-      </rect>
-     </property>
-     <property name="channel" stdset="0">
-      <string notr="true">daq:l1:scur</string>
-     </property>
-    </widget>
     <widget class="caToggleButton" name="catogglebutton">
      <property name="geometry">
       <rect>
@@ -110,7 +97,7 @@
     <widget class="caLineEdit" name="calineedit_2">
      <property name="geometry">
       <rect>
-       <x>169</x>
+       <x>170</x>
        <y>120</y>
        <width>51</width>
        <height>20</height>
@@ -150,7 +137,7 @@
      <property name="geometry">
       <rect>
        <x>80</x>
-       <y>150</y>
+       <y>160</y>
        <width>81</width>
        <height>16</height>
       </rect>
@@ -163,7 +150,7 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>10</y>
+       <y>20</y>
        <width>71</width>
        <height>20</height>
       </rect>
@@ -172,20 +159,54 @@
       <string notr="true">daq:l1:gserial</string>
      </property>
     </widget>
+    <widget class="caNumeric" name="canumeric">
+     <property name="geometry">
+      <rect>
+       <x>150</x>
+       <y>150</y>
+       <width>81</width>
+       <height>41</height>
+      </rect>
+     </property>
+     <property name="channel" stdset="0">
+      <string notr="true">daq:l1:scur</string>
+     </property>
+     <property name="precisionMode">
+      <enum>caNumeric::User</enum>
+     </property>
+     <property name="fixedFormat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </widget>
+   <widget class="caLabel" name="calabel">
+    <property name="geometry">
+     <rect>
+      <x>420</x>
+      <y>220</y>
+      <width>90</width>
+      <height>28</height>
+     </rect>
+    </property>
    </widget>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>caTextEntry</class>
-   <extends>caLineEdit</extends>
-   <header>caTextEntry</header>
+   <class>caNumeric</class>
+   <extends>QFrame</extends>
+   <header>caNumeric</header>
   </customwidget>
   <customwidget>
    <class>caToggleButton</class>
    <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