mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-29 01:20:02 +02:00
getting rid of undefined state in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@179 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
parent
e153c6fd58
commit
4fdacefdbe
@ -499,6 +499,7 @@ int pedestalCount;
|
|||||||
bool clientInitiated;
|
bool clientInitiated;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void UpdatingPlotFinished();
|
void UpdatingPlotFinished();
|
||||||
void InterpolateSignal(bool);
|
void InterpolateSignal(bool);
|
||||||
|
@ -272,9 +272,12 @@ void qTabMeasurement::DeInitialization(){
|
|||||||
void qTabMeasurement::Enable(bool enable){
|
void qTabMeasurement::Enable(bool enable){
|
||||||
frameTimeResolved->setEnabled(enable);
|
frameTimeResolved->setEnabled(enable);
|
||||||
frameNotTimeResolved->setEnabled(enable);
|
frameNotTimeResolved->setEnabled(enable);
|
||||||
|
|
||||||
//Enable this always
|
//Enable this always
|
||||||
if(!enable) btnStartStop->setEnabled(true);
|
//if(!enable) btnStartStop->setEnabled(true);
|
||||||
btnStartStop->setShortcut(QApplication::translate("TabMeasurementObject", "Shift+Space", 0, QApplication::UnicodeUTF8));
|
|
||||||
|
//shortcut each time, else it doesnt work a second time
|
||||||
|
btnStartStop->setShortcut(QApplication::translate("TabMeasurementObject", "Shift+Space", 0, QApplication::UnicodeUTF8));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -321,8 +324,9 @@ void qTabMeasurement::startStopAcquisition(){
|
|||||||
#ifdef VERBOSE
|
#ifdef VERBOSE
|
||||||
cout << "Stopping Acquisition" << endl<< endl;
|
cout << "Stopping Acquisition" << endl<< endl;
|
||||||
#endif
|
#endif
|
||||||
emit StopSignal();
|
//emit StopSignal(); commented out to prevent undefined state
|
||||||
myDet->stopAcquisition();
|
myDet->stopAcquisition();
|
||||||
|
/* commented out to prevent undefined state
|
||||||
myDet->waitForReceiverReadToFinish();
|
myDet->waitForReceiverReadToFinish();
|
||||||
|
|
||||||
UpdateProgress();
|
UpdateProgress();
|
||||||
@ -335,7 +339,7 @@ void qTabMeasurement::startStopAcquisition(){
|
|||||||
btnStartStop->setText("Start");
|
btnStartStop->setText("Start");
|
||||||
btnStartStop->setIcon(*iconStart);
|
btnStartStop->setIcon(*iconStart);
|
||||||
btnStartStop->setChecked(false);
|
btnStartStop->setChecked(false);
|
||||||
Enable(1);
|
Enable(1);*/
|
||||||
}
|
}
|
||||||
qDefs::checkErrorMessage(myDet);
|
qDefs::checkErrorMessage(myDet);
|
||||||
}
|
}
|
||||||
@ -345,7 +349,7 @@ void qTabMeasurement::startStopAcquisition(){
|
|||||||
|
|
||||||
|
|
||||||
void qTabMeasurement::UpdateFinished(){
|
void qTabMeasurement::UpdateFinished(){
|
||||||
if(btnStartStop->isChecked()){
|
//if(btnStartStop->isChecked()){
|
||||||
|
|
||||||
UpdateProgress();
|
UpdateProgress();
|
||||||
disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int)));
|
disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int)));
|
||||||
@ -361,7 +365,7 @@ void qTabMeasurement::UpdateFinished(){
|
|||||||
connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
|
connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
|
||||||
|
|
||||||
|
|
||||||
}
|
//}
|
||||||
qDefs::checkErrorMessage(myDet);
|
qDefs::checkErrorMessage(myDet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user