mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 10:07:59 +02:00
histogram included, improved ready every frame, and other stuff.. a working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@230 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -25,6 +25,14 @@ class qCloneWidget;
|
||||
#include <QString>
|
||||
#include "qwt_symbol.h"
|
||||
|
||||
|
||||
#include <QVector>
|
||||
#include <qwt_series_data.h>
|
||||
#include <qwt_plot_histogram.h>
|
||||
#include <qwt_plot_grid.h>
|
||||
#include <qwt_column_symbol.h>
|
||||
#include <qpen.h>
|
||||
|
||||
/** C++ Include Headers */
|
||||
|
||||
|
||||
@ -134,6 +142,9 @@ public:
|
||||
/** set binary range */
|
||||
void SetBinary(bool enable, int from=0, int to=0);
|
||||
|
||||
/** Enable/Disable Histogram */
|
||||
void SetHistogram(bool enable,int min=0, int max=0, int size=0){histogram = enable;histFrom=min;histTo=max;histSize=size;};
|
||||
|
||||
public slots:
|
||||
/** To select 1D or 2D plot
|
||||
@param i is 1 for 1D, else 2D plot */
|
||||
@ -545,6 +556,17 @@ QLabel *lblSumDisp;
|
||||
bool displayStatistics;
|
||||
|
||||
|
||||
/* histogram */
|
||||
bool histogram;
|
||||
int histFrom;
|
||||
int histTo;
|
||||
int histSize;
|
||||
QwtPlotGrid *grid;
|
||||
QwtPlotHistogram *plotHistogram;
|
||||
QVector<QwtIntervalSample> histogramSamples;
|
||||
|
||||
|
||||
|
||||
|
||||
signals:
|
||||
void UpdatingPlotFinished();
|
||||
|
@ -70,6 +70,7 @@ private:
|
||||
QDoubleSpinBox *spinTimeGap;
|
||||
QComboBox *comboTimeGapUnit;
|
||||
QButtonGroup *btnGroupScan;
|
||||
QButtonGroup *btnGroupPlotType;
|
||||
|
||||
/** some Default Values */
|
||||
static QString defaultPlotTitle;
|
||||
@ -97,12 +98,6 @@ private:
|
||||
*/
|
||||
void Initialization();
|
||||
|
||||
/** This enabled/disables the nth frame from frequency plot
|
||||
* @param enable enable/disable
|
||||
*/
|
||||
void EnablingNthFrameFunction(bool enable);
|
||||
|
||||
|
||||
|
||||
public slots:
|
||||
/** Set frequency between plots*/
|
||||
@ -110,7 +105,7 @@ public slots:
|
||||
|
||||
/** Enable Scan box
|
||||
*/
|
||||
void EnableScanBox();
|
||||
void EnableScanBox(bool Histo=false);
|
||||
|
||||
/** Update all ranges, interpolate etc after cloning
|
||||
*/
|
||||
|
@ -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 0x226
|
||||
//#define SVNREV 0x229
|
||||
//#define SVNKIND ""
|
||||
//#define SVNSCHED ""
|
||||
#define SVNAUTH "l_maliakal_d"
|
||||
#define SVNREV 0x226
|
||||
#define SVNDATE 0x20130813
|
||||
#define SVNREV 0x229
|
||||
#define SVNDATE 0x20130816
|
||||
//
|
||||
|
Reference in New Issue
Block a user