From c31ee2d76fe272702ac216c90e73cf19eba1a6b8 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 4 Aug 2017 14:20:51 +0200
Subject: [PATCH] allowing -1 in gui for spinbox

---
 slsDetectorGui/forms/form_tab_advanced.ui    | 12 +++++------
 slsDetectorGui/forms/form_tab_measurement.ui | 22 +++++++++++++-------
 slsDetectorGui/gitInfo.txt                   | 10 ++++-----
 slsDetectorGui/include/gitInfoGui.h          |  8 +++----
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui
index 227ecd3e6..483549a82 100644
--- a/slsDetectorGui/forms/form_tab_advanced.ui
+++ b/slsDetectorGui/forms/form_tab_advanced.ui
@@ -77,7 +77,7 @@
        <rect>
         <x>25</x>
         <y>20</y>
-        <width>320</width>
+        <width>324</width>
         <height>31</height>
        </rect>
       </property>
@@ -142,7 +142,7 @@
        <rect>
         <x>230</x>
         <y>15</y>
-        <width>228</width>
+        <width>242</width>
         <height>44</height>
        </rect>
       </property>
@@ -198,7 +198,7 @@ Plots Trimbits from Detector. This will take time.
        <rect>
         <x>25</x>
         <y>20</y>
-        <width>187</width>
+        <width>195</width>
         <height>31</height>
        </rect>
       </property>
@@ -339,10 +339,10 @@ Plots Trimbits from Detector. This will take time.
           <bool>false</bool>
          </property>
          <property name="decimals">
-          <number>5</number>
+          <number>9</number>
          </property>
          <property name="minimum">
-          <double>0.000000000000000</double>
+          <double>-1.000000000000000</double>
          </property>
          <property name="maximum">
           <double>2000000000.000000000000000</double>
@@ -561,7 +561,7 @@ An extension given by the modules serial number will be attached.
           <number>3</number>
          </property>
          <property name="minimum">
-          <double>0.000000000000000</double>
+          <double>-1.000000000000000</double>
          </property>
          <property name="maximum">
           <double>10000.000000000000000</double>
diff --git a/slsDetectorGui/forms/form_tab_measurement.ui b/slsDetectorGui/forms/form_tab_measurement.ui
index 9290c74c9..4b325f5b0 100644
--- a/slsDetectorGui/forms/form_tab_measurement.ui
+++ b/slsDetectorGui/forms/form_tab_measurement.ui
@@ -241,7 +241,7 @@
         <string/>
        </property>
        <property name="minimum">
-        <number>0</number>
+        <number>-1</number>
        </property>
        <property name="maximum">
         <number>2000000000</number>
@@ -289,6 +289,9 @@
        <property name="decimals">
         <number>9</number>
        </property>
+       <property name="minimum">
+        <double>-1.000000000000000</double>
+       </property>
        <property name="maximum">
         <double>2000000000.000000000000000</double>
        </property>
@@ -401,7 +404,7 @@
         <string/>
        </property>
        <property name="minimum">
-        <number>0</number>
+        <number>-1</number>
        </property>
        <property name="maximum">
         <number>2000000000</number>
@@ -486,7 +489,7 @@ Maximum value is 3. &lt;br&gt;
         <string/>
        </property>
        <property name="minimum">
-        <number>0</number>
+        <number>-1</number>
        </property>
        <property name="maximum">
         <number>3</number>
@@ -586,7 +589,7 @@ Maximum value is 3. &lt;br&gt;
         <string/>
        </property>
        <property name="minimum">
-        <number>1</number>
+        <number>-1</number>
        </property>
        <property name="maximum">
         <number>2000000000</number>
@@ -638,10 +641,10 @@ Exposure Time of a frame.
         <bool>false</bool>
        </property>
        <property name="decimals">
-        <number>5</number>
+        <number>9</number>
        </property>
        <property name="minimum">
-        <double>0.000000000000000</double>
+        <double>-1.000000000000000</double>
        </property>
        <property name="maximum">
         <double>2000000000.000000000000000</double>
@@ -749,7 +752,10 @@ Frame period between exposures.
         <bool>false</bool>
        </property>
        <property name="decimals">
-        <number>5</number>
+        <number>9</number>
+       </property>
+       <property name="minimum">
+        <double>-1.000000000000000</double>
        </property>
        <property name="maximum">
         <double>2000000000.000000000000000</double>
@@ -966,7 +972,7 @@ Frame period between exposures.
         <string/>
        </property>
        <property name="minimum">
-        <number>0</number>
+        <number>-1</number>
        </property>
        <property name="maximum">
         <number>2000000000</number>
diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt
index a2d7a7979..3611c4750 100644
--- a/slsDetectorGui/gitInfo.txt
+++ b/slsDetectorGui/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorGui 
 URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git 
-Repsitory UUID: 3d4a8bf5fe9083caedea4cac98ce487cd7608edd 
-Revision: 412 
-Branch: cmakefix 
+Repsitory UUID: b7e546443bc168440632d8aa96e683bc4deada49 
+Revision: 413 
+Branch: 3.0-rc 
 Last Changed Author: Dhanya_Maliakal 
-Last Changed Rev: 412 
-Last Changed Date: 2017-07-27 10:34:37.000000002 +0200 ./include/qDebugStream.h
+Last Changed Rev: 413 
+Last Changed Date: 2017-08-03 17:23:11.000000002 +0200 ./src/qTabMessages.cpp
diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h
index 1e05df165..e45d16915 100644
--- a/slsDetectorGui/include/gitInfoGui.h
+++ b/slsDetectorGui/include/gitInfoGui.h
@@ -1,11 +1,11 @@
 //#define SVNPATH ""
 #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
 //#define SVNREPPATH ""
-#define SVNREPUUID "3d4a8bf5fe9083caedea4cac98ce487cd7608edd"
-//#define SVNREV 0x412
+#define SVNREPUUID "b7e546443bc168440632d8aa96e683bc4deada49"
+//#define SVNREV 0x413
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "Dhanya_Maliakal"
-#define SVNREV 0x412
-#define SVNDATE 0x20170727
+#define SVNREV 0x413
+#define SVNDATE 0x20170803
 //