merge conflict from 3.0.1 to restream stop from recieveR

slsDetectorGui/include/qDrawPlot.h

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

slsDetectorGui/include/qTabMeasurement.h

@@ -65,6 +65,10 @@ 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
 	 */