enhancement:plotting interval changed to red for error

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@88 af1100a4-978c-4157-bff7-07162d2ba061

slsDetectorGui/include/qTabActions.h

@@ -50,35 +50,13 @@ public:
 
 
 public slots:
-/** Disable Positions
- * @param enable true if to disable
- * */
-void EnablePositions(bool enable);
+	/** Disable Positions
+	 * @param enable true if to disable
+	 * */
+	void EnablePositions(bool enable);
 
 
 private:
-	/** Sets up the widget */
-	void SetupWidgetWindow();
-
-	/** Sets up all the slots and signals */
-	void Initialization();
-
-	/** creates the Num Positions object */
-	void CreatePositionsWidget();
-
-	/** Returns the index in each of the classes
-	 * of actionwidget and scanwidget
-	 * @param index the index in the list of all widgets
-	 * returns actual index of the class
-	 */
-	int GetActualIndex(int index);
-
-	/** Updates to green color if collapsed and mode not none
-	 */
-	void UpdateCollapseColors();
-
-
-
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
@@ -124,21 +102,46 @@ private:
 	QIcon		*iconPlus;
 	QIcon		*iconMinus;
 
+
+	/** Sets up the widget */
+	void SetupWidgetWindow();
+
+	/** Sets up all the slots and signals */
+	void Initialization();
+
+	/** creates the Num Positions object */
+	void CreatePositionsWidget();
+
+	/** Returns the index in each of the classes
+	 * of actionwidget and scanwidget
+	 * @param index the index in the list of all widgets
+	 * returns actual index of the class
+	 */
+	int GetActualIndex(int index);
+
+	/** Updates to green color if collapsed and mode not none
+	 */
+	void UpdateCollapseColors();
+
+
+
+
 private slots:
-/** To Expand the Action Widget
- * */
-void Expand(QAbstractButton *button);
+	/** To Expand the Action Widget
+	 * */
+	void Expand(QAbstractButton *button);
 
-/** Sets the positions list and the number of positions
- * */
-void SetPosition();
+	/** Sets the positions list and the number of positions
+	 * */
+	void SetPosition();
+
+	/** Deletes current position
+	 * */
+	void DeletePosition();
 
-/** Deletes current position
- * */
-void DeletePosition();
 
 signals:
-void EnableScanBox();
+	void EnableScanBox();
 
 };
 

slsDetectorGui/include/qTabMeasurement.h

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

slsDetectorGui/include/qTabPlot.h

@@ -48,8 +48,43 @@ public:
 
 
 private:
+	/** The sls detector object */
+	multiSlsDetector *myDet;
+
+	/** The Plot widget	 */
+	qDrawPlot *myPlot;
+
+	/** 1d/2d plot	 */
+	bool isOneD;
+	bool isOrginallyOneD;
+
+	/**is set if its a possible wrong interval between plots*/
+	bool wrongInterval;
+
+	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];
+
+	/** error palette*/
+	QPalette *red;
+	QString intervalTip;
+
+
+
 
-/** methods */
 	/** Sets up the widget
 	 */
 	void SetupWidgetWindow();
@@ -66,91 +101,52 @@ private:
 
 
 public slots:
-/** Set frequency between plots*/
-void SetFrequency();
-/** Enable Scan box
- */
-void EnableScanBox();
+	/** Set frequency between plots*/
+	void SetFrequency();
 
-/** 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;};
-
-
-
-
-
-/** Disables scanbox while running
- * @param disable true to disable
- */
-//void DisableScanBoxWhileRunning(bool disable);
+	/** Enable Scan box
+	 */
+	void EnableScanBox();
 
 
 
 private slots:
-/** Selects the plot to display, enables/disables widgets
- * @param b true to select plot dimension 1, else false to select 2D
- */
-void Select1DPlot(bool b);
+	/** Selects the plot to display, enables/disables widgets
+	 * @param b true to select plot dimension 1, else false to select 2D
+	 */
+	void Select1DPlot(bool b);
 
-/**Enables Persistency depending on Superimpose checkbox */
-void EnablePersistency(bool enable);
+	/**Enables Persistency depending on Superimpose checkbox */
+	void EnablePersistency(bool enable);
 
-/**Sets the titles in plot axis */
-void SetTitles();
-/** Enables/Sets default Titles to default */
-void EnableTitles();
-/** Enables range of the axes */
-void EnableRange();
-/** Sets the range of the x and y axes */
-void SetAxesRange();
-/** Sets the range of the z axis */
-void SetZRange();
-/** Enables the range of the z axis */
-void EnableZRange();
-/** Set Plot to none, data graph, histogram*/
-void SetPlot();
+	/**Sets the titles in plot axis */
+	void SetTitles();
 
+	/** Enables/Sets default Titles to default */
+	void EnableTitles();
 
-private:
-/** The sls detector object */
-multiSlsDetector *myDet;
+	/** Enables range of the axes */
+	void EnableRange();
 
-/** The Plot widget	 */
-qDrawPlot *myPlot;
+	/** Sets the range of the x and y axes */
+	void SetAxesRange();
 
-/** 1d/2d plot	 */
-bool isOneD;
-bool isOrginallyOneD;
+	/** Sets the range of the z axis */
+	void SetZRange();
 
-/**whether to enable nth frame according to timing mode*/
-bool enableNFrame;
+	/** Enables the range of the z axis */
+	void EnableZRange();
 
-QStackedLayout	*stackedLayout;
-QSpinBox 		*spinNthFrame;
-QDoubleSpinBox 	*spinTimeGap;
-QComboBox 		*comboTimeGapUnit;
-QButtonGroup 	*btnGroupScan;
+	/** Set Plot to none, data graph, histogram*/
+	void SetPlot();
 
-/** 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);
-void EnableZRangeSignal(bool);
+	void DisableZoomSignal(bool);
+	void SetZRangeSignal(double,double);
+	void EnableZRangeSignal(bool);
+
 };