From e0dc25905b3dcf9d380c7bc3704fe5d909c963f7 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 16 Sep 2016 12:48:32 +0200 Subject: [PATCH] done --- slsDetectorGui/src/qDrawPlot.cpp | 5 ++++- slsDetectorGui/src/qTabPlot.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 67f3ed720..8e308071d 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -333,6 +333,9 @@ void qDrawPlot::SetupWidgetWindow(){ myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this); //Setting the callback function to get progress from detector class(using receivers) myDet->registerProgressCallback(&(GetProgressCallBack),this); + //stream data to the gui + myDet->setDataStreamingFromReceiver(1); + qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); } @@ -1946,7 +1949,7 @@ void qDrawPlot::SetFrameFactor(int frame){ frameFactor = frame; if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ frame = myDet->setReadReceiverFrequency(1,frame); - if(frame > 0) frameFactor = 1; + /*if(frame > 0) frameFactor = 1;*//**what is this*/ #ifdef VERBOSE cout << "Receiver read frequency set to : " << frame << endl; #endif diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 2c46f07f1..9cd16607b 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -1007,7 +1007,7 @@ void qTabPlot::SetScanArgument(){ } - cout <<"min:"<SetHistogram(radioHistogram->isChecked(),histArg,min,max,size);