From 7701531ff3db1bafb3c42a520bbc260ea785ed13 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 7 May 2013 14:20:43 +0000 Subject: [PATCH] fixed the undefined state of gui when acquisition stopped git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@177 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/src/qDrawPlot.cpp | 6 +++--- slsDetectorGui/src/qTabMeasurement.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index fd03df578..ab783fcea 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -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; diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index c301c5f45..6fe050669 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -323,6 +323,7 @@ void qTabMeasurement::startStopAcquisition(){ #endif emit StopSignal(); myDet->stopAcquisition(); + myDet->waitForReceiverReadToFinish(); UpdateProgress(); //spin index