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

there was a gap between start and get status

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@154 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-03-06 10:16:48 +00:00
parent 448f333b1e
commit ab41ffb6bf
6 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorGui/include/qDrawPlot.h
View File

@ -116,6 +116,15 @@ public:
* */
int UpdateTrimbitPlot(bool fromDetector,bool Histogram);
/** This is set once client initiates start/stop acquisition
* and this is reset when the gui really starts/stops- to know when to return
*/
void SetClientInitiated(){clientInitiated = true;};
/** Get client intiated variable. This is set once client initiates start/stop acquisition
* and this is reset when the gui really starts/stops- to know when to return
*/
bool GetClientInitiated(){return clientInitiated;};
public slots:
/** To select 1D or 2D plot
@ -480,6 +489,10 @@ double* pedestalVals;
/** count for 20 frames to calculate the pedestal */
int pedestalCount;
/** this is set when client starts/stops acquisition
* and is reset once the gui really starts/stops */
bool clientInitiated;
signals:
void UpdatingPlotFinished();

4
slsDetectorGui/include/qTabMeasurement.h
View File

@ -15,7 +15,7 @@
/** Project Class Headers */
class multiSlsDetector;
/** Qt Project Class Headers */
class qDrawPlot;
#include "qDrawPlot.h"
/**
*@short sets up the measurement parameters
@ -55,7 +55,7 @@ public:
/** Click the Start/Stop Acquisition button
* This is used if this command came from gui client
*/
void ClickStartStop(){btnStartStop->click();};
void ClickStartStop(){btnStartStop->click();myPlot->SetClientInitiated();};
/** Returns progress bar value */
int GetProgress(){return progressBar->value();};