detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-09-15 13:27:18 +02:00
commit b78dcf869b
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorGui/forms/form_tab_advanced.ui
View File

@ -142,7 +142,7 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>15</y> <y>15</y>
<width>242</width> <width>226</width>
<height>44</height> <height>44</height>
</rect> </rect>
</property> </property>
@ -783,6 +783,9 @@ An extension given by the modules serial number will be attached.
<height>25</height> <height>25</height>
</rect> </rect>
</property> </property>
<property name="minimum">
<number>-1</number>
</property>
<property name="maximum"> <property name="maximum">
<number>63</number> <number>63</number>
</property> </property>

10
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -1131,15 +1131,7 @@ void qTabAdvanced::updateAllTrimbitsFromServer(){
int ret = myDet->setAllTrimbits(-1); int ret = myDet->setAllTrimbits(-1);
qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer"); qDefs::checkErrorMessage(myDet,"qTabAdvanced::updateAllTrimbitsFromServer");
if(ret<0){ spinSetAllTrimbits->setValue(ret);
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);
connect(spinSetAllTrimbits, SIGNAL(editingFinished()), this, SLOT(SetAllTrimbits())); connect(spinSetAllTrimbits, SIGNAL(editingFinished()), this, SLOT(SetAllTrimbits()));
} }