checking if probes or threshold ..shouldnt check if its the wrong detector unnecessary err printouts

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@225 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-08-12 12:21:49 +00:00
parent 440b244b66
commit eb48b1c492
5 changed files with 94 additions and 14 deletions

View File

@ -69,7 +69,8 @@ void qTabMeasurement::SetupWidgetWindow(){
//gates
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
//probes
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN)
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
//File Index
@ -820,11 +821,12 @@ void qTabMeasurement::Refresh(){
#endif
//probes
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN){
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of probes" << endl;
#endif
}
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
#ifdef VERBOSE
@ -889,7 +891,8 @@ void qTabMeasurement::EnableProbes(){
return;
}
cout << "Probes not enabled" << endl;
spinNumProbes->setValue(0);
if(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)
spinNumProbes->setValue(0);
lblNumProbes->setEnabled(false);
spinNumProbes->setEnabled(false);
}