a rough idea of a scan is implemented with all frames

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@37 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-21 16:52:41 +00:00
parent cc176ea404
commit 73152572a5
5 changed files with 185 additions and 142 deletions

View File

@ -126,6 +126,8 @@ void SavePlot();
void SetPersistency(int val);
/** sets style of plot to dotted */
void SetDottedPlot(bool enable){plotDotted = enable;};
/** sets the scan argument to prepare the plot*/
void SetScanArgument(int scanArg){scanArgument = scanArg;};
@ -166,10 +168,7 @@ static void* DataStartAcquireThread(void *this_pointer);
static int GetDataCallBack(detectorData *data, void *this_pointer);
/** This is called by the GetDataCallBack function to copy the data */
int GetData(detectorData *data);
/** This is called by the detector class to copy the scan data it jus acquired */
static int GetScanDataCallBack(detectorData *data, void *this_pointer);
/** This is called by the GetDataCallBack function to copy the scan data */
int GetScanData(detectorData *data);
@ -195,7 +194,7 @@ void UpdatePause(){data_pause_over=true;};
private:
/** The sls detector object */
multiSlsDetector *myDet;
@ -329,7 +328,8 @@ bool isFrameEnabled;
bool isTriggerEnabled;
/** scan arguments*/
enum scanArguments{None,Level0,Level1,FileIndex,AllFrames};
enum scanArgumentList{None,Level0,Level1,FileIndex,AllFrames};
int scanArgument;