detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 15:50:03 +02:00
Code Issues Actions Packages Releases Activity

not required to restart client datastreaming due to connect everytime for acquire

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-27 15:40:36 +01:00
parent 9f733c1dfb
commit 375b1c9485
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -324,7 +324,7 @@ void qDrawPlot::SetupWidgetWindow(){
// callbacks // callbacks
// Setting the callback function to get data from detector class // 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 //Setting the callback function to alert when acquisition finished from detector class
myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this); myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack),this);
//Setting the callback function to alert when each measurement finished from detector class //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 receiver, enable data streaming from receiver and client
if(myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) { if(myDet->setReceiverOnline() == slsDetectorDefs::ONLINE_FLAG) {
myDet->enableDataStreamingFromReceiver(1); myDet->enableDataStreamingFromReceiver(1);
myDet->enableDataStreamingToClient(1);
} }
qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow");
@ -747,13 +746,6 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread"); qDefs::checkErrorMessage(((qDrawPlot*)this_pointer)->myDet,"qDrawPlot::DataStartAcquireThread");
return this_pointer; 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;
}
} }
} }