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

done

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-16 12:48:32 +02:00
parent fdffe8dc1e
commit e0dc25905b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -333,6 +333,9 @@ void qDrawPlot::SetupWidgetWindow(){
myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this); myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this);
//Setting the callback function to get progress from detector class(using receivers) //Setting the callback function to get progress from detector class(using receivers)
myDet->registerProgressCallback(&(GetProgressCallBack),this); myDet->registerProgressCallback(&(GetProgressCallBack),this);
//stream data to the gui
myDet->setDataStreamingFromReceiver(1);
qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow");
} }
@ -1946,7 +1949,7 @@ void qDrawPlot::SetFrameFactor(int frame){
frameFactor = frame; frameFactor = frame;
if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
frame = myDet->setReadReceiverFrequency(1,frame); frame = myDet->setReadReceiverFrequency(1,frame);
if(frame > 0) frameFactor = 1; /*if(frame > 0) frameFactor = 1;*//**what is this*/
#ifdef VERBOSE #ifdef VERBOSE
cout << "Receiver read frequency set to : " << frame << endl; cout << "Receiver read frequency set to : " << frame << endl;
#endif #endif

2
slsDetectorGui/src/qTabPlot.cpp
View File

@ -1007,7 +1007,7 @@ void qTabPlot::SetScanArgument(){
} }
cout <<"min:"<<min<<" max:"<<max<<" size:"<<size<<endl; //cout <<"min:"<<min<<" max:"<<max<<" size:"<<size<<endl;
myPlot->SetHistogram(radioHistogram->isChecked(),histArg,min,max,size); myPlot->SetHistogram(radioHistogram->isChecked(),histArg,min,max,size);