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

undefined enum fixed

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-03-15 17:33:40 +01:00
parent 6ad6c9e8bb
commit e7dbbf4c1f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qTabSettings.cpp
View File

@ -100,7 +100,7 @@ void qTabSettings::GetDynamicRange(int setvalue){
void qTabSettings::SetupDetectorSettings(){ void qTabSettings::SetupDetectorSettings(){
// Get detector settings from detector // Get detector settings from detector
slsDetectorDefs::detectorSettings sett = myDet->getSettings();cout<<"sett:"<<sett<<endl; int sett = (int)myDet->getSettings();cout<<"sett:"<<sett<<endl;
qDefs::checkErrorMessage(myDet,"qTabSettings::SetupDetectorSettings"); qDefs::checkErrorMessage(myDet,"qTabSettings::SetupDetectorSettings");
if(sett==-1) sett = Undefined; if(sett==-1) sett = Undefined;
else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined; else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
@ -185,7 +185,7 @@ void qTabSettings::SetupDetectorSettings(){
// detector settings selected NOT ENABLED. // detector settings selected NOT ENABLED.
// This should not happen -only if the server and gui has a mismatch // This should not happen -only if the server and gui has a mismatch
// on which all modes are allowed in detectors // on which all modes are allowed in detectors
if(!(item[(int)sett]->isEnabled())){ if(!(item[sett]->isEnabled())){
qDefs::Message(qDefs::CRITICAL,"Unknown Detector Settings retrieved from detector. Exiting GUI.","qTabSettings::SetupDetectorSettings"); qDefs::Message(qDefs::CRITICAL,"Unknown Detector Settings retrieved from detector. Exiting GUI.","qTabSettings::SetupDetectorSettings");
#ifdef VERBOSE #ifdef VERBOSE
cout << "ERROR: Unknown Detector Settings retrieved from detector." << endl; cout << "ERROR: Unknown Detector Settings retrieved from detector." << endl;
@ -193,7 +193,7 @@ void qTabSettings::SetupDetectorSettings(){
exit(-1); exit(-1);
} }
// Setting the detector settings // Setting the detector settings
else comboSettings->setCurrentIndex((int)sett); else comboSettings->setCurrentIndex(sett);
} }
} }