detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

xyrangechanged not checked for histogram

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-12-16 14:46:02 +01:00
parent 37ea7d425f
commit f464be38a3
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorGui/include/qDefs.h
View File

@ -8,6 +8,7 @@
#ifndef QDEFS_H #ifndef QDEFS_H
#define QDEFS_H #define QDEFS_H
#include "ansi.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "slsDetector.h" #include "slsDetector.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"

3
slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
View File

@ -13,11 +13,10 @@
#ifndef SLSQT1DPLOT_H #ifndef SLSQT1DPLOT_H
#define SLSQT1DPLOT_H #define SLSQT1DPLOT_H
#ifndef IAN
typedef double double32_t; typedef double double32_t;
typedef float float32_t; typedef float float32_t;
typedef int int32_t; typedef int int32_t;
#endif #include "ansi.h"
#include <qwt_plot.h> #include <qwt_plot.h>

8
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -1369,9 +1369,11 @@ void qDrawPlot::UpdatePlot(){
histFrameIndexTitle->setText(GetHistTitle(0)); histFrameIndexTitle->setText(GetHistTitle(0));
plotHistogram->attach(plot1D); plotHistogram->attach(plot1D);
//refixing all the zooming //refixing all the zooming
plot1D->SetXMinMax(startPixel,endPixel); plot1D->SetXMinMax(startPixel,endPixel);
plot1D->SetYMinMax(0,plotHistogram->boundingRect().height()); plot1D->SetYMinMax(0,plotHistogram->boundingRect().height());
plot1D->SetZoomBase(startPixel,0,endPixel-startPixel,plotHistogram->boundingRect().height()); plot1D->SetZoomBase(startPixel,0,endPixel-startPixel,plotHistogram->boundingRect().height());
} }
//not histogram //not histogram
else{ else{
@ -1403,9 +1405,8 @@ void qDrawPlot::UpdatePlot(){
// firstPlot = false; // firstPlot = false;
//} //}
} }
}
/**moved from below (had applied to histograms as well) to here, */
// update range if required // update range if required
if(XYRangeChanged){ if(XYRangeChanged){
if(!IsXYRange[qDefs::XMINIMUM]) XYRangeValues[qDefs::XMINIMUM]= plot1D->GetXMinimum(); if(!IsXYRange[qDefs::XMINIMUM]) XYRangeValues[qDefs::XMINIMUM]= plot1D->GetXMinimum();
@ -1419,6 +1420,7 @@ void qDrawPlot::UpdatePlot(){
if(!histogram) if(!histogram)
XYRangeChanged = false; XYRangeChanged = false;
} }
/**moved from below (had applied to histograms as well) to here, */
//Display Statistics //Display Statistics
if(displayStatistics){ if(displayStatistics){
double min=0,max=0,sum=0; double min=0,max=0,sum=0;
@ -1430,6 +1432,8 @@ void qDrawPlot::UpdatePlot(){
lblMaxDisp->setText(QString("%1").arg(max)); lblMaxDisp->setText(QString("%1").arg(max));
lblSumDisp->setText(QString("%1").arg(sum)); lblSumDisp->setText(QString("%1").arg(sum));
} }
}
if(saveAll) SavePlotAutomatic(); if(saveAll) SavePlotAutomatic();
} }