detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

fixed the dac problem

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@28 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-15 17:21:05 +00:00
parent 63bfdb9cb9
commit 30c11d7589
14 changed files with 214 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorGui/src/qScanWidget.cpp
View File

@ -323,9 +323,6 @@ void qScanWidget::SetMode(int mode){
//set the group box widgets
EnableSizeWidgets();
//emit signal to enable scanbox in plot tab
emit EnableScanBox(mode,id);
//set the mode
SetScan(mode);
}
@ -366,16 +363,20 @@ int qScanWidget::SetScan(int mode){
break;
}
//custom script
int actualMode = myDet->getScanMode(id);
if((mode==CustomScript)&&((script=="")||(script=="none"))){
return qDefs::OK;
}else{
if((mode!=myDet->getScanMode(id))&&(actualNumSteps)){
}else{//mode NOT set
if((mode!=actualMode)&&(actualNumSteps)){
qDefs::WarningMessage("The mode could not be changed for an unknown reason.","ScanWidget");
comboScript->setCurrentIndex(myDet->getScanMode(id));
comboScript->setCurrentIndex(actualMode);
return qDefs::FAIL;
}
}
emit EnableScanBox(actualMode,id);
return qDefs::OK;
}