included pedestal and also moved the frame index out of graph so it doesnt keep moving

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@119 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-11-30 17:05:06 +00:00
parent 382554afe9
commit bbb6e21607
12 changed files with 350 additions and 28 deletions

View File

@ -126,6 +126,8 @@ private:
QCheckBox *chkAutoFName;
QCheckBox *chkSaveAll;
QLabel *lblHistTitle;
/** Gets the current time stamp for the window title*/
char* GetCurrentTimeStamp();

View File

@ -149,8 +149,11 @@ void SetScanArgument(int scanArg);
/** sets stop_signal to true */
void StopAcquisition(){ stop_signal = true; };
//pedestal
/** reset pedestal */
void ResetPedestal();
/** Calculate Pedestal */
void CalculatePedestal();
@ -304,6 +307,10 @@ SlsQt2DPlotLayout* plot2D;
QVector<SlsQtH1D*> plot1D_hists;
/**label with frame index for those with many frames per file*/
QLabel *histFrameIndexTitle;
/** Current Measurement */
int currentMeasurement;
/** currentFrame */
@ -464,6 +471,17 @@ bool backwardScanPlot;
bool fileSaveEnable;
//pedstal
/** Number of pedestal frames*/
static const int NUM_PEDESTAL_FRAMES = 20;
/**reset pedestal*/
bool resetPedestal;
/** pedestal values */
double* pedestalVals;
/** count for 20 frames to calculate the pedestal */
int pedestalCount;
signals:
void UpdatingPlotFinished();
void InterpolateSignal(bool);

View File

@ -13,10 +13,11 @@
/** Project Class Headers */
class multiSlsDetector;
class slsDetector;
#include "sls_detector_defs.h"
/** Qt Include Headers */
#include <QTreeWidget>
/** C++ Include Headers */
#include "sls_detector_defs.h"
/**
*@short sets up the Debugging parameters

View File

@ -12,6 +12,7 @@
#include "ui_form_tab_plot.h"
/** Project Class Headers */
class multiSlsDetector;
#include "sls_detector_defs.h"
/** Qt Project Class Headers */
class qDrawPlot;
/** Qt Include Headers */
@ -54,6 +55,7 @@ private:
/** The Plot widget */
qDrawPlot *myPlot;
/** 1d/2d plot */
bool isOneD;
bool isOriginallyOneD;