defining everything to reduce null pointer errors, fixed zooming problem for scans

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

slsDetectorGui/include/qCloneWidget.h

@@ -119,15 +119,6 @@ private:
 	QGridLayout *mainLayout;
 	QGroupBox 	*cloneBox;
 	QGridLayout *gridClone;
-    QGroupBox 	*boxSave;
-    QHBoxLayout *layoutSave;
-    QLabel 		*lblFName;
-    QHBoxLayout *hLayoutSave;
-    QLineEdit	*dispFName;
-    QComboBox 	*comboFormat;
-    QPushButton *btnSave;
-    QCheckBox 	*chkAutoFName;
-    QCheckBox 	*chkSaveAll;
 
     QLabel		*lblHistTitle;
 

slsDetectorGui/include/qDetectorMain.h

@@ -77,6 +77,8 @@ public:
 	/** Returns progress bar value */
 	int GetProgress(){return tab_measurement->GetProgress();};
 
+	/** Returns file path */
+	QString GetFilePath(){QString s = QString(myDet->getFilePath().c_str());qDefs::checkErrorMessage(myDet); return s;};
 
 private:
 	/** The Qt Application */

slsDetectorGui/include/qDrawPlot.h

@@ -125,6 +125,8 @@ public:
 	 * and this is reset when the gui really starts/stops- to know when to return
 	 */
 	bool GetClientInitiated(){return clientInitiated;};
+	/** Unzoom plot 2d as it will affect scans */
+	void plot2DUnzoom();
 
 public slots:
 /** To select 1D or 2D plot
@@ -157,6 +159,7 @@ void SetScanArgument(int scanArg);
 /** sets stop_signal to true */
 void StopAcquisition(){	stop_signal = true; };
 
+
 //pedestal
 /** reset pedestal */
 void ResetPedestal();

slsDetectorGui/include/qTabMessages.h

@@ -14,7 +14,7 @@
 
 
 /** Project Class Headers */
-class multiSlsDetector;
+class qDetectorMain;
 /** Qt Include Headers */
 #include <QWidget>
 #include <QTextEdit>
@@ -30,10 +30,9 @@ class qTabMessages:public QWidget{
 
 public:
 	/** \short The constructor
-	 *  @param parent is the parent tab widget
-	 *  @param det the detector reference
+	 *  @param det the qDetectorMain class  reference
 	 */
-	qTabMessages(QWidget *parent,multiSlsDetector* detector);
+	qTabMessages(qDetectorMain* m);
 
 	/** Destructor
 	 */
@@ -41,8 +40,8 @@ public:
 
 
 private:
-	/** The sls detector object */
-	multiSlsDetector *myDet;
+	/** The qDetectorMain object */
+	qDetectorMain *myMainTab;
 
 	/** Log of executed commands */
 	QTextEdit *dispLog;