From 19b6ca2eda6536fd1bccfa51a4139f68ffa1d8f8 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Thu, 11 Oct 2012 08:57:09 +0000
Subject: [PATCH] enhancement:nth frame changed to red, instead of error and
 changing it back

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@90 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/src/qDrawPlot.cpp       | 6 +-----
 slsDetectorGui/src/qTabMeasurement.cpp | 5 +----
 slsDetectorGui/src/qTabPlot.cpp        | 3 ++-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index b3a9377de..2ed7f2287 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -538,7 +538,7 @@ int qDrawPlot::GetData(detectorData *data){
 		//set progress
 		progress=(int)data->progressIndex;
 		currentFileIndex = fileIOStatic::getFileIndexFromFileName(string(data->fileName));
-#ifdef VERBOSE
+#ifdef VERYVERBOSE
 		cout << "progress:" << progress << endl;
 #endif
 
@@ -673,8 +673,6 @@ int qDrawPlot::GetData(detectorData *data){
 						//get scanvariable0
 						int ci = 0, p = 0; double cs0 = 0 , cs1 = 0;
 						fileIOStatic::getVariablesFromFileName(string(data->fileName), ci, p, cs0, cs1);
-						cout<<"currentScanValue:"<<currentScanValue<<endl;
-						cout<<"cs0:"<<cs0<<endl;
 						//variables
 						if(cs0!=currentScanValue) {
 							if(backwardScanPlot)	currentScanDivLevel--;
@@ -946,8 +944,6 @@ void qDrawPlot::UpdatePlot(){
 				if(lastImageArray){
 					if(lastImageNumber&&last_plot_number!=(int)lastImageNumber && //there is a new plot
 							nPixelsX>0&&nPixelsY>0){
-						cout<<"startpixel:"<<startPixel<<endl;
-						cout<<"endpixel:"<<endPixel<<endl;
 						//plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,-0.5,nPixelsY-0.5,lastImageArray);
 						plot2D->GetPlot()->SetData(nPixelsX,-0.5,nPixelsX-0.5,nPixelsY,startPixel,endPixel,lastImageArray);
 						plot2D->setTitle(GetImageTitle());
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index 7d9149f68..cf295660e 100644
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -30,7 +30,7 @@ qTabMeasurement::qTabMeasurement(QWidget *parent,multiSlsDetector*& detector, qD
 	setupUi(this);
 	SetupWidgetWindow();
 	Initialization();
-
+	SetupTimingMode();
 }
 
 
@@ -76,9 +76,6 @@ void qTabMeasurement::SetupWidgetWindow(){
 	//ly initially
 	progressBar->setValue(0);
 
-	//timing mode
-	SetupTimingMode();
-
 	//file write enabled/disabled
 	chkFile->setChecked(myDet->enableWriteToFile());
 	dispFileName->setEnabled(myDet->enableWriteToFile());
diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp
index 4fc560740..4885afa9d 100644
--- a/slsDetectorGui/src/qTabPlot.cpp
+++ b/slsDetectorGui/src/qTabPlot.cpp
@@ -497,7 +497,8 @@ void qTabPlot::SetFrequency(){
 			boxFrequency->setToolTip(errTip);
 		}
 		//show red if acqPeriod<minInterval
-		else if(acqPeriodMS<timeMS){
+		else if((acqPeriodMS+1)<timeMS){
+			cout<<"\nacqPeriodMS:"<<acqPeriodMS<<"\ttimeMS:"<<timeMS<<endl;
 			//qDefs::Message(qDefs::WARNING,"<nobr>Interval between Plots: You might be losing Images!</nobr>","Plot");
 			boxFrequency->setPalette(*red);
 			boxFrequency->setTitle("Interval between Plots*");