From eb4ab306c7fe95942208c1f107257aa2fcdd0e01 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 15 Nov 2017 17:16:37 +0100 Subject: [PATCH] in between separating datastreaming in client and receiver --- slsDetectorGui/src/qDrawPlot.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index dcbb55377..6bdc4b37f 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -322,8 +322,7 @@ void qDrawPlot::SetupWidgetWindow(){ plotLayout->addWidget(plot2D,0,0,1,1); -//callbacks - + // callbacks // Setting the callback function to get data from detector class myDet->registerDataCallback(&(GetDataCallBack),this); //Setting the callback function to alert when acquisition finished from detector class @@ -333,6 +332,13 @@ void qDrawPlot::SetupWidgetWindow(){ //Setting the callback function to get progress from detector class(using receivers) myDet->registerProgressCallback(&(GetProgressCallBack),this); + + // 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"); } @@ -731,17 +737,15 @@ void qDrawPlot::SetupMeasurement(){ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){ - //stream data from receiver to the gui - if(((qDrawPlot*)this_pointer)->myDet->setReceiverOnline(slsDetectorDefs::GET_ONLINE_FLAG) == slsDetectorDefs::ONLINE_FLAG) { - //if it was not on - if ( (((qDrawPlot*)this_pointer)->myDet->getStreamingSocketsCreatedInClient() != 1) - || (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(-1)!= 1) ){ - //switch it on, if error + // stream data from receiver to the gui + if(((qDrawPlot*)this_pointer)->myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) { + + // if receiver data up streaming not on, switch it on + if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver() != 1) if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(1) != 1) { qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread"); return this_pointer; } - } } ((qDrawPlot*)this_pointer)->myDet->acquire(1);