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

clang format

Browse Source
This commit is contained in:
maliakal_d
2021-10-19 14:49:43 +02:00
parent 3726ae3fd1
commit b39c64032d
66 changed files with 642 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorGui/include/qTabSettings.h
View File

@ -66,14 +66,7 @@ class qTabSettings : public QWidget, private Ui::TabSettingsObject {
NUMSETTINGS
};
enum {
DYNAMIC,
FORCE_SWITCH_G1,
FORCE_SWITCH_G2,
FIX_G1,
FIX_G2,
FIX_G0
};
enum { DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 };
bool isVisibleFixG0{false};
enum { DYNAMICRANGE_32, DYNAMICRANGE_16, DYNAMICRANGE_8, DYNAMICRANGE_4 };

4
slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#ifndef SLSQT1DPLOT_H
#define SLSQT1DPLOT_H

4
slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once
#include "SlsQt2DHist.h"
#include "SlsQt2DZoomer.h"

4
slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
/* TODO! short description */
#include "SlsQt1DPlot.h"

4
slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#include "SlsQt2DPlot.h"
// #include "sls/ansi.h"

45
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -449,36 +449,35 @@ void qDetectorMain::ExecuteHelp(QAction *action) {
CATCH_DISPLAY("Could not get client version.",
"qDetectorMain::ExecuteHelp")
qDefs::Message(qDefs::INFORMATION,
"<p style=\"font-family:verdana;\">"
qDefs::Message(
qDefs::INFORMATION,
"<p style=\"font-family:verdana;\">"
"<b>SLS Detector GUI version:&nbsp;&nbsp;&nbsp;" +
guiVersion +
"<br>SLS Detector Client version: " +
clientVersion +
"</b><br><br>"
"<b>SLS Detector GUI version:&nbsp;&nbsp;&nbsp;" +
guiVersion +
"<br>SLS Detector Client version: " + clientVersion +
"</b><br><br>"
"Common GUI to control the SLS Detectors: "
"Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and "
"Moench.<br><br>"
"Common GUI to control the SLS Detectors: "
"Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and "
"Moench.<br><br>"
"It can be operated in parallel with the command "
"line interface: sls_detector_put, sls_detector_get, "
"sls_detector_acquire and sls_detector_help.<br><br>"
"It can be operated in parallel with the command "
"line interface: sls_detector_put, sls_detector_get, "
"sls_detector_acquire and sls_detector_help.<br><br>"
"Support:<br>"
"Dhanya.Thattil@psi.ch <br>"
"Erik.Froejdh@psi.ch.<br><br><br>"
"Support:<br>"
"Dhanya.Thattil@psi.ch <br>"
"Erik.Froejdh@psi.ch.<br><br><br>"
"<br>slsDetectorGui Copyright (C) 2021 Contributors to SLS "
"Detector Package<br><br>"
"<br>slsDetectorGui Copyright (C) 2021 Contributors to SLS Detector Package<br><br>"
"See COPYING in root folder for Licensing details:<br>"
"LGPL-3.0-or-other"
"See COPYING in root folder for Licensing details:<br>"
"LGPL-3.0-or-other"
"<\\p>",
"qDetectorMain::ExecuteHelp");
"<\\p>",
"qDetectorMain::ExecuteHelp");
}
}

8
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -375,8 +375,8 @@ void qTabDataOutput::GetSpeed() {
disconnect(comboClkDivider, SIGNAL(currentIndexChanged(int)), this,
SLOT(SetSpeed(int)));
try {
auto retval =
det->getReadoutSpeed().tsquash("Readout Speed is inconsistent for all detectors.");
auto retval = det->getReadoutSpeed().tsquash(
"Readout Speed is inconsistent for all detectors.");
comboClkDivider->setCurrentIndex(static_cast<int>(retval));
}
CATCH_DISPLAY("Could not get readout speed.", "qTabDataOutput::GetSpeed")
@ -390,8 +390,8 @@ void qTabDataOutput::SetSpeed(int speed) {
try {
det->setReadoutSpeed(static_cast<slsDetectorDefs::speedLevel>(speed));
}
CATCH_HANDLE("Could not set readout speed.", "qTabDataOutput::SetSpeed", this,
&qTabDataOutput::GetSpeed)
CATCH_HANDLE("Could not set readout speed.", "qTabDataOutput::SetSpeed",
this, &qTabDataOutput::GetSpeed)
}
void qTabDataOutput::GetParallel() {

4
slsDetectorGui/src/qTabSettings.cpp
View File

@ -128,8 +128,8 @@ void qTabSettings::SetupDetectorSettings() {
item[(int)it]->setEnabled(true);
}
}
CATCH_DISPLAY(std::string("Could not setup settings"),
"qTabSettings::SetupDetectorSettings")
CATCH_DISPLAY(std::string("Could not setup settings"),
"qTabSettings::SetupDetectorSettings")
}
}