Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal 2017-11-23 18:24:33 +01:00
commit f0431bd873

View File

@ -2093,8 +2093,7 @@ void qDrawPlot::SetPlotTimer(double time){
void qDrawPlot::SetFrameFactor(int frame){ 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(frame);
/*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