From ff4103fcc5b11e0b9db2ca477e940052c2564e69 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Thu, 6 Nov 2025 16:11:22 +0100 Subject: [PATCH] jfjoch_viewer: Add calibration viewer (WIP) --- docs/CHANGELOG.md | 1 + tests/JFJochReaderTest.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index a5951b82..00351fbf 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -6,6 +6,7 @@ This is an UNSTABLE release and not recommended for production use (please use r * jfjoch_broker: Refactor of calibration logic for more clear code (likely to introduce problems) * jfjoch_viewer: Add option to handle user pixel mask (experimental) * jfjoch_viewer: More options for ROI +* jfjoch_viewer: Add window to display calibration ## 1.0.0-rc.96 This is an UNSTABLE release. diff --git a/tests/JFJochReaderTest.cpp b/tests/JFJochReaderTest.cpp index fe5d7f22..cef18455 100644 --- a/tests/JFJochReaderTest.cpp +++ b/tests/JFJochReaderTest.cpp @@ -115,7 +115,7 @@ TEST_CASE("JFJochReader_MasterFile_Calibration", "[HDF5][Full]") { CHECK(dataset->calibration_data[2] == "cf"); std::vector buffer; - + std::vector buff_2; REQUIRE_THROWS(reader.ReadCalibration(buffer, "c3")); CompressedImage test; REQUIRE_NOTHROW(test = reader.ReadCalibration(buffer, "c1")); @@ -123,18 +123,21 @@ TEST_CASE("JFJochReader_MasterFile_Calibration", "[HDF5][Full]") { CHECK(test.GetHeight() == 200); CHECK(test.GetWidth() == 300); CHECK(test.GetMode() == CompressedImageMode::Uint16); + CHECK(reinterpret_cast(test.GetUncompressedPtr(buff_2))[76] == 10); REQUIRE_NOTHROW(test = reader.ReadCalibration(buffer, "c2")); CHECK(test.GetByteDepth() == 4); CHECK(test.GetHeight() == 100); CHECK(test.GetWidth() == 400); CHECK(test.GetMode() == CompressedImageMode::Int32); + CHECK(reinterpret_cast(test.GetUncompressedPtr(buff_2))[76] == 55); REQUIRE_NOTHROW(test = reader.ReadCalibration(buffer, "cf")); CHECK(test.GetByteDepth() == 4); CHECK(test.GetHeight() == 100); CHECK(test.GetWidth() == 400); CHECK(test.GetMode() == CompressedImageMode::Float32); + CHECK(reinterpret_cast(test.GetUncompressedPtr(buff_2))[76] == Catch::Approx(1234.56f)); } remove("test_reader_calibration_master.h5");