Mercurial > hg > orthanc-stone
diff OrthancStone/UnitTestsSources/DicomTests.cpp @ 2169:fe5406abd43f
added separate class Windowing
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Oct 2024 15:40:34 +0200 |
parents | 16c01cc201e7 |
children |
line wrap: on
line diff
--- a/OrthancStone/UnitTestsSources/DicomTests.cpp Wed Oct 09 12:50:10 2024 +0200 +++ b/OrthancStone/UnitTestsSources/DicomTests.cpp Mon Oct 21 15:40:34 2024 +0200 @@ -66,13 +66,11 @@ ASSERT_THROW(p->GetRescaleIntercept(), Orthanc::OrthancException); ASSERT_THROW(p->GetRescaleSlope(), Orthanc::OrthancException); ASSERT_EQ(0u, p->GetWindowingPresetsCount()); - ASSERT_THROW(p->GetWindowingPresetCenter(0), Orthanc::OrthancException); - ASSERT_THROW(p->GetWindowingPresetWidth(0), Orthanc::OrthancException); + ASSERT_THROW(p->GetWindowingPreset(0), Orthanc::OrthancException); - float c, w; - p->GetWindowingPresetsUnion(c, w); - ASSERT_FLOAT_EQ(128.0f, c); - ASSERT_FLOAT_EQ(256.0f, w); + OrthancStone::Windowing w = p->GetWindowingPresetsUnion(); + ASSERT_FLOAT_EQ(128.0f, w.GetCenter()); + ASSERT_FLOAT_EQ(256.0f, w.GetWidth()); ASSERT_THROW(p->GetExpectedPixelFormat(), Orthanc::OrthancException); ASSERT_FALSE(p->HasIndexInSeries()); @@ -96,20 +94,19 @@ OrthancStone::DicomInstanceParameters p(m); ASSERT_EQ(3u, p.GetWindowingPresetsCount()); - ASSERT_FLOAT_EQ(10, p.GetWindowingPresetCenter(0)); - ASSERT_FLOAT_EQ(100, p.GetWindowingPresetCenter(1)); - ASSERT_FLOAT_EQ(1000, p.GetWindowingPresetCenter(2)); - ASSERT_FLOAT_EQ(50, p.GetWindowingPresetWidth(0)); - ASSERT_FLOAT_EQ(60, p.GetWindowingPresetWidth(1)); - ASSERT_FLOAT_EQ(70, p.GetWindowingPresetWidth(2)); + ASSERT_FLOAT_EQ(10, p.GetWindowingPreset(0).GetCenter()); + ASSERT_FLOAT_EQ(100, p.GetWindowingPreset(1).GetCenter()); + ASSERT_FLOAT_EQ(1000, p.GetWindowingPreset(2).GetCenter()); + ASSERT_FLOAT_EQ(50, p.GetWindowingPreset(0).GetWidth()); + ASSERT_FLOAT_EQ(60, p.GetWindowingPreset(1).GetWidth()); + ASSERT_FLOAT_EQ(70, p.GetWindowingPreset(2).GetWidth()); const float a = 10.0f - 50.0f / 2.0f; const float b = 1000.0f + 70.0f / 2.0f; - float c, w; - p.GetWindowingPresetsUnion(c, w); - ASSERT_FLOAT_EQ((a + b) / 2.0f, c); - ASSERT_FLOAT_EQ(b - a, w); + OrthancStone::Windowing w = p.GetWindowingPresetsUnion(); + ASSERT_FLOAT_EQ((a + b) / 2.0f, w.GetCenter()); + ASSERT_FLOAT_EQ(b - a, w.GetWidth()); }