mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 11:20:04 +02:00
allow half modules and odd number of half modules to use the gui with gap pixels disabled (#655)
This commit is contained in:
parent
e6505650cb
commit
fc42720208
@ -47,6 +47,7 @@ class qTabPlot : public QWidget, private Ui::TabPlotObject {
|
|||||||
private:
|
private:
|
||||||
void SetupWidgetWindow();
|
void SetupWidgetWindow();
|
||||||
void Initialization();
|
void Initialization();
|
||||||
|
bool VerifyGapPixelsAllowed();
|
||||||
void Select1DPlot(bool enable);
|
void Select1DPlot(bool enable);
|
||||||
void GetGapPixels();
|
void GetGapPixels();
|
||||||
void GetStreamingFrequency();
|
void GetStreamingFrequency();
|
||||||
@ -60,7 +61,8 @@ class qTabPlot : public QWidget, private Ui::TabPlotObject {
|
|||||||
|
|
||||||
Detector *det;
|
Detector *det;
|
||||||
qDrawPlot *plot;
|
qDrawPlot *plot;
|
||||||
bool is1d;
|
bool is1d{false};
|
||||||
|
bool isGapPixelsAllowed{false};
|
||||||
|
|
||||||
/** default plot and axis titles */
|
/** default plot and axis titles */
|
||||||
static QString defaultPlotTitle;
|
static QString defaultPlotTitle;
|
||||||
|
@ -16,7 +16,7 @@ QString qTabPlot::defaultImageYAxisTitle("Pixel");
|
|||||||
QString qTabPlot::defaultImageZAxisTitle("Intensity");
|
QString qTabPlot::defaultImageZAxisTitle("Intensity");
|
||||||
|
|
||||||
qTabPlot::qTabPlot(QWidget *parent, Detector *detector, qDrawPlot *p)
|
qTabPlot::qTabPlot(QWidget *parent, Detector *detector, qDrawPlot *p)
|
||||||
: QWidget(parent), det(detector), plot(p), is1d(false) {
|
: QWidget(parent), det(detector), plot(p) {
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
SetupWidgetWindow();
|
SetupWidgetWindow();
|
||||||
LOG(logDEBUG) << "Plot ready";
|
LOG(logDEBUG) << "Plot ready";
|
||||||
@ -57,11 +57,7 @@ void qTabPlot::SetupWidgetWindow() {
|
|||||||
chkGainPlot1D->setChecked(true);
|
chkGainPlot1D->setChecked(true);
|
||||||
plot->EnableGainPlot(true);
|
plot->EnableGainPlot(true);
|
||||||
break;
|
break;
|
||||||
case slsDetectorDefs::EIGER:
|
|
||||||
chkGapPixels->setEnabled(true);
|
|
||||||
break;
|
|
||||||
case slsDetectorDefs::JUNGFRAU:
|
case slsDetectorDefs::JUNGFRAU:
|
||||||
chkGapPixels->setEnabled(true);
|
|
||||||
chkGainPlot->setEnabled(true);
|
chkGainPlot->setEnabled(true);
|
||||||
chkGainPlot->setChecked(true);
|
chkGainPlot->setChecked(true);
|
||||||
plot->EnableGainPlot(true);
|
plot->EnableGainPlot(true);
|
||||||
@ -69,6 +65,8 @@ void qTabPlot::SetupWidgetWindow() {
|
|||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
isGapPixelsAllowed = VerifyGapPixelsAllowed();
|
||||||
|
chkGapPixels->setEnabled(isGapPixelsAllowed);
|
||||||
|
|
||||||
Select1DPlot(is1d);
|
Select1DPlot(is1d);
|
||||||
Initialization();
|
Initialization();
|
||||||
@ -195,6 +193,29 @@ void qTabPlot::Initialization() {
|
|||||||
connect(dispZMax, SIGNAL(editingFinished()), this, SLOT(isZMaxModified()));
|
connect(dispZMax, SIGNAL(editingFinished()), this, SLOT(isZMaxModified()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool qTabPlot::VerifyGapPixelsAllowed() {
|
||||||
|
try {
|
||||||
|
switch (det->getDetectorType().squash()) {
|
||||||
|
case slsDetectorDefs::JUNGFRAU:
|
||||||
|
return true;
|
||||||
|
case slsDetectorDefs::EIGER:
|
||||||
|
if (det->getQuad().squash(false)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// full modules
|
||||||
|
if (det->getModuleGeometry().y % 2 == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CATCH_DISPLAY("Could not verify if gap pixels allowed.",
|
||||||
|
"qTabPlot::VerifyGapPixelsAllowed")
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void qTabPlot::Select1DPlot(bool enable) {
|
void qTabPlot::Select1DPlot(bool enable) {
|
||||||
LOG(logDEBUG) << "Selecting " << (enable ? "1" : "2") << "D Plot";
|
LOG(logDEBUG) << "Selecting " << (enable ? "1" : "2") << "D Plot";
|
||||||
is1d = enable;
|
is1d = enable;
|
||||||
@ -772,15 +793,10 @@ void qTabPlot::Refresh() {
|
|||||||
boxFrequency->setEnabled(true);
|
boxFrequency->setEnabled(true);
|
||||||
GetStreamingFrequency();
|
GetStreamingFrequency();
|
||||||
GetHwm();
|
GetHwm();
|
||||||
// gain plot, gap pixels enable
|
// gain plot
|
||||||
switch (det->getDetectorType().squash()) {
|
switch (det->getDetectorType().squash()) {
|
||||||
case slsDetectorDefs::EIGER:
|
|
||||||
chkGapPixels->setEnabled(true);
|
|
||||||
GetGapPixels();
|
|
||||||
break;
|
|
||||||
case slsDetectorDefs::JUNGFRAU:
|
case slsDetectorDefs::JUNGFRAU:
|
||||||
chkGainPlot->setEnabled(true);
|
chkGainPlot->setEnabled(true);
|
||||||
chkGapPixels->setEnabled(true);
|
|
||||||
GetGapPixels();
|
GetGapPixels();
|
||||||
break;
|
break;
|
||||||
case slsDetectorDefs::GOTTHARD2:
|
case slsDetectorDefs::GOTTHARD2:
|
||||||
@ -789,6 +805,11 @@ void qTabPlot::Refresh() {
|
|||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
// gap pixels
|
||||||
|
if (isGapPixelsAllowed) {
|
||||||
|
chkGapPixels->setEnabled(true);
|
||||||
|
GetGapPixels();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
boxFrequency->setEnabled(false);
|
boxFrequency->setEnabled(false);
|
||||||
chkGainPlot->setEnabled(false);
|
chkGainPlot->setEnabled(false);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user