From bcea5a99a1f8689faac193a822cbf78ceaec9a2e Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 15 Sep 2017 09:36:44 +0200
Subject: [PATCH] 1. bug fix: loading trimbits and gui complains of different
 trimbits and sets them all to zero. This is fixed. It just loads -1 to gui.
 2. Advanced Tab made slightly better aligned

---
 slsDetectorGui/forms/form_tab_advanced.ui |  5 ++++-
 slsDetectorGui/src/qTabAdvanced.cpp       | 10 +---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui
index 483549a82..6c7aefd6e 100644
--- a/slsDetectorGui/forms/form_tab_advanced.ui
+++ b/slsDetectorGui/forms/form_tab_advanced.ui
@@ -142,7 +142,7 @@
        <rect>
         <x>230</x>
         <y>15</y>
-        <width>242</width>
+        <width>226</width>
         <height>44</height>
        </rect>
       </property>
@@ -783,6 +783,9 @@ An extension given by the modules serial number will be attached.
         <height>25</height>
        </rect>
       </property>
+      <property name="minimum">
+       <number>-1</number>
+      </property>
       <property name="maximum">
        <number>63</number>
       </property>
diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp
index d98b80b85..e0b24e9a8 100644
--- a/slsDetectorGui/src/qTabAdvanced.cpp
+++ b/slsDetectorGui/src/qTabAdvanced.cpp
@@ -1131,15 +1131,7 @@ void qTabAdvanced::updateAllTrimbitsFromServer(){
 
 	int ret = myDet->setAllTrimbits(-1);
 	qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer");
-	if(ret<0){
-		qDefs::Message(qDefs::WARNING,"Inconsistent value from alltrimbits value.\n"
-				"Setting it for all detectors involved to 0.","qTabAdvanced::updateAllTrimbitsFromServer");
-		//set to default
-		spinSetAllTrimbits->setValue(0);
-		myDet->setAllTrimbits(0);
-		qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer");
-	}else
-		spinSetAllTrimbits->setValue(ret);
+	spinSetAllTrimbits->setValue(ret);
 
 	connect(spinSetAllTrimbits,	SIGNAL(editingFinished()),	this,	SLOT(SetAllTrimbits()));
 }