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

gui fix

Browse Source
This commit is contained in:
maliakal_d 2020-05-20 12:04:48 +02:00
parent 3ebb1fca02
commit dc8f67cd7b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorGui/include/qDefs.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "logger.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include <QAbstractButton> #include <QAbstractButton>

1
slsDetectorGui/include/qTabMeasurement.h
View File

@ -25,6 +25,7 @@ class qTabMeasurement : public QWidget, private Ui::TabMeasurementObject {
void SetNumTriggers(int val); void SetNumTriggers(int val);
void SetNumBursts(int val); void SetNumBursts(int val);
void SetNumSamples(int val); void SetNumSamples(int val);
void SetNumGates(int val);
void SetExposureTime(); void SetExposureTime();
void SetAcquisitionPeriod(); void SetAcquisitionPeriod();
void SetDelay(); void SetDelay();

8
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -197,11 +197,11 @@ void qTabMeasurement::SetupTimingMode() {
item[(int)BURST_TRIGGER]->setEnabled(false); item[(int)BURST_TRIGGER]->setEnabled(false);
item[(int)TRIGGER_GATED]->setEnabled(false); item[(int)TRIGGER_GATED]->setEnabled(false);
switch (det->getDetectorType().squash()) { switch (det->getDetectorType().squash()) {
case EIGER: case slsDetectorDefs::EIGER:
item[(int)GATED]->setEnabled(true); item[(int)GATED]->setEnabled(true);
item[(int)BURST_TRIGGER]->setEnabled(true); item[(int)BURST_TRIGGER]->setEnabled(true);
break; break;
case MYTHEN3: case slsDetectorDefs::MYTHEN3:
item[(int)GATED]->setEnabled(true); item[(int)GATED]->setEnabled(true);
item[(int)TRIGGER_GATED]->setEnabled(true); item[(int)TRIGGER_GATED]->setEnabled(true);
break; break;
@ -498,8 +498,8 @@ void qTabMeasurement::GetExposureTime() {
spinExpTime->setValue(-1); spinExpTime->setValue(-1);
bool inconsistentGateValues = false; bool inconsistentGateValues = false;
Result<ns> retval; std::chrono::nanoseconds retval;
if (det->getDetectorType().squash() == MYTHEN3) { if (det->getDetectorType().squash() == slsDetectorDefs::MYTHEN3) {
auto retvals = det->getExptimeForAllGates().tsquash( auto retvals = det->getExptimeForAllGates().tsquash(
"Inconsistent exposure time for all detectors."); "Inconsistent exposure time for all detectors.");
// all gates have same value // all gates have same value