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

fixed the undefined state of gui when acquisition stopped

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@177 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-05-07 14:20:43 +00:00
parent 8e19beb410
commit 7701531ff3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -323,10 +323,10 @@ void qDrawPlot::StartStopDaqToggle(bool stop_if_running){
//get #scansets for level 0 and level 1
int numScan0 = myDet->getScanSteps(0); numScan0 = ((numScan0==0)?1:numScan0);
int numScan1 = myDet->getScanSteps(1); numScan1 = ((numScan1==0)?1:numScan1);
int numPos=myDet->getPositions();
number_of_exposures = number_of_frames * numScan0 * numScan1;
if(anglePlot) number_of_exposures = numScan0 * numScan1;
if(anglePlot) number_of_exposures = numScan0 * numScan1;// * numPos;
cout << "\tNumber of Exposures Per Measurement:" << number_of_exposures << endl;
@ -622,7 +622,7 @@ int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, void *this_pointe
int qDrawPlot::GetData(detectorData *data,int fIndex){
#ifdef VERBOSE
#ifdef VERYVERBOSE
cout << "******Entering GetDatafunction********" << endl;
cout << "fname " << data->fileName << endl;
cout << "npoints " << data->npoints << endl;

1
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -323,6 +323,7 @@ void qTabMeasurement::startStopAcquisition(){
#endif
emit StopSignal();
myDet->stopAcquisition();
myDet->waitForReceiverReadToFinish();
UpdateProgress();
//spin index