change filename in plot only when you get to plot

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@58 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-17 12:12:25 +00:00
parent 4527e9f61b
commit 34d20aa712
5 changed files with 66 additions and 46 deletions

View File

@ -52,7 +52,7 @@ public:
int GetProgress(){return progress;};
/** sets plot Title */
void SetPlotTitle(QString title) {boxPlot->setTitle(title);}
void SetPlotTitle(QString title) {plotTitle = title;}
/** sets 1D X Axis Title */
void SetHistXAxisTitle(QString title) {histXAxisTitle = title;}
/** sets 1D Y Axis Title */
@ -116,7 +116,7 @@ public slots:
@param i is 1 for 1D, else 2D plot */
void SelectPlot(int i=2);
/** To select 1D plot */
void Select1DPlot() {Clear1DPlot();SelectPlot(1);}
void Select1DPlot() {SelectPlot(1);}
/** To select 2D plot */
void Select2DPlot() {SelectPlot(2);}
/** To clear plot */
@ -332,6 +332,8 @@ QString histYAxisTitle;
std::string histTitle[MAX_1DPLOTS];
/** Title in 2D */
std::string imageTitle;
/** plot Title */
QString plotTitle;
/** 1D or 2D */
unsigned int plot_in_scope;
/** Number of Pixels in X Axis */

View File

@ -42,37 +42,6 @@ public:
private:
/** The sls detector object */
multiSlsDetector *myDet;
/** The Plot widget */
qDrawPlot *myPlot;
/** 1d/2d plot */
bool isOneD;
bool isOrginallyOneD;
/**whether to enable nth frame according to timing mode*/
bool enableNFrame;
QStackedLayout *stackedLayout;
QSpinBox *spinNthFrame;
QDoubleSpinBox *spinTimeGap;
QComboBox *comboTimeGapUnit;
QButtonGroup *btnGroupScan;
/** some Default Values */
static QString defaultPlotTitle;
static QString defaultHistXAxisTitle;
static QString defaultHistYAxisTitle;
static QString defaultImageXAxisTitle;
static QString defaultImageYAxisTitle;
static QString defaultImageZAxisTitle;
/** scans */
static const QString modeNames[5];
/** methods */
/** Sets up the widget
@ -114,6 +83,12 @@ void SetScanArgument();
void Refresh();
/** Disables scanbox while running
* @param disable true to disable
*/
//void DisableScanBoxWhileRunning(bool disable);
private slots:
/** Selects the plot to display, enables/disables widgets
@ -140,6 +115,38 @@ void EnableZRange();
void SetPlot();
private:
/** The sls detector object */
multiSlsDetector *myDet;
/** The Plot widget */
qDrawPlot *myPlot;
/** 1d/2d plot */
bool isOneD;
bool isOrginallyOneD;
/**whether to enable nth frame according to timing mode*/
bool enableNFrame;
QStackedLayout *stackedLayout;
QSpinBox *spinNthFrame;
QDoubleSpinBox *spinTimeGap;
QComboBox *comboTimeGapUnit;
QButtonGroup *btnGroupScan;
/** some Default Values */
static QString defaultPlotTitle;
static QString defaultHistXAxisTitle;
static QString defaultHistYAxisTitle;
static QString defaultImageXAxisTitle;
static QString defaultImageYAxisTitle;
static QString defaultImageZAxisTitle;
/** scans */
static const QString modeNames[5];
signals:
void DisableZoomSignal(bool);
void SetZRangeSignal(double,double);