detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode

Browse Source
This commit is contained in:
maliakal_d
2020-09-07 16:13:33 +02:00
parent fb8842e048
commit b20720686e
12 changed files with 144 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorGui/forms/form_tab_measurement.ui
View File

@ -1664,11 +1664,6 @@ Frame period between exposures.
<string>Timing Mode of the detector.
#timing#</string>
</property>
<item>
<property name="text">
<string>Off</string>
</property>
</item>
<item>
<property name="text">
<string>Burst Internal</string>
@ -1676,7 +1671,17 @@ Frame period between exposures.
</item>
<item>
<property name="text">
<string>Burst external</string>
<string>Burst External</string>
</property>
</item>
<item>
<property name="text">
<string>Continuous Internal</string>
</property>
</item>
<item>
<property name="text">
<string>Continuous External</string>
</property>
</item>
</widget>

9
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -152,7 +152,11 @@ void qTabMeasurement::Initialization() {
void qTabMeasurement::ShowTriggerDelay() {
bool showTrigger = true;
if (det->getDetectorType().squash() == slsDetectorDefs::GOTTHARD2) {
if ((comboBurstMode->currentIndex() != slsDetectorDefs::BURST_OFF) &&
// burst and auto
if ((comboBurstMode->currentIndex() ==
slsDetectorDefs::BURST_INTERNAL ||
comboBurstMode->currentIndex() ==
slsDetectorDefs::BURST_EXTERNAL) &&
(comboTimingMode->currentIndex() == AUTO)) {
// show burst, burstperiod, not trigger or delay
showTrigger = false;
@ -368,9 +372,10 @@ void qTabMeasurement::GetBurstMode() {
auto retval = det->getBurstMode().tsquash(
"Inconsistent burst mode for all detectors.");
switch (retval) {
case slsDetectorDefs::BURST_OFF:
case slsDetectorDefs::BURST_INTERNAL:
case slsDetectorDefs::BURST_EXTERNAL:
case slsDetectorDefs::CONTINUOUS_INTERNAL:
case slsDetectorDefs::CONTINUOUS_EXTERNAL:
comboBurstMode->setCurrentIndex((int)retval);
ShowTriggerDelay();
break;