updated plot to show index instead of frame number

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@35 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-21 11:53:23 +00:00
parent 40af9384b5
commit 1ce04ef785
8 changed files with 185 additions and 108 deletions

View File

@ -137,6 +137,8 @@ private:
int currentMeasurement;
/** currentFrame */
int currentFrame;
/** current Index */
int currentIndex;
/** Number of Exposures */
int number_of_exposures;
/** Duration between Exposures */

View File

@ -167,6 +167,7 @@ signals:
void StartSignal();
void StopSignal();
void CheckPlotIntervalSignal();
void EnableNthFrameSignal(bool);
};

View File

@ -16,6 +16,8 @@ class multiSlsDetector;
class qDrawPlot;
/** Qt Include Headers */
#include <QStackedLayout>
#include <QButtonGroup>
#include <QAbstractButton>
/**
*@short sets up the Plot parameters
@ -51,12 +53,14 @@ private:
bool isOneD;
bool isOrginallyOneD;
int scanLevel[2];
/**whether to enable nth frame according to timing mode*/
bool enableNFrame;
QStackedLayout* stackedLayout;
QSpinBox *spinNthFrame;
QDoubleSpinBox *spinTimeGap;
QComboBox *comboTimeGapUnit;
QStackedLayout *stackedLayout;
QSpinBox *spinNthFrame;
QDoubleSpinBox *spinTimeGap;
QComboBox *comboTimeGapUnit;
QButtonGroup *btnGroupScan;
/** some Default Values */
static QString defaultPlotTitle;
@ -75,6 +79,11 @@ private:
*/
void Initialization();
/** This enabled/disables the nth frame from frequency plot
* @param enable enable/disable
*/
void EnablingNthFrameFunction(bool enable);
@ -85,9 +94,18 @@ 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(int mode,int id);
void EnableScanBox(int mode=-1,int id=-1);
/** a variable is set when timing mode has been changed.
* This variable is also disabled if exptime>acq period to be on safe side
* Its to check whether to enabled nth frame for frequency plot
* @param enable enable/disable
*/
void EnableNthFrame(bool enable){enableNFrame = enable;};
/** Sets the scan argument of the plot
*/
void SetScanArgument();
private slots:
@ -119,7 +137,6 @@ signals:
void DisableZoomSignal(bool);
void SetZRangeSignal(double,double);
void EnableZRangeSignal(bool);
void ThresholdScanSignal(int);
};