This commit is contained in:
2019-06-27 16:39:53 +02:00
parent 06834617de
commit 9f61104f0d
9 changed files with 210 additions and 347 deletions

View File

@ -53,9 +53,10 @@ class qCloneWidget : public QMainWindow {
/**
* Set the range of the 1d plot
* @param IsXYRange array of x,y,min,max if these values are set
* @param XYRangeValues array of set values of x,y, min, max
* @param XYRange array of set values of x,y,
* min, max
*/
void SetRange(bool IsXYRange[], double XYRangeValues[]);
void SetRange(bool IsXYRange[], double XYRange[]);
SlsQt1DPlot *Get1dPlot();
@ -72,6 +73,7 @@ class qCloneWidget : public QMainWindow {
char *GetCurrentTimeStamp();
void DisplayStats(bool enable, QString min, QString max, QString sum);
signals:
void CloneClosedSignal(int);
@ -87,7 +89,7 @@ class qCloneWidget : public QMainWindow {
QwtSymbol *marker;
QwtSymbol *nomarker;
QGridLayout *mainLayout;
QGroupBox *cloneBox;
QGroupBox *boxPlot;
QLabel *lblHistTitle;
};

View File

@ -97,7 +97,7 @@ class qDefs : public QWidget {
/**
* range of x and y axes
*/
enum range { XMINIMUM, XMAXIMUM, YMINIMUM, YMAXIMUM };
enum range { XMIN, XMAX, YMIN, YMAX };
/**
* function enums for the qServer and qClient

View File

@ -106,15 +106,16 @@ class qDrawPlot : public QWidget {
void Initialization();
void SetupStatistics();
void SetupPlots();
int LockLastImageArray();
int UnlockLastImageArray();
void SetStyle(SlsQtH1D *h);
void GetStatistics(double &min, double &max, double &sum, double *array, int size);
void DetachHists();
void UpdateXYRange();
int StartDaqForGui();
int StopDaqForGui();
bool StartOrStopThread(bool start);
@ -130,6 +131,7 @@ class qDrawPlot : public QWidget {
static int GetProgressCallBack(double currentProgress, void *this_pointer);
void toDoublePixelData(double *dest, char *source, int size, int databytes, int dr, double *gaindest = NULL);
static const int NUM_PEDESTAL_FRAMES = 20;
multiSlsDetector *myDet;
slsDetectorDefs::detectorType detType;
@ -162,8 +164,8 @@ class qDrawPlot : public QWidget {
QString yTitle2d{"Pixel"};
QString zTitle2d{"Intensity"};
bool XYRangeChanged{false};
double XYRangeValues[4]{0, 0, 0, 0};
bool isXYRangeEnable[4]{false, false, false, false};
double XYRange[4]{0, 0, 0, 0};
bool isXYRange[4]{false, false, false, false};
// data
unsigned int nHists{1};