detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-19 10:21:05 +01: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@163 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-03-13 15:50:41 +00:00
parent 9e1029185f
commit 3e81c16f38
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorGui/src/qTabDeveloper.cpp
View File

@@ -146,7 +146,7 @@ void qTabDeveloper::SetupWidgetWindow(){
adcTimer = new QTimer(this); adcTimer = new QTimer(this);
} }
qDefs::checkErrorMessage(myDet);
} }
//------------------------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------------------------
@@ -214,6 +214,8 @@ void qTabDeveloper::SetDacValues(int id){
cout << "Setting dac:" << dacNames[id] << " : " << spinDacs[id]->value() << endl; cout << "Setting dac:" << dacNames[id] << " : " << spinDacs[id]->value() << endl;
#endif #endif
spinDacs[id]->setValue((double)myDet->setDAC((dacs_t)spinDacs[id]->value(),getSLSIndex(id))); spinDacs[id]->setValue((double)myDet->setDAC((dacs_t)spinDacs[id]->value(),getSLSIndex(id)));
qDefs::checkErrorMessage(myDet);
} }
@@ -226,6 +228,7 @@ void qTabDeveloper::SetHighVoltage(){
#endif #endif
int highvoltage = comboHV->currentText().toInt(); int highvoltage = comboHV->currentText().toInt();
int ret = myDet->setDAC(highvoltage,slsDetectorDefs::HV_POT); int ret = myDet->setDAC(highvoltage,slsDetectorDefs::HV_POT);
qDefs::checkErrorMessage(myDet);
//error //error
if(ret != highvoltage){ if(ret != highvoltage){
qDefs::Message(qDefs::CRITICAL,"High Voltage could not be set to this value.","Developer"); qDefs::Message(qDefs::CRITICAL,"High Voltage could not be set to this value.","Developer");
@@ -287,6 +290,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
break; break;
default: default:
qDefs::Message(qDefs::CRITICAL,string("Unknown detector type:")+myDet->slsDetectorBase::getDetectorType(detType),"Developer"); qDefs::Message(qDefs::CRITICAL,string("Unknown detector type:")+myDet->slsDetectorBase::getDetectorType(detType),"Developer");
qDefs::checkErrorMessage(myDet);
exit(-1); exit(-1);
break; break;
} }
@@ -305,6 +309,7 @@ void qTabDeveloper::RefreshAdcs(){
for(int i=0;i<NUM_ADC_WIDGETS;i++) for(int i=0;i<NUM_ADC_WIDGETS;i++)
spinAdcs[i]->setValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))); spinAdcs[i]->setValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));
adcTimer->start(ADC_TIMEOUT); adcTimer->start(ADC_TIMEOUT);
qDefs::checkErrorMessage(myDet);
} }
@@ -360,6 +365,8 @@ void qTabDeveloper::Refresh(){
#ifdef VERBOSE #ifdef VERBOSE
cout << "**Updated Developer Tab" << endl << endl; cout << "**Updated Developer Tab" << endl << endl;
#endif #endif
qDefs::checkErrorMessage(myDet);
} }