client connecting to gui serveR done

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

slsDetectorGui/include/qDetectorMain.h

@@ -12,8 +12,8 @@
 /** Form Header */
 #include "ui_form_detectormain.h"
 /** Qt Project Class Headers */
-class qDrawPlot;
-class qTabMeasurement;
+#include "qDrawPlot.h"
+#include "qTabMeasurement.h"
 class qTabDataOutput;
 class qTabPlot;
 class qTabActions;
@@ -64,6 +64,22 @@ public:
 	 * */
 	~qDetectorMain();
 
+	/** Starts or stops Acquisition From gui client
+	 * @param start 1 for start and 0 to stop
+	 /returns success or fail
+	 */
+	int StartStopAcquisitionFromClient(bool start);
+
+	/** Returns if plot is running
+	 */
+	bool isPlotRunning(){return myPlot->isRunning();};
+
+	/** Returns progress bar value */
+	int GetProgress(){return tab_measurement->GetProgress();};
+
+	/** Uncheck the Listen to Gui Client mode when server has exited using exit command */
+	void GuiServerExited(){actionListenGuiClient->setChecked(false);};
+
 private:
 	/** The Qt Application */
 	QApplication *theApp;

slsDetectorGui/include/qServer.h

@@ -11,8 +11,7 @@
 /** Qt Project Class Headers */
 #include "sls_detector_defs.h"
 #include "qDefs.h"
-class qDrawPlot;
-class qTabMeasurement;
+class qDetectorMain;
 
 /** Project Class Headers */
 class multiSlsDetector;
@@ -28,7 +27,7 @@ class qServer: public virtual slsDetectorDefs{
 
 public:
 	/** \short The constructor	 */
-	qServer(multiSlsDetector*& detector, qTabMeasurement* m, qDrawPlot *d);
+	qServer(multiSlsDetector*& detector, qDetectorMain *t);
 	/** Destructor	 */
 	~qServer();
 
@@ -39,10 +38,10 @@ public:
 
 private:
 	/** assigns functions to the fnum enum */
-	int function_table();
+	int FunctionTable();
 
 	/** Decodes Function */
-	int decode_function();
+	int DecodeFunction();
 
 	/** Unrecognized Function */
 	int M_nofunc();
@@ -62,19 +61,27 @@ private:
 	 */
 	int StartServer();
 
-	/** Get Detector Status */
-	int get_status();
+	/** Exit Server */
+	int ExitServer();
 
+	/** Get Detector Status */
+	int GetStatus();
+
+	/** Starts Acquisition */
+	int StartAcquisition();
+
+	/** Stops Acquisition */
+	int StopsAcquisition();
+
+	/** Acquire - blocking */
+	int Acquire();
 
 
 
 	/** The multi detector object */
 	multiSlsDetector *myDet;
 	/**The measurement tab object*/
-	qTabMeasurement *tab_measurement;
-	/**The plot widget object*/
-	qDrawPlot 		*myPlot;
-
+	qDetectorMain *myMainTab;
 
 	/** tcp socket to gui client */
 	MySocketTCP 	*mySocket;

slsDetectorGui/include/qTabMeasurement.h

@@ -48,6 +48,17 @@ public:
 	 */
 	void SetExpertMode(bool enable);
 
+	/** Returns the status of the Start/Stop Acquisition button
+	 */
+	bool GetStartStatus(){return btnStartStop->isChecked();};
+
+	/** Click the Start/Stop Acquisition button
+	 *  This is used if this command came from gui client
+	 */
+	void ClickStartStop(){btnStartStop->click();};
+
+	/** Returns progress bar value */
+	int GetProgress(){return progressBar->value();};
 
 
 public slots: