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 @@ 230 15 - 242 + 226 44 @@ -783,6 +783,9 @@ An extension given by the modules serial number will be attached. 25 + + -1 + 63 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())); }