diff --git a/notice_to_add_for_every_file b/notice_to_add_for_every_file index 4d766242b..c0b5dd2a2 100644 --- a/notice_to_add_for_every_file +++ b/notice_to_add_for_every_file @@ -1,4 +1,4 @@ - Copyright 2021 Contributors to the SLS Detector Package + Copyright (C) 2021 Contributors to the SLS Detector Package This file is part of the SLS Detecotor Package. diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 634def39e..0f653fb00 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -439,33 +439,45 @@ void qDetectorMain::ExecuteHelp(QAction *action) { LOG(logINFO) << "About Common GUI for Jungfrau, Eiger, Mythen3, " "Gotthard, Gotthard2 and Moench detectors"; - std::string guiVersion = std::to_string(APIGUI); + std::string guiVersion = sls::ToStringHex(APIGUI); std::string clientVersion = "unknown"; try { - clientVersion = std::to_string(det->getClientVersion()); + clientVersion = sls::ToStringHex(det->getClientVersion()); } CATCH_DISPLAY("Could not get client version.", "qDetectorMain::ExecuteHelp") qDefs::Message(qDefs::INFORMATION, "

" - "SLS Detector GUI version:   " + + + "SLS Detector GUI version:   " + guiVersion + - "
" - "SLS Detector Client version: " + + "
SLS Detector Client version: " + clientVersion + - "

" + "


" + "Common GUI to control the SLS Detectors: " "Jungfrau, Eiger, Mythen3, Gotthard, Gotthard2 and " "Moench.

" + "It can be operated in parallel with the command " - "line interface:
" - "sls_detector_put,
sls_detector_get,
sls_" - "detector_acquire and
sls_detector_help.

" - "Please report bugs to:
" - "Dhanya.Thattil@psi.ch,
" - "Erik.Froejdh@psi.ch or
" - "Anna.Bergamaschi@psi.ch.<\\p>", + "line interface: sls_detector_put, sls_detector_get, " + "sls_detector_acquire and sls_detector_help.

" + + + "Support:
" + "Dhanya.Thattil@psi.ch
" + "Erik.Froejdh@psi.ch.


" + + "
slsDetectorGui Copyright (C) 2021

" + + "This program comes with ABSOLUTELY NO WARRANTY. " + "This is free software, and you are welcome to redistribute it " + "under certain conditions. Refer LICENSE and LICESNSE.lesser " + "in root folder for more details." + + + "<\\p>", "qDetectorMain::ExecuteHelp"); } } diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index f750b7cba..86256e6fd 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -369,26 +369,26 @@ void qTabDataOutput::SetRateCorrection() { } void qTabDataOutput::GetSpeed() { - LOG(logDEBUG) << "Getting Speed"; + LOG(logDEBUG) << "Getting Readout Speed"; disconnect(comboClkDivider, SIGNAL(currentIndexChanged(int)), this, SLOT(SetSpeed(int))); try { auto retval = - det->getSpeed().tsquash("Speed is inconsistent for all detectors."); + det->getReadoutSpeed().tsquash("Readout Speed is inconsistent for all detectors."); comboClkDivider->setCurrentIndex(static_cast(retval)); } - CATCH_DISPLAY("Could not get speed.", "qTabDataOutput::GetSpeed") + CATCH_DISPLAY("Could not get readout speed.", "qTabDataOutput::GetSpeed") connect(comboClkDivider, SIGNAL(currentIndexChanged(int)), this, SLOT(SetSpeed(int))); } void qTabDataOutput::SetSpeed(int speed) { - LOG(logINFO) << "Setting Speed to " + LOG(logINFO) << "Setting Readout Speed to " << comboClkDivider->currentText().toAscii().data(); try { - det->setSpeed(static_cast(speed)); + det->setReadoutSpeed(static_cast(speed)); } - CATCH_HANDLE("Could not set speed.", "qTabDataOutput::SetSpeed", this, + CATCH_HANDLE("Could not set readout speed.", "qTabDataOutput::SetSpeed", this, &qTabDataOutput::GetSpeed) }