diff --git a/slsDetectorGui/forms/form_tab_settings.ui b/slsDetectorGui/forms/form_tab_settings.ui index 632ace12f..1948a50dd 100755 --- a/slsDetectorGui/forms/form_tab_settings.ui +++ b/slsDetectorGui/forms/form_tab_settings.ui @@ -32,7 +32,7 @@ Form - + false @@ -51,7 +51,7 @@ - + false @@ -70,7 +70,7 @@ - + false @@ -109,7 +109,7 @@ - + false @@ -146,7 +146,7 @@ - + false @@ -183,7 +183,7 @@ - + false @@ -205,7 +205,7 @@ - + Qt::Vertical @@ -221,7 +221,7 @@ - + true @@ -334,7 +334,7 @@ - + false @@ -356,7 +356,7 @@ - + false @@ -393,7 +393,7 @@ - + Qt::Horizontal @@ -409,7 +409,7 @@ - + false @@ -431,7 +431,7 @@ - + false @@ -589,6 +589,57 @@ + + + + false + + + + 110 + 0 + + + + + 110 + 16777215 + + + + Gain Mode: + + + + + + + false + + + + 0 + 0 + + + + + 140 + 25 + + + + + 140 + 16777215 + + + + Settings of the detector. + #settings# + + + diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index 4579809ad..a78dbeb97 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -21,6 +21,7 @@ class qTabSettings : public QWidget, private Ui::TabSettingsObject { private: void SetupWidgetWindow(); void SetupDetectorSettings(); + void SetupGainMode(); void Initialization(); void GetSettings(); diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 90fe3542d..dd9753083 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -71,6 +71,9 @@ void qTabSettings::SetupWidgetWindow() { comboDynamicRange->setEnabled(true); lblThreshold->setEnabled(true); spinThreshold->setEnabled(true); + } else if (detType == slsDetectorDefs::JUNGFRAU) { + lblGainMode->setEnabled(true); + comboGainMode->setEnabled(true); } // default settings for the disabled @@ -83,6 +86,12 @@ void qTabSettings::SetupWidgetWindow() { spinThreshold2->setValue(-1); spinThreshold3->setValue(-1); } + + // default for gain mode + if (comboGainMode->isEnabled()) { + SetupGainMode(); + } + Initialization(); // default for the disabled GetDynamicRange(); @@ -113,6 +122,17 @@ void qTabSettings::SetupDetectorSettings() { } } +void qTabSettings::SetupGainMode() { + try { + auto list = det->getGainModeList(); + for (auto it : list) { + comboGainMode->addItem(sls::ToString(it).c_str()); + } + } + CATCH_DISPLAY(std::string("Could not setup gain mode"), + "qTabSettings::SetupGainMode") +} + void qTabSettings::Initialization() { // Settings if (comboSettings->isEnabled())