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

Merge pull request #163 from slsdetectorgroup/guitrimval

Browse Source 
gui: enable trimming for m3
This commit is contained in:
Dhanya Thattil 2020-09-03 17:38:04 +02:00 committed by GitHub
commit 497eff6f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -222,12 +222,12 @@ void qDetectorMain::SetUpDetector(const std::string &config_file, int multiID) {
actionLoadTrimbits->setEnabled(false); actionLoadTrimbits->setEnabled(false);
switch (detType) { switch (detType) {
case slsDetectorDefs::EIGER: case slsDetectorDefs::EIGER:
case slsDetectorDefs::MYTHEN3:
actionLoadTrimbits->setEnabled(true); actionLoadTrimbits->setEnabled(true);
break; break;
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
case slsDetectorDefs::JUNGFRAU: case slsDetectorDefs::JUNGFRAU:
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::MYTHEN3:
case slsDetectorDefs::GOTTHARD2: case slsDetectorDefs::GOTTHARD2:
break; break;
default: default:
@ -334,7 +334,8 @@ void qDetectorMain::EnableModes(QAction *action) {
tabs->setTabEnabled(ADVANCED, enable); tabs->setTabEnabled(ADVANCED, enable);
actionLoadTrimbits->setVisible(enable && actionLoadTrimbits->setVisible(enable &&
detType == slsDetectorDefs::EIGER); (detType == slsDetectorDefs::EIGER ||
detType == slsDetectorDefs::MYTHEN3));
LOG(logINFO) << "Expert Mode: " << qDefs::stringEnable(enable); LOG(logINFO) << "Expert Mode: " << qDefs::stringEnable(enable);
} }
@ -400,11 +401,8 @@ void qDetectorMain::ExecuteUtilities(QAction *action) {
this, tr("Load Detector Trimbits"), fName, this, tr("Load Detector Trimbits"), fName,
tr("Trimbit files (*.trim noise.sn*);;All Files(*)")); tr("Trimbit files (*.trim noise.sn*);;All Files(*)"));
fileDialog->setFileMode(QFileDialog::AnyFile); fileDialog->setFileMode(QFileDialog::AnyFile);
if (fileDialog->exec() == QDialog::Accepted) if (fileDialog->exec() == QDialog::Accepted) {
fName = fileDialog->selectedFiles()[0]; fName = fileDialog->selectedFiles()[0];
// Gets called when cancelled as well
if (!fName.isEmpty()) {
det->loadTrimbits(std::string(fName.toAscii().constData())); det->loadTrimbits(std::string(fName.toAscii().constData()));
qDefs::Message(qDefs::INFORMATION, qDefs::Message(qDefs::INFORMATION,
"The Trimbits have been loaded successfully.", "The Trimbits have been loaded successfully.",

1
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -29,6 +29,7 @@ void qTabAdvanced::SetupWidgetWindow() {
tab_roi->setEnabled(true); tab_roi->setEnabled(true);
break; break;
case slsDetectorDefs::MYTHEN3: case slsDetectorDefs::MYTHEN3:
tab_trimming->setEnabled(true);
lblDiscardBits->setEnabled(true); lblDiscardBits->setEnabled(true);
spinDiscardBits->setEnabled(true); spinDiscardBits->setEnabled(true);
lblGateIndex->setEnabled(true); lblGateIndex->setEnabled(true);