From d23c9d52edf9ab9b8ba7a28d498e0018687fd136 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 23 Nov 2017 14:53:33 +0100 Subject: [PATCH 1/2] somewhere --- slsDetectorGui/forms/form_tab_advanced.ui | 20 ------------ slsDetectorGui/include/qTabAdvanced.h | 4 --- slsDetectorGui/src/qTabAdvanced.cpp | 37 ++++------------------- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui index de820db1e..a9b32a4f6 100644 --- a/slsDetectorGui/forms/form_tab_advanced.ui +++ b/slsDetectorGui/forms/form_tab_advanced.ui @@ -1314,26 +1314,6 @@ An extension given by the modules serial number will be attached. - - - - 23 - 142 - 291 - 25 - - - - Switching off and on the receiver data streaming from command line requires client sockets to be restarted as well. - - - Restart Streaming (Receiver->GUI) - - - - :/icons/images/refresh.png:/icons/images/refresh.png - - diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index 4d730ca33..5071e8fd6 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -162,10 +162,6 @@ private slots: */ void SetReceiver(); - /** Restart data streaming in receiver and gui - */ - void RestartStreaming(); - /** Add ROI Input if the value changed in the last slot */ void AddROIInputSlot(){AddROIInput(1);}; diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 753b2ec1c..086cc6877 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -79,7 +79,6 @@ void qTabAdvanced::SetupWidgetWindow(){ isAngular = true; spinZmqPort->setEnabled(false); spinZmqPort2->setEnabled(false); - btnRestartStreaming->setEnabled(false); break; case slsDetectorDefs::EIGER: isEnergy = true; @@ -281,8 +280,6 @@ void qTabAdvanced::Initialization(){ connect(dispUDPMAC, SIGNAL(editingFinished()), this, SLOT(SetNetworkParameters())); connect(btnRxr, SIGNAL(clicked()), this, SLOT(SetReceiver())); - connect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming())); - } @@ -737,12 +734,10 @@ void qTabAdvanced::SetCltZmqPort(int port){ disconnect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int))); spinZmqPort->setValue(atoi(det->setClientStreamingPort(sport).c_str())); - myDet->enableDataStreamingFromReceiver(false); - myDet->enableDataStreamingToClient(false); - - myDet->enableDataStreamingFromReceiver(true); - myDet->enableDataStreamingToClient(true); qDefs::checkErrorMessage(det,"qTabAdvanced::SetCltZmqPort"); + myDet->enableDataStreamingToClient(false); + myDet->enableDataStreamingToClient(true); + qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetCltZmqPort"); connect(spinZmqPort, SIGNAL(valueChanged(int)), this, SLOT(SetCltZmqPort(int))); } @@ -758,12 +753,10 @@ void qTabAdvanced::SetRxrZmqPort(int port){ disconnect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int))); spinZmqPort2->setValue(atoi(det->setReceiverStreamingPort(sport).c_str())); - myDet->enableDataStreamingFromReceiver(false); - myDet->enableDataStreamingToClient(false); - - myDet->enableDataStreamingFromReceiver(true); - myDet->enableDataStreamingToClient(true); qDefs::checkErrorMessage(det,"qTabAdvanced::SetRxrZmqPort"); + myDet->enableDataStreamingFromReceiver(false); + myDet->enableDataStreamingFromReceiver(true); + qDefs::checkErrorMessage(myDet,"qTabAdvanced::SetRxrZmqPort"); connect(spinZmqPort2, SIGNAL(valueChanged(int)), this, SLOT(SetRxrZmqPort(int))); } @@ -865,24 +858,6 @@ void qTabAdvanced::SetReceiver(){ } - -//------------------------------------------------------------------------------------------------------------------------------------------------- - - -void qTabAdvanced::RestartStreaming(){ -#ifdef VERBOSE - cout << "Restarting Data Streaming in Receiver and Gui" << endl; -#endif - disconnect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming())); - myDet->enableDataStreamingFromReceiver(false); - myDet->enableDataStreamingToClient(false); - - myDet->enableDataStreamingFromReceiver(true); - myDet->enableDataStreamingToClient(true); - connect(btnRestartStreaming,SIGNAL(clicked()), this, SLOT(RestartStreaming())); -} - - //------------------------------------------------------------------------------------------------------------------------------------------------- From 375b1c9485107d7b5da7946397fd29e19c87cfc5 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Mon, 27 Nov 2017 15:40:36 +0100 Subject: [PATCH 2/2] 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; - } } }