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

rxr sls namespace (#457)

Browse Source 
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
This commit is contained in:
Dhanya Thattil
2022-05-18 11:48:38 +02:00
committed by GitHub
parent fcc7f7aef8
commit 4259363169
88 changed files with 1200 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -7,7 +7,9 @@
#include <QStandardItemModel>
#include <QTimer>
qTabMeasurement::qTabMeasurement(QWidget *parent, sls::Detector *detector,
namespace sls {
qTabMeasurement::qTabMeasurement(QWidget *parent, Detector *detector,
qDrawPlot *p)
: QWidget(parent), det(detector), plot(p), progressTimer(nullptr) {
setupUi(this);
@ -343,7 +345,7 @@ void qTabMeasurement::GetTimingMode() {
if (det->getDetectorType().squash() == slsDetectorDefs::MYTHEN3) {
auto retvals = det->getTimingMode();
auto is_master = det->getMaster();
sls::Result<slsDetectorDefs::timingMode> masterRetvals;
Result<slsDetectorDefs::timingMode> masterRetvals;
for (size_t i = 0; i != is_master.size(); ++i) {
if (is_master[i]) {
masterRetvals.push_back(retvals[i]);
@ -370,7 +372,7 @@ void qTabMeasurement::GetTimingMode() {
}
break;
default:
throw sls::RuntimeError(std::string("Unknown timing mode: ") +
throw RuntimeError(std::string("Unknown timing mode: ") +
std::to_string(retval));
}
}
@ -407,7 +409,7 @@ void qTabMeasurement::GetBurstMode() {
ShowTriggerDelay();
break;
default:
throw sls::RuntimeError(std::string("Unknown burst mode: ") +
throw RuntimeError(std::string("Unknown burst mode: ") +
std::to_string(retval));
}
}
@ -1017,3 +1019,5 @@ void qTabMeasurement::Refresh() {
LOG(logDEBUG) << "**Updated Measurement Tab";
}
} // namespace sls