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

getting rid of undefined state in gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@179 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-05-13 13:47:05 +00:00
parent e153c6fd58
commit 4fdacefdbe
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorGui/include/qDrawPlot.h
View File

@ -499,6 +499,7 @@ int pedestalCount;
bool clientInitiated;
signals:
void UpdatingPlotFinished();
void InterpolateSignal(bool);

16
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -272,9 +272,12 @@ void qTabMeasurement::DeInitialization(){
void qTabMeasurement::Enable(bool enable){
frameTimeResolved->setEnabled(enable);
frameNotTimeResolved->setEnabled(enable);
//Enable this always
if(!enable) btnStartStop->setEnabled(true);
btnStartStop->setShortcut(QApplication::translate("TabMeasurementObject", "Shift+Space", 0, QApplication::UnicodeUTF8));
//if(!enable) btnStartStop->setEnabled(true);
//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
cout << "Stopping Acquisition" << endl<< endl;
#endif
emit StopSignal();
//emit StopSignal(); commented out to prevent undefined state
myDet->stopAcquisition();
/* commented out to prevent undefined state
myDet->waitForReceiverReadToFinish();
UpdateProgress();
@ -335,7 +339,7 @@ void qTabMeasurement::startStopAcquisition(){
btnStartStop->setText("Start");
btnStartStop->setIcon(*iconStart);
btnStartStop->setChecked(false);
Enable(1);
Enable(1);*/
}
qDefs::checkErrorMessage(myDet);
}
@ -345,7 +349,7 @@ void qTabMeasurement::startStopAcquisition(){
void qTabMeasurement::UpdateFinished(){
if(btnStartStop->isChecked()){
//if(btnStartStop->isChecked()){
UpdateProgress();
disconnect(spinIndex, SIGNAL(valueChanged(int)), this, SLOT(setRunIndex(int)));
@ -361,7 +365,7 @@ void qTabMeasurement::UpdateFinished(){
connect(btnStartStop,SIGNAL(clicked()),this,SLOT(startStopAcquisition()));
}
//}
qDefs::checkErrorMessage(myDet);
}