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

removed merge conflicts from bug fix of zmq buffering while acquire from command line

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-21 14:57:52 +01:00
parent 70e4c6e2a2 49ba893d7e
commit 9c55cb4974
4 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -778,11 +778,20 @@ void* qDrawPlot::DataStartAcquireThread(void *this_pointer){
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) {cprintf(GREEN,"receiver not on\n");
// switch on receiver
if (((qDrawPlot*)this_pointer)->myDet->enableDataStreamingFromReceiver(1) != 1) {
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;
}
}
}
((qDrawPlot*)this_pointer)->myDet->acquire(1);