diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp index 6a7865d10..64c24e269 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp @@ -638,7 +638,6 @@ void slsDetectorUtils::incrementProgress() { void slsDetectorUtils::setCurrentProgress(int i){ pthread_mutex_lock(&mp); - progressIndex++; progressIndex=i; cout << fixed << setprecision(2) << setw (6) << 100.*((double)progressIndex)/((double)totalProgress) << " \%"; pthread_mutex_unlock(&mp); diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 55f1e56f3..014a5711f 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -432,9 +432,15 @@ void* postProcessing::processData(int delflag) { #endif //always read nth data - if (read_freq != 0) + if (read_freq != 0){ newData = true; + if (!dataReady){ + std::cout << "Error: receiver read freq should be > 0 only when using gui." << std::endl; + std::cout << "Current receiver read frequency: " << read_freq << std::endl; + } + } + while(1){ cout.flush(); diff --git a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp index eff67cb6e..eb9b290d4 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp @@ -446,7 +446,7 @@ int slsReceiverFunctionList::startWriting(){ if (writeReceiverData) cout << "Note: Data Write has been defined exernally" << endl; if(nFrameToGui) - cout << " Not implemented yet: Sending every " << nFrameToGui << "th frame to gui" << endl; + cout << "Sending every " << nFrameToGui << "th frame to gui" << endl; //by default, we read/write everything