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

fixed the dac problem

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@28 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-15 17:21:05 +00:00
parent 63bfdb9cb9
commit 30c11d7589
14 changed files with 214 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorGui/include/qDrawPlot.h
View File

@ -264,7 +264,10 @@ private:
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);
public slots:
/** To select 1D or 2D plot

2
slsDetectorGui/include/qScanWidget.h
View File

@ -145,7 +145,7 @@ void BrowseFileStepsPath();
signals:
void EnableScanBox(bool,int);
void EnableScanBox(int,int);
};

2
slsDetectorGui/include/qTabActions.h
View File

@ -111,7 +111,7 @@ void SetPosition();
void DeletePosition();
signals:
void EnableScanBox(bool,int);
void EnableScanBox(int,int);
};

12
slsDetectorGui/include/qTabMeasurement.h
View File

@ -98,6 +98,12 @@ void UpdateFinished();
*/
void SetCurrentMeasurement(int val);
/** Sets the timing mode
* @ param mode cane be None, Auto, Gated, Trigger Exposure Series,
* Trigger Frame, Trigger Readout, External Trigger Window
*/
void SetTimingMode(int mode);
private slots:
/** Set number of measurements
* @param num number of measurements to be set */
@ -117,12 +123,6 @@ void setRunIndex(int index);
*/
void startStopAcquisition();
/** Sets the timing mode
* @ param mode cane be None, Auto, Gated, Trigger Exposure Series,
* Trigger Frame, Trigger Readout, External Trigger Window
*/
void setTimingMode(int mode);
/** Set number of frames
* @param val number of frames to be set
*/

6
slsDetectorGui/include/qTabPlot.h
View File

@ -49,8 +49,9 @@ private:
/** 1d/2d plot */
bool isOneD;
bool isOrginallyOneD;
bool scanLevel[2];
int scanLevel[2];
QStackedLayout* stackedLayout;
QSpinBox *spinNthFrame;
@ -84,7 +85,7 @@ void SetFrequency();
* @param enable to enable the scan group box
* @param id is 0 if its scan level 0 or scan level 1
*/
void EnableScanBox(bool enable,int id);
void EnableScanBox(int mode,int id);
@ -118,6 +119,7 @@ signals:
void DisableZoomSignal(bool);
void SetZRangeSignal(double,double);
void EnableZRangeSignal(bool);
void ThresholdScanSignal(int);
};