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

slsDetectorGui/include/qDetectorMain.h

@@ -28,6 +28,8 @@ class multiSlsDetector;
 #include <QGridLayout>
 #include <QResizeEvent>
 
+#include <iostream>
+using namespace std;
 
 /** To Over-ride the QTabWidget class to get the tabBar */
 class MyTabWidget:public QTabWidget{
@@ -103,6 +105,7 @@ private:
 	qTabDeveloper 		*tab_developer;
 	/**Messages tab */
 	qTabMessages 		*tab_messages;
+
 	/**if the developer tab should be enabled,known from command line */
 	int isDeveloper;
 

slsDetectorGui/include/qEnergyCalibration.h

@@ -0,0 +1,59 @@
+/*
+ * qEnergyCalibration.h
+ *
+ *  Created on: May 10, 2012
+ *      Author: l_maliakal_d
+ */
+
+#ifndef QENERGY_CALIBRATION_H_
+#define QENERGY_CALIBRATION_H_
+
+/** Form Header */
+#include "ui_form_energy_calibration.h"
+/** Project Class Headers */
+class multiSlsDetector;
+
+/**
+ *@short sets up the advanced parameters
+ */
+class qEnergyCalibration:public QWizard, private Ui::EnergyCalibrationObject{
+	Q_OBJECT
+
+public:
+	/** \short The constructor
+	 *    @param parent is the parent tab widget
+	 *    @param detector is the detector returned from the detector tab
+	 */
+	qEnergyCalibration(QWidget *parent,multiSlsDetector*& detector);
+
+	/** Destructor
+	 */
+	~qEnergyCalibration();
+
+	/** To refresh and update widgets
+	 */
+	void Refresh();
+
+
+private:
+	/** The sls detector object */
+	multiSlsDetector *myDet;
+
+	/** Sets up the widget
+	 */
+	void SetupWidgetWindow();
+
+	/** Sets up all the slots and signals
+	 */
+	void Initialization();
+
+
+
+private slots:
+
+
+};
+
+
+
+#endif /* QENERGY_CALIBRATION_H_ */

slsDetectorGui/include/qTabAdvanced.h

@@ -39,9 +39,6 @@ private:
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
-	/** The sls detector object type*/
-	int myDetType;
-
 	/** Sets up the widget
 	 */
 	void SetupWidgetWindow();
@@ -50,14 +47,10 @@ private:
 	 */
 	void Initialization();
 
-	/** Enables/Disables all the widgets
-	 */
-	void Enable(bool enable);
+
 
 private slots:
-/** Get Temperature data
- */
-void getTemperature();
+
 
 };