WIP

slsDetectorGui/include/qDrawPlot.h

@@ -67,18 +67,27 @@ public:
 	 * file index wont increase and so you need secondary titles to differentitate between plots*/
 	void SetFileWrite(bool enable){fileSaveEnable = enable;};
 
+
 	/**	sets plot Title prefix*/
 	void SetPlotTitlePrefix(QString title)      	{plotTitle_prefix = title;}
-	/**	sets 1D X Axis Title */
-	void SetHistXAxisTitle(QString title)   	{histXAxisTitle = title;}
-	/**	sets 1D Y Axis Title */
-	void SetHistYAxisTitle(QString title)   	{histYAxisTitle = title;}
-	/**	sets 2D X Axis Title */
-	void SetImageXAxisTitle(QString title)   {imageXAxisTitle = title;}
-	/**	sets 2D Y Axis Title */
-	void SetImageYAxisTitle(QString title)   {imageYAxisTitle = title;}
+	
+	void SetXAxisTitle(QString title) {
+		if(plot_in_scope==1) {
+			histXAxisTitle = title;
+		} else {
+			imageXAxisTitle = title;
+		}
+	}
+
+	void SetYAxisTitle(QString title) {
+		if(plot_in_scope==1) {
+			histYAxisTitle = title;
+		} else {
+			imageYAxisTitle = title;
+		}
+	}
 	/**	sets 2D Z Axis Title */
-	void SetImageZAxisTitle(QString title)   {imageZAxisTitle = title;}
+	void SetZAxisTitle(QString title)   {imageZAxisTitle = title;}
 	/** Disables zoom if any of the axes range are checked and fixed with a value */
 	void DisableZoom(bool disable);
 	/**	Enables plot from the plot tab*/
@@ -98,8 +107,6 @@ public:
 	 * @param xy is xmin,xmax,ymin or ymax */
 	void IsXYRangeValues(bool changed,qDefs::range xy){IsXYRange[xy]=changed;};
 
-	/** Get minimum Plot timer - between plots */
-	double GetMinimumPlotTimer(){return PLOT_TIMER_MS;};
 	/** Set Plot timer - between plots in ms*/
 	void SetPlotTimer(double time);
 	/** Set  Plot frame factor - between plots, also for receiver if exists */
@@ -500,9 +507,6 @@ double XYRangeValues[4];
 /**if the specific min/max of x/y is enabled */
 bool IsXYRange[4];
 
-/** Default timer between plots*/
-static const double PLOT_TIMER_MS;
-
 /** Specific timer value between plots */
 double timerValue;
 /** every nth frame when to plot */

slsDetectorGui/include/qTabPlot.h

@@ -24,36 +24,39 @@ public:
 
 public slots:
 	void SetFrequency();
-	 void EnableScanBox();
+	void EnableScanBox();
 
 private slots:
-	void Select1DPlot(bool b);
 
-	/**Enables Persistency depending on Superimpose checkbox */
+xxxxxxxxxxxxxxx
+	void Set1DPlotOptionsRight();
+	void Set1DPlotOptionsLeft();
+	void Set2DPlotOptionsRight();
+	void Set2DPlotOptionsLeft();
 	void EnablePersistency(bool enable);
-	void SetTitles();
-	void EnableTitles();
-	void checkAspectRatio();
-
-	/** maintain aspect ratio
-	 * @param axis axis to be changed: 0 for x(y axis values changed), 1 for y (xaxis values changes), -1 for the larger one (aspect ratio checked)
-	 */
-	void maintainAspectRatio(int axis);
-	void EnableXRange();
-	void EnableYRange();
-	void EnableRange();
-	void SetXAxisRange();
-	void SetYAxisRange();
-	void SetAxesRange();
-	void SetZRange();
-	void EnableZRange();
-	bool CheckZRange(QString value);
-	void SetPlot();
-	void SetPlotOptionsRightPage();
-	void SetPlotOptionsLeftPage();
 	void SetBinary();
-	void SetHistogramOptions();
-	void EnableGapPixels(bool enable);
+	void SetGapPixels(bool enable);
+	void SetTitles();
+	void SetXRange();
+	void SetYRange();
+	void CheckAspectRatio();
+	void SetXYRange();
+	/** 
+	 * Maintain aspect ratio 
+	 */
+	void MaintainAspectRatio(int dimension);
+	void SetZRange();
+
+
+
+
+	void Select1DPlot(bool b);
+	void SetPlot();
+
+
+
+
+
 
 signals:
 	void DisableZoomSignal(bool);
@@ -62,36 +65,30 @@ signals:
 private:
 	void SetupWidgetWindow();
 	void Initialization();
+	void GetGapPixels();
+	void EnableRange();
+	void SetAxesRange();
+	bool CheckZRange(QString value);
 
 	multiSlsDetector *myDet;
 	qDrawPlot *myPlot;
 	bool isOneD;
 	bool isOriginallyOneD;
 
-	/**is set if its a possible wrong interval between plots*/
-	bool wrongInterval;
-
+	QButtonGroup	*btnGroupPlotType;
+	/** interval between plots */
 	QStackedLayout	*stackedLayout;
 	QSpinBox 		*spinNthFrame;
 	QDoubleSpinBox 	*spinTimeGap;
 	QComboBox 		*comboTimeGapUnit;
-	QButtonGroup 	*btnGroupScan;
-	QButtonGroup	*btnGroupPlotType;
-	QButtonGroup	*btnGroupHistogram;
-	QPalette 		*red;
-	QString 		intervalTip;
 
-	/** some Default Values */
+	/** default plot and axis titles */
 	static QString defaultPlotTitle;
 	static QString defaultHistXAxisTitle;
 	static QString defaultHistYAxisTitle;
 	static QString defaultImageXAxisTitle;
 	static QString defaultImageYAxisTitle;
 	static QString defaultImageZAxisTitle;
-
-	/** scans */
-	static const QString modeNames[5];
-
 };