mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 18:17:59 +02:00
displaying statistics works now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@226 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -30,6 +30,9 @@ class SlsQtH1D;
|
||||
#include <QComboBox>
|
||||
#include <QPushButton>
|
||||
#include <QCheckBox>
|
||||
#include <QString>
|
||||
#include <QSpacerItem>
|
||||
#include <QWidget>
|
||||
/** C++ Include Headers */
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
@ -44,7 +47,8 @@ class qCloneWidget:public QMainWindow{
|
||||
public:
|
||||
/** \short The constructor
|
||||
*/
|
||||
qCloneWidget(QWidget *parent,int id,QString title,int numDim,SlsQt1DPlot*& plot1D,SlsQt2DPlotLayout*& plot2D,string FilePath);
|
||||
qCloneWidget(QWidget *parent,int id,QString title,int numDim,SlsQt1DPlot*& plot1D,SlsQt2DPlotLayout*& plot2D,string FilePath,
|
||||
bool displayStats, QString min, QString max, QString sum);
|
||||
|
||||
/** Destructor
|
||||
*/
|
||||
@ -125,6 +129,9 @@ private:
|
||||
/** Gets the current time stamp for the window title*/
|
||||
char* GetCurrentTimeStamp();
|
||||
|
||||
/** Display Statistics */
|
||||
void DisplayStats(bool enable, QString min, QString max, QString sum);
|
||||
|
||||
|
||||
private slots:
|
||||
/** Save Plot */
|
||||
|
@ -172,6 +172,12 @@ void RecalculatePedestal();
|
||||
void SetAccumulate(bool enable);
|
||||
/** Reset accumulation */
|
||||
void ResetAccumulate();
|
||||
/** Display Statistics */
|
||||
void DisplayStatistics(bool enable);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private:
|
||||
@ -260,6 +266,15 @@ void SetStyle(SlsQtH1D* h){
|
||||
};
|
||||
|
||||
|
||||
/** Find Statistics
|
||||
* @param min is the minimum value
|
||||
* @param max is the maximum value
|
||||
* @param sum is the sum of all values
|
||||
* @param array is the array to get statistics from
|
||||
* @param size is the size of the array */
|
||||
void GetStatistics(double &min, double &max, double &sum, double* array, int size);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -521,6 +536,15 @@ int binaryTo;
|
||||
bool clientInitiated;
|
||||
|
||||
|
||||
/** display statistics widgets */
|
||||
QWidget *widgetStatistics;
|
||||
QLabel *lblMinDisp;
|
||||
QLabel *lblMaxDisp;
|
||||
QLabel *lblSumDisp;
|
||||
|
||||
bool displayStatistics;
|
||||
|
||||
|
||||
|
||||
signals:
|
||||
void UpdatingPlotFinished();
|
||||
|
@ -2,10 +2,10 @@
|
||||
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
|
||||
//#define SVNREPPATH ""
|
||||
#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
|
||||
//#define SVNREV 0x218
|
||||
//#define SVNREV 0x225
|
||||
//#define SVNKIND ""
|
||||
//#define SVNSCHED ""
|
||||
#define SVNAUTH "l_maliakal_d"
|
||||
#define SVNREV 0x218
|
||||
#define SVNDATE 0x20130807
|
||||
#define SVNREV 0x225
|
||||
#define SVNDATE 0x20130812
|
||||
//
|
||||
|
Reference in New Issue
Block a user