histogram for 2d and s curves

slsDetectorGui/include/qDefs.h

@@ -281,6 +281,17 @@ static const int64_t GUI_VERSION=0x20121213;
 	};
 
 
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+	/** histogram arguments*/
+	enum histogramArgumentList{
+		Intensity,
+		histLevel0,
+		histLevel1
+	};
+
+
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 

slsDetectorGui/include/qDrawPlot.h

@@ -143,7 +143,7 @@ public:
 	void SetBinary(bool enable, int from=0, int to=0);
 
 	/** Enable/Disable Histogram */
-	void SetHistogram(bool enable,int min=0, int max=0, int size=0){histogram = enable;histFrom=min;histTo=max;histSize=size;};
+	void SetHistogram(bool enable,int histArg, int min=0, int max=0, int size=0){histogram = enable;histogramArgument = histArg; histFrom=min;histTo=max;histSize=size;};
 
 public slots:
 /** To select 1D or 2D plot
@@ -494,6 +494,9 @@ bool isTriggerEnabled;
 /** scan arguments*/
 int scanArgument;
 
+/** histogram arguments*/
+int histogramArgument;
+
 /** enable angle plot */
 bool anglePlot;
 /** prevents err msg displaying twice when detector stopped, "transmitting" */

slsDetectorGui/include/qTabPlot.h

@@ -71,6 +71,7 @@ private:
 	QComboBox 		*comboTimeGapUnit;
 	QButtonGroup 	*btnGroupScan;
 	QButtonGroup	*btnGroupPlotType;
+	QButtonGroup	*btnGroupHistogram;
 
 	/** some Default Values */
 	static QString defaultPlotTitle;
@@ -105,7 +106,7 @@ public slots:
 
 	/** Enable Scan box
 	 */
-	void EnableScanBox(bool Histo=false);
+	void EnableScanBox();
 
 
 private slots:
@@ -147,6 +148,9 @@ private slots:
 	/** Plot binary plot */
 	void SetBinary();
 
+	/** Set histogram options */
+	void SetHistogramOptions();
+
 signals:
 	void DisableZoomSignal(bool);
 	void SetZRangeSignal(double,double);