From c92830f854db01dd8b30df4bc627c772a7e7fe25 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 2 Jun 2025 15:16:39 +0200 Subject: [PATCH 1/2] updates files/variants for pmods for 9.2.0 (#1233) --- psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants index 4a2904a5d..f546606f3 100644 --- a/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants +++ b/psi-pmodules/DetectorSoftware/slsDetectorPackage/files/variants @@ -14,4 +14,4 @@ slsDetectorPackage/8.0.2_rh8 stable cmake/3.15.5 Qt/5.12.10 slsDetectorPackage/9.0.0_rh8 stable cmake/3.15.5 Qt/5.12.10 slsDetectorPackage/9.1.0_rh8 stable cmake/3.15.5 Qt/5.12.10 slsDetectorPackage/9.1.1_rh8 stable cmake/3.15.5 Qt/5.12.10 - +slsDetectorPackage/9.2.0_rh8 stable cmake/3.15.5 Qt/5.12.10 From f84454fbc11f830690c3124e92a38303b08f19d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Fr=C3=B6jdh?= Date: Tue, 3 Jun 2025 08:36:29 +0200 Subject: [PATCH 2/2] tests for bool in ToString/StringTo (#1230) - Added tests for ToString/StringTo - Added overload for ToString of bool (previously went through int) --- slsDetectorSoftware/CMakeLists.txt | 1 - slsSupportLib/include/sls/ToString.h | 2 ++ slsSupportLib/src/ToString.cpp | 7 +++++++ slsSupportLib/tests/test-ToString.cpp | 11 +++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index e61084330..6147546d6 100755 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -100,7 +100,6 @@ if(SLS_USE_TEXTCLIENT) target_link_libraries(${val1} slsDetectorStatic pthread - rt ) SET_SOURCE_FILES_PROPERTIES( src/Caller.cpp PROPERTIES COMPILE_FLAGS "-Wno-unused-variable -Wno-unused-but-set-variable") diff --git a/slsSupportLib/include/sls/ToString.h b/slsSupportLib/include/sls/ToString.h index fc9a431bf..ea97a8436 100644 --- a/slsSupportLib/include/sls/ToString.h +++ b/slsSupportLib/include/sls/ToString.h @@ -47,6 +47,8 @@ std::string ToString(const defs::polarity s); std::string ToString(const defs::timingInfoDecoder s); std::string ToString(const defs::collectionMode s); +std::string ToString(bool value); + std::string ToString(const slsDetectorDefs::xy &coord); std::ostream &operator<<(std::ostream &os, const slsDetectorDefs::xy &coord); std::string ToString(const slsDetectorDefs::ROI &roi); diff --git a/slsSupportLib/src/ToString.cpp b/slsSupportLib/src/ToString.cpp index f815cdd27..1e109d9b1 100644 --- a/slsSupportLib/src/ToString.cpp +++ b/slsSupportLib/src/ToString.cpp @@ -5,6 +5,13 @@ namespace sls { + +std::string ToString(bool value) { + return value ? "1" : "0"; +} + + + std::string ToString(const slsDetectorDefs::xy &coord) { std::ostringstream oss; oss << '[' << coord.x << ", " << coord.y << ']'; diff --git a/slsSupportLib/tests/test-ToString.cpp b/slsSupportLib/tests/test-ToString.cpp index 636a91c28..4232169eb 100644 --- a/slsSupportLib/tests/test-ToString.cpp +++ b/slsSupportLib/tests/test-ToString.cpp @@ -16,6 +16,17 @@ namespace sls { using namespace sls::time; +TEST_CASE("Convert bool to string", "[support]") { + REQUIRE(ToString(true) == "1"); + REQUIRE(ToString(false) == "0"); +} + +TEST_CASE("Convert string to bool", "[support]") { + REQUIRE(StringTo("1") == true); + REQUIRE(StringTo("0") == false); +} + + TEST_CASE("Integer conversions", "[support]") { REQUIRE(ToString(0) == "0"); REQUIRE(ToString(1) == "1");