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

fixed histogram issues

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-03-13 11:20:00 +01:00
parent 2c6f0c49a7
commit 5c14453c5d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -595,10 +595,10 @@ void qDrawPlot::SetScanArgument(int scanArg){
//histogram //histogram
if(histogram){ if(histogram){
int iloop = 0; 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); histogramSamples.resize(numSteps);
startPixel = histFrom -(histSize/2); startPixel = histFrom -(histSize/2);cout<<"startpixel:"<<startPixel<<endl;
endPixel = histTo + (histSize/2); endPixel = histTo + (histSize/2);cout<<"endpixel:"<<endPixel<<endl;
while(startPixel < endPixel){ while(startPixel < endPixel){
histogramSamples[iloop].interval.setInterval(startPixel,startPixel+histSize,QwtInterval::ExcludeMaximum); histogramSamples[iloop].interval.setInterval(startPixel,startPixel+histSize,QwtInterval::ExcludeMaximum);
histogramSamples[iloop].value = 0; histogramSamples[iloop].value = 0;
@ -990,7 +990,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
//frequency of intensity //frequency of intensity
if(histogramArgument == qDefs::Intensity){ if(histogramArgument == qDefs::Intensity){
//ignore outside limits //ignore outside limits
if ((data->values[i] < histFrom) || (data->values[i] >= histTo)) if ((data->values[i] < histFrom) || (data->values[i] > histTo))
continue; continue;
//check for intervals, increment if validates //check for intervals, increment if validates
for(int j=0;j<histogramSamples.size();j++){ for(int j=0;j<histogramSamples.size();j++){

2
slsDetectorGui/src/qTabPlot.cpp
View File

@ -968,8 +968,6 @@ void qTabPlot::SetScanArgument(){
min = values[0]; min = values[0];
max = values[numSteps - 1]; max = values[numSteps - 1];
size = (max - min)/(numSteps - 1); size = (max - min)/(numSteps - 1);
min -= (size/2);
max += (size/2);
} }
} }