fixed gitinfo

slsDetectorGui/include/gitInfoGui.h

@@ -1,6 +1,7 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "ab06c33107ecfeb4741d49407903ff80286cf75b"
-#define GITAUTH "Anna_Bergamaschi"
-#define GITREV 0x3731
-#define GITDATE 0x20180315
+
+#define GITREPUUID "fe2ba8621b33bc00f51c8cd4d33e98b7d4ebfa41"
+#define GITAUTH "Dhanya_Thattil"
+#define GITREV 0x3747
+#define GITDATE 0x20180327
 #define GITBRANCH "developer"

slsDetectorGui/include/qDrawPlot.h

@@ -617,7 +617,6 @@ void saveErrorSignal(QString);
 void AcquisitionErrorSignal(QString);
 void UpdatePlotSignal();
 void GainPlotSignal(bool);
-void AcquisitionFinishedSignal();
 };
 
 

slsDetectorGui/include/qTabMeasurement.h

@@ -50,14 +50,14 @@ public:
 	 */
 	void SetExpertMode(bool enable);
 
-	/** Returns the status of the Start/Stop Acquisition button
+	/** Returns the status of the acquisition in gui
 	 */
-	bool GetStartStatus(){return btnStartStop->isChecked();};
+	bool GetStartStatus(){return (!btnStart->isEnabled());};
 
 	/** Click the Start/Stop Acquisition button
 	 *  This is used if this command came from gui client
 	 */
-	void ClickStartStop(){btnStartStop->click();myPlot->SetClientInitiated();};
+	void ClickStartStop(){startAcquisition();myPlot->SetClientInitiated();};
 
 	/** Returns progress bar value */
 	int GetProgress(){return progressBar->value();};
@@ -65,10 +65,6 @@ public:
 
 public slots:
 
-	/** Unconnects start/stop button when acquisition is finished
-	 */
-	void AcquisitionFinished();
-
 	/** update plot is finished,
 	 * changes start/stop text and enables/disables all widgets
 	 */
@@ -131,9 +127,13 @@ private slots:
 	 */
 	void setRunIndex(int index);
 
-	/** starts/stops Acquisition
+	/** starts Acquisition
 	 */
-	void startStopAcquisition();
+	void startAcquisition();
+
+    /** stops Acquisition
+     */
+    void stopAcquisition();
 
 	/** Set number of frames
 	 *  @param val number of frames to be set
@@ -193,8 +193,6 @@ private:
 	QPalette	red;
 	/** expert mode */
 	bool expertMode;
-	QIcon	*iconStart;
-	QIcon	*iconStop;
 	/** to access items in settings combobox */
 	QStandardItemModel* model;
 

slsDetectorGui/include/qTabPlot.h

@@ -174,6 +174,9 @@ private slots:
 	/** Set histogram options */
 	void SetHistogramOptions();
 
+	/** Enable Gap pixels */
+	void EnableGapPixels(bool enable);
+
 signals:
 	void DisableZoomSignal(bool);
 	void ResetZMinZMaxSignal(bool,bool,double,double);