From 5c14453c5d013effa461a857ed29df8bfe70e193 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Fri, 13 Mar 2015 11:20:00 +0100
Subject: [PATCH] fixed histogram issues

---
 slsDetectorGui/src/qDrawPlot.cpp | 8 ++++----
 slsDetectorGui/src/qTabPlot.cpp  | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index 43d4d14c1..97aa90ed8 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -595,10 +595,10 @@ void qDrawPlot::SetScanArgument(int scanArg){
 	//histogram
 	if(histogram){
 		int iloop = 0;
-		int numSteps = ((histTo-histFrom)/(histSize)) + 1;
+		int numSteps = ((histTo-histFrom)/(histSize)) + 1;cout<<"numSteps:"<<numSteps<<" histFrom:"<<histFrom<<" histTo:"<<histTo<<" histSize:"<<histSize<<endl;
 		histogramSamples.resize(numSteps);
-		startPixel = histFrom -(histSize/2);
-		endPixel = histTo + (histSize/2);
+		startPixel = histFrom -(histSize/2);cout<<"startpixel:"<<startPixel<<endl;
+		endPixel = histTo + (histSize/2);cout<<"endpixel:"<<endPixel<<endl;
 		while(startPixel < endPixel){
 			histogramSamples[iloop].interval.setInterval(startPixel,startPixel+histSize,QwtInterval::ExcludeMaximum);
 			histogramSamples[iloop].value = 0;
@@ -990,7 +990,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 						//frequency of intensity
 						if(histogramArgument == qDefs::Intensity){
 							//ignore outside limits
-							if ((data->values[i] <  histFrom) || (data->values[i] >= histTo))
+							if ((data->values[i] <  histFrom) || (data->values[i] > histTo))
 								continue;
 							//check for intervals, increment if validates
 							for(int j=0;j<histogramSamples.size();j++){
diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp
index 3e60667a0..674590c49 100644
--- a/slsDetectorGui/src/qTabPlot.cpp
+++ b/slsDetectorGui/src/qTabPlot.cpp
@@ -968,8 +968,6 @@ void qTabPlot::SetScanArgument(){
 				min = values[0];
 				max = values[numSteps - 1];
 				size = (max - min)/(numSteps - 1);
-				min -= (size/2);
-				max += (size/2);
 			}
 		}