diff --git a/slsDetectorGui/forms/form_cloneplot.ui b/slsDetectorGui/forms/form_cloneplot.ui index e489efbcb..0965e65f2 100644 --- a/slsDetectorGui/forms/form_cloneplot.ui +++ b/slsDetectorGui/forms/form_cloneplot.ui @@ -6,8 +6,8 @@ 0 0 - 500 - 350 + 376 + 425 @@ -240,7 +240,7 @@ 0 0 - 500 + 376 28 diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index a4049a285..1577a2395 100755 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -31,6 +31,7 @@ class qDefs : public QWidget { static const int Q_FONT_SIZE=9; static const int DATA_GAIN_PLOT_RATIO=5; + static const int MIN_HEIGHT_GAIN_PLOT_1D=75; static void DisplayExceptions(std::string emsg, std::string src) { try { diff --git a/slsDetectorGui/src/qCloneWidget.cpp b/slsDetectorGui/src/qCloneWidget.cpp index af7987ea2..148b0d4dc 100755 --- a/slsDetectorGui/src/qCloneWidget.cpp +++ b/slsDetectorGui/src/qCloneWidget.cpp @@ -55,14 +55,22 @@ void qCloneWidget::SetupWidgetWindow(QString title) { if (gainplot2d == nullptr) { plotLayout->addWidget(plot2d); } else { - gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO); - gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO); int ratio = qDefs::DATA_GAIN_PLOT_RATIO - 1; plotLayout->addWidget(plot2d, 0, 0, ratio, ratio); plotLayout->addWidget(gainplot2d, 0, ratio, 1, 1, Qt::AlignRight | Qt::AlignTop); } } connect(actionSaveClone, SIGNAL(triggered()), this, SLOT(SavePlot())); + this->show(); + if (gainplot1d != nullptr) { + gainplot1d->setMinimumHeight(qDefs::MIN_HEIGHT_GAIN_PLOT_1D); + gainplot1d->setFixedWidth(plot1d->width()); + // gainplot1d->setFixedHeight(plot1d->height() / qDefs::DATA_GAIN_PLOT_RATIO - 1); + } + if (gainplot2d != nullptr) { + gainplot2d->setFixedWidth(plot2d->width() / qDefs::DATA_GAIN_PLOT_RATIO); + gainplot2d->setFixedHeight(plot2d->height() / qDefs::DATA_GAIN_PLOT_RATIO); + } } void qCloneWidget::DisplayStats(bool enable, QString min, QString max, QString sum) { diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 80ab5c51a..d60492f4a 100755 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -561,14 +561,9 @@ void qDrawPlot::ClonePlot() { } } - qCloneWidget* q = new qCloneWidget(this, cloneplot1D, cloneplot2D, clonegainplot1D, + new qCloneWidget(this, cloneplot1D, cloneplot2D, clonegainplot1D, clonegainplot2D, boxPlot->title(), fileSavePath, fileSaveName, currentAcqIndex, displayStatistics, lblMinDisp->text(), lblMaxDisp->text(), lblSumDisp->text()); - q->show(); - if (clonegainplot1D != nullptr) { - clonegainplot1D->setFixedWidth(cloneplot1D->width()); - //clonegainplot1D->setFixedHeight(cloneplot1D->height());// / qDefs::DATA_GAIN_PLOT_RATIO - 1); - } } void qDrawPlot::SavePlot() { diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index aa774f950..2f5181fa8 100755 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer differ diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index c555294c7..d7ac3da2e 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APIRECEIVER 0x200227 #define APIGUI 0x200227 #define APICTB 0x200227 -#define APIGOTTHARD2 0x200304 #define APIMOENCH 0x200304 +#define APIGOTTHARD2 0x200304