detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +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
parent 069d044e17 bcea5a99a1
commit b78dcf869b
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -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()));
}