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

fixed undefined gain enum to a large number

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-03-15 16:10:10 +01:00
parent 1633cc3f01
commit 6ad6c9e8bb
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorGui/src/qTabSettings.cpp
View File

@ -102,7 +102,9 @@ void qTabSettings::SetupDetectorSettings(){
// Get detector settings from detector // Get detector settings from detector
slsDetectorDefs::detectorSettings sett = myDet->getSettings();cout<<"sett:"<<sett<<endl; slsDetectorDefs::detectorSettings sett = myDet->getSettings();cout<<"sett:"<<sett<<endl;
qDefs::checkErrorMessage(myDet,"qTabSettings::SetupDetectorSettings"); qDefs::checkErrorMessage(myDet,"qTabSettings::SetupDetectorSettings");
if(sett==-1) sett = slsDetectorDefs::UNDEFINED; if(sett==-1) sett = Undefined;
else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
// To be able to index items on a combo box // To be able to index items on a combo box
model = qobject_cast<QStandardItemModel*>(comboSettings->model()); model = qobject_cast<QStandardItemModel*>(comboSettings->model());
if (model) { if (model) {
@ -216,7 +218,9 @@ void qTabSettings::setSettings(int index){
qDefs::Message(qDefs::WARNING,"Cannot change settings to Undefined or Uninitialized.","qTabSettings::setSettings"); qDefs::Message(qDefs::WARNING,"Cannot change settings to Undefined or Uninitialized.","qTabSettings::setSettings");
disconnect(comboSettings, SIGNAL(currentIndexChanged(int)), this, SLOT(setSettings(int))); disconnect(comboSettings, SIGNAL(currentIndexChanged(int)), this, SLOT(setSettings(int)));
int sett = (int)myDet->getSettings(); int sett = (int)myDet->getSettings();
if(sett==-1) sett = slsDetectorDefs::UNDEFINED; if(sett==-1) sett = Undefined;
else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
comboSettings->setCurrentIndex(sett); comboSettings->setCurrentIndex(sett);
connect(comboSettings, SIGNAL(currentIndexChanged(int)), this, SLOT(setSettings(int))); connect(comboSettings, SIGNAL(currentIndexChanged(int)), this, SLOT(setSettings(int)));
} }
@ -331,7 +335,9 @@ void qTabSettings::Refresh(){
cout << "Getting settings" << endl; cout << "Getting settings" << endl;
#endif #endif
int sett = (int)myDet->getSettings(); int sett = (int)myDet->getSettings();
if(sett==-1) sett = slsDetectorDefs::UNDEFINED; if(sett==-1) sett = Undefined;//slsDetectorDefs::UNDEFINED;
else if(sett == slsDetectorDefs::UNDEFINED) sett = Undefined;
else if(sett == slsDetectorDefs::UNINITIALIZED) sett = Uninitialized;
comboSettings->setCurrentIndex(sett); comboSettings->setCurrentIndex(sett);