From 854015532e3682257157321b31c3c83dcf572b66 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Mon, 12 Nov 2012 15:47:55 +0000
Subject: [PATCH] gotthard works with receiver without tcp lock

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@109 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/src/qDetectorMain.cpp   |  1 +
 slsDetectorGui/src/qDrawPlot.cpp       | 26 +++++++-------------------
 slsDetectorGui/src/qTabMeasurement.cpp |  5 -----
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index 676362488..25e459bd8 100644
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@@ -646,6 +646,7 @@ void qDetectorMain::EnableTabs(){
 	actionLoadCalibration->setVisible(expertTab);
 	actionSaveCalibration->setVisible(expertTab);
 
+
 	//moved to here, so that its all in order, instead of signals and different threads
 	if(!enable) {
 		//set the plot type first(acccss shared memory)
diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index 0bd923ddb..3fe48be05 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -221,9 +221,9 @@ void qDrawPlot::Initialization(){
 
 
 void qDrawPlot::StartStopDaqToggle(bool stop_if_running){
-#ifdef VERYVERBOSE
+//#ifdef VERYVERBOSE
 	cout << "Entering StartStopDaqToggle(" << stop_if_running << ")" <<endl;
-#endif
+//#endif
 	//static bool running = 1;
 	if(running){ //stopping
 		StartDaq(false);
@@ -512,20 +512,8 @@ void qDrawPlot::SetupMeasurement(int currentIndex){
 
 
 void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
-	bool receiver=(((qDrawPlot*)this_pointer)->myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG);
-	if(receiver){
-		if(((qDrawPlot*)this_pointer)->myDet->startReceiver()==slsDetectorDefs::OK)
-			usleep(2000000);
-		else{
-			qDefs::Message(qDefs::CRITICAL,"could not start receiver","Plot");
-			return this_pointer;
-		}
-	}
 	((qDrawPlot*)this_pointer)->myDet->acquire(1);
-	if(receiver){
-		usleep(0);
-		((qDrawPlot*)this_pointer)->myDet->stopReceiver();
-	}
+
 	return this_pointer;
 }
 
@@ -791,9 +779,9 @@ int qDrawPlot::GetAcquisitionFinishedCallBack(double currentProgress,int detecto
 
 
 int qDrawPlot::AcquisitionFinished(double currentProgress, int detectorStatus){
-#ifdef VERBOSE
+//#ifdef VERBOSE
 	cout << "\nEntering Acquisition Finished with status " ;
-#endif
+//#endif
 	QString status = QString(slsDetectorBase::runStatusType(slsDetectorDefs::runStatus(detectorStatus)).c_str());
 #ifdef VERBOSE
 	cout << status.toAscii().constData() << " and progress " << currentProgress << endl;
@@ -857,9 +845,9 @@ int qDrawPlot::GetMeasurementFinishedCallBack(int currentMeasurementIndex, int f
 
 
 int qDrawPlot::MeasurementFinished(int currentMeasurementIndex, int fileIndex){
-#ifdef VERBOSE
+//#ifdef VERBOSE
 	cout << "Entering Measurement Finished with currentMeasurement " << currentMeasurementIndex << " and fileIndex " << fileIndex << endl;
-#endif
+//#endif
 	//to make sure it plots the last frame before setting lastimagearray all to 0
 	//if(plot_in_scope==2)
 		usleep(500000);
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index 7301f2aeb..cf295660e 100644
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -318,11 +318,6 @@ void qTabMeasurement::startStopAcquisition(){
 		btnStartStop->setIcon(*iconStart);
 		btnStartStop->setChecked(false);
 		Enable(1);
-
-		if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
-			usleep(0);
-			myDet->stopReceiver();
-		}
 	}
 }