From 375b1c9485107d7b5da7946397fd29e19c87cfc5 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 27 Nov 2017 15:40:36 +0100 Subject: [PATCH] not required to restart client datastreaming due to connect everytime for acquire --- slsDetectorGui/src/qDrawPlot.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 956d0352f..8f2905d1c 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -324,7 +324,7 @@ void qDrawPlot::SetupWidgetWindow(){ // callbacks // Setting the callback function to get data from detector class - myDet->registerDataCallback(&(GetDataCallBack),this); + myDet->registerDataCallback(&(GetDataCallBack),this); // also enables data streaming in client //Setting the callback function to alert when acquisition finished from detector class myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this); //Setting the callback function to alert when each measurement finished from detector class @@ -336,7 +336,6 @@ void qDrawPlot::SetupWidgetWindow(){ // if receiver, enable data streaming from receiver and client if(myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) { myDet->enableDataStreamingFromReceiver(1); - myDet->enableDataStreamingToClient(1); } qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); @@ -747,13 +746,6 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){ qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread"); return this_pointer; } - // switch off client - ((qDrawPlot*)this_pointer)->myDet->enableDataStreamingToClient(0); - // switch on client - if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingToClient(1) != 1) { - qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread"); - return this_pointer; - } } }