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

check error message in between implemented in gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@159 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-03-13 15:45:49 +00:00
parent bef3745693
commit f809657ec4
1 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorGui/src/qTabSettings.cpp
View File

@ -64,6 +64,7 @@ void qTabSettings::SetupWidgetWindow(){
default: comboDynamicRange->setCurrentIndex(0); break; default: comboDynamicRange->setCurrentIndex(0); break;
} }
qDefs::checkErrorMessage(myDet);
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@ -71,6 +72,7 @@ void qTabSettings::SetupWidgetWindow(){
void qTabSettings::SetupDetectorSettings(){ void qTabSettings::SetupDetectorSettings(){
// Get detector settings from detector // Get detector settings from detector
slsDetectorDefs::detectorSettings sett = myDet->getSettings(); slsDetectorDefs::detectorSettings sett = myDet->getSettings();
qDefs::checkErrorMessage(myDet);
if(sett==-1) sett = slsDetectorDefs::UNDEFINED; if(sett==-1) sett = slsDetectorDefs::UNDEFINED;
// 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());
@ -169,6 +171,8 @@ void qTabSettings::setSettings(int index){
if(expertMode) emit UpdateTrimbitSignal(0); if(expertMode) emit UpdateTrimbitSignal(0);
} }
} }
qDefs::checkErrorMessage(myDet);
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@ -184,6 +188,8 @@ void qTabSettings::SetNumberOfModules(int index){
cout << "ERROR: Setting number of modules to "<< i << endl; cout << "ERROR: Setting number of modules to "<< i << endl;
#endif #endif
spinNumModules->setValue(i); spinNumModules->setValue(i);
qDefs::checkErrorMessage(myDet);
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@ -217,7 +223,9 @@ void qTabSettings::SetDynamicRange(int index){
default: comboDynamicRange->setCurrentIndex(0); break; default: comboDynamicRange->setCurrentIndex(0); break;
} }
} }
};
qDefs::checkErrorMessage(myDet);
}
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@ -236,6 +244,8 @@ void qTabSettings::SetEnergy(){
disconnect(spinThreshold, SIGNAL(valueChanged(int)), this, SLOT(SetEnergy())); disconnect(spinThreshold, SIGNAL(valueChanged(int)), this, SLOT(SetEnergy()));
spinThreshold->setValue(ret); spinThreshold->setValue(ret);
connect(spinThreshold, SIGNAL(valueChanged(int)), this, SLOT(SetEnergy())); connect(spinThreshold, SIGNAL(valueChanged(int)), this, SLOT(SetEnergy()));
qDefs::checkErrorMessage(myDet);
} }
@ -299,6 +309,8 @@ void qTabSettings::Refresh(){
#ifdef VERBOSE #ifdef VERBOSE
cout << "**Updated Settings Tab" << endl << endl; cout << "**Updated Settings Tab" << endl << endl;
#endif #endif
qDefs::checkErrorMessage(myDet);
} }