Mercurial > hg > orthanc-stone

changeset 1275:41d19fa749b7 bugs/2020-02-invisible-slice

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added PixelTestPattern class to debug invisible slice issues
author Benjamin Golinvaux <bgo@osimis.io>
date Tue, 04 Feb 2020 12:31:03 +0100
parents ae157e5d8b62
children db759fb1d6e6
files Applications/Samples/CMakeLists.txt Framework/Toolbox/PixelTestPatterns.cpp Framework/Toolbox/PixelTestPatterns.h Resources/CMake/OrthancStoneConfiguration.cmake UnitTestsSources/PixelTestPatternsTests.cpp
diffstat 4 files changed, 307 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/CMakeLists.txt	Tue Feb 04 12:29:30 2020 +0100
+++ b/Applications/Samples/CMakeLists.txt	Tue Feb 04 12:31:03 2020 +0100
@@ -251,6 +251,7 @@
   add_executable(UnitTests
     ${GOOGLE_TEST_SOURCES}
     ${ORTHANC_STONE_ROOT}/UnitTestsSources/GenericToolboxTests.cpp
+    ${ORTHANC_STONE_ROOT}/UnitTestsSources/PixelTestPatternsTests.cpp
     ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestCommands.cpp
     ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestMessageBroker.cpp
     ${ORTHANC_STONE_ROOT}/UnitTestsSources/TestStrategy.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/Toolbox/PixelTestPatterns.h	Tue Feb 04 12:31:03 2020 +0100
@@ -0,0 +1,130 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+// PixelTestPatterns.h
+
+#pragma once
+
+#include "../StoneException.h"
+
+#include <Core/Images/ImageAccessor.h>
+
+#include <string>
+#include <stdint.h>
+#include <math.h>
+
+namespace OrthancStone
+{
+  namespace PixelTestPatterns
+  {
+    template<typename T, typename U>
+    inline uint8_t byteAddClip(T v1, U v2)
+    {
+      double tmp = static_cast<double>(v1) + static_cast<double>(v2);
+      if (tmp > 255.0)
+        tmp = 255;
+      if (tmp < 0.0)
+        tmp = 0;
+      return static_cast<uint8_t>(tmp+0.5);
+    }
+
+    // fills the area with a horizontal gradient.
+    // leftmost pixels are filled with r0 g0 b0
+    // rightmost pixels are filled with r1 g1 b1
+    // linear interpolation in-between
+    inline void fillWithHGradient(Orthanc::ImageAccessor& target,
+      uint8_t r0, uint8_t g0, uint8_t b0,
+      uint8_t r1, uint8_t g1, uint8_t b1)
+    {
+      if (target.GetFormat() != Orthanc::PixelFormat_RGBA32) {
+        ORTHANC_ASSERT(false, "Wrong pixel format");
+      }
+      const unsigned int width = target.GetWidth();
+      const unsigned int height = target.GetHeight();
+
+      ORTHANC_ASSERT(width > 0);
+      ORTHANC_ASSERT(height > 0);
+
+      double invWidth = 1.0 / static_cast<double>(target.GetWidth());
+      double rIncr = (static_cast<double>(r1) - static_cast<double>(r0))* invWidth;
+      double gIncr = (static_cast<double>(g1) - static_cast<double>(g0))* invWidth;
+      double bIncr = (static_cast<double>(b1) - static_cast<double>(b0))* invWidth;
+
+      for (unsigned int y = 0; y < height; y++)
+      {
+        uint8_t r = r0;
+        uint8_t g = g0;
+        uint8_t b = b0;
+        uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
+        for (unsigned int x = 0; x < width; x++)
+        {
+          q[0] = r;
+          q[1] = g;
+          q[2] = b;
+          q[3] = 255;
+          r = byteAddClip(r, rIncr);
+          g = byteAddClip(g, gIncr);
+          b = byteAddClip(b, bIncr);
+          q += 4;
+        }
+      }
+    }
+
+    inline void fillWithVGradient(Orthanc::ImageAccessor& target,
+      uint8_t r0, uint8_t g0, uint8_t b0,
+      uint8_t r1, uint8_t g1, uint8_t b1)
+    {
+      if (target.GetFormat() != Orthanc::PixelFormat_RGBA32) {
+        ORTHANC_ASSERT(false, "Wrong pixel format");
+      }
+      const unsigned int width = target.GetWidth();
+      const unsigned int height = target.GetHeight();
+
+      ORTHANC_ASSERT(width > 0);
+      ORTHANC_ASSERT(height > 0);
+
+      double invHeight = 1.0 / static_cast<double>(target.GetHeight());
+      double rIncr = (static_cast<double>(r1) - static_cast<double>(r0))* invHeight;
+      double gIncr = (static_cast<double>(g1) - static_cast<double>(g0))* invHeight;
+      double bIncr = (static_cast<double>(b1) - static_cast<double>(b0))* invHeight;
+
+      uint8_t r = r0;
+      uint8_t g = g0;
+      uint8_t b = b0;
+      for (unsigned int y = 0; y < height; y++)
+      {
+        uint8_t* q = reinterpret_cast<uint8_t*>(target.GetRow(y));
+        for (unsigned int x = 0; x < width; x++)
+        {
+          q[0] = r;
+          q[1] = g;
+          q[2] = b;
+          q[3] = 255;
+          q += 4;
+        }
+        r = byteAddClip(r, rIncr);
+        g = byteAddClip(g, gIncr);
+        b = byteAddClip(b, bIncr);
+      }
+    }
+
+  }
+}
+
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Feb 04 12:29:30 2020 +0100
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Tue Feb 04 12:31:03 2020 +0100
@@ -564,12 +564,16 @@
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/Extent2D.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/FiniteProjectiveCamera.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/FiniteProjectiveCamera.h
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GenericToolbox.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GenericToolbox.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GeometryToolbox.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GeometryToolbox.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ImageGeometry.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ImageGeometry.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/LinearAlgebra.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/LinearAlgebra.h
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/PixelTestPatterns.cpp
+  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/PixelTestPatterns.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ShearWarpProjectiveTransform.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/ShearWarpProjectiveTransform.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/SlicesSorter.cpp
@@ -580,8 +584,6 @@
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/TextRenderer.h
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/UndoRedoStack.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Toolbox/UndoRedoStack.h
-  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GenericToolbox.cpp
-  ${ORTHANC_STONE_ROOT}/Framework/Toolbox/GenericToolbox.h
   
   ${ORTHANC_STONE_ROOT}/Framework/Viewport/IViewport.h
   ${ORTHANC_STONE_ROOT}/Framework/Viewport/ViewportBase.h
@@ -591,6 +593,7 @@
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/IVolumeSlicer.h
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/OrientedVolumeBoundingBox.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/OrientedVolumeBoundingBox.h
+
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/VolumeImageGeometry.cpp
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/VolumeImageGeometry.h
   ${ORTHANC_STONE_ROOT}/Framework/Volumes/VolumeReslicer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UnitTestsSources/PixelTestPatternsTests.cpp	Tue Feb 04 12:31:03 2020 +0100
@@ -0,0 +1,171 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+#include <Core/Images/Image.h>
+#include <Core/Images/PngWriter.h>
+#include <Framework/Toolbox/PixelTestPatterns.h>
+
+#include <boost/chrono.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include "gtest/gtest.h"
+
+#include "stdint.h"
+
+#include <cmath>
+
+ /* Autogenerated from prout.png */
+static const unsigned char bin2c_SimpleRedBlueHGradient_png[391] = "\211PNG\15\12\32\12\0\0\0\15IHDR\0\0\0\200\0\0\0\200\10\6\0\0\0\303>a\313\0\0\1MIDATx\234\355\322\1\15\3000\0\303\260~\3741o\7\342X\12\203|o{wgev\26Z\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p\15\200k\0\\\3\340\32\0\327\0\270\6\3005\0\256\1p?\314\262\201\3760\355r\262\0\0\0\0IEND\256B`\202";
+
+TEST(PixelTestPatterns, SimpleRedHGradient)
+{
+  std::auto_ptr<Orthanc::Image> texture;
+
+  texture.reset(new Orthanc::Image(
+    Orthanc::PixelFormat_RGBA32,
+    128,
+    128,
+    /*forceMinimalPitch*/false));
+
+  Orthanc::ImageAccessor target;
+  texture->GetWriteableAccessor(target);
+
+  OrthancStone::PixelTestPatterns::fillWithHGradient(target,255,0,0,0,0,255);
+
+  Orthanc::PngWriter writer;
+#if 0
+  writer.WriteToFile("SimpleRedBlueHGradient.png", *texture);
+#else
+  std::string contents;
+  writer.WriteToMemory(contents, *texture);
+
+  ASSERT_EQ(1u, sizeof(unsigned char));
+  ASSERT_EQ(391u, sizeof(bin2c_SimpleRedBlueHGradient_png));
+  ASSERT_EQ(390u, contents.size());
+
+  char* resultPngBytes = &(contents[0]);
+
+  int result = memcmp(resultPngBytes, bin2c_SimpleRedBlueHGradient_png, 390);
+  ASSERT_EQ(0, result);
+#endif
+}
+
+static const unsigned char bin2c_SimpleRedBlueVGradient_png[400] = "\211PNG\15\12\32\12\0\0\0\15IHDR\0\0\0\200\0\0\0\200\10\6\0\0\0\303>a\313\0\0\1VIDATx\234\355\322A\21\3000\14\300\260t7\376\220\327\301\310\303\22\2?|\356\314\35\262\336o\236\355\6\26\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\14\20g\2008\3\304\31 \316\0q\6\2103@\234\1\342\316\231\357nG\260\347\7\221\255\203\367~A)\36\0\0\0\0IEND\256B`\202";
+
+
+TEST(PixelTestPatterns, SimpleRedBlueVGradient)
+{
+  std::auto_ptr<Orthanc::Image> texture;
+
+  texture.reset(new Orthanc::Image(
+    Orthanc::PixelFormat_RGBA32,
+    128,
+    128,
+    /*forceMinimalPitch*/false));
+
+  Orthanc::ImageAccessor target;
+  texture->GetWriteableAccessor(target);
+
+  OrthancStone::PixelTestPatterns::fillWithVGradient(target, 255, 0, 0, 0, 0, 255);
+
+  Orthanc::PngWriter writer;
+#if 0
+  writer.WriteToFile("SimpleRedBlueVGradient.png", *texture);
+#else
+  std::string contents;
+  writer.WriteToMemory(contents, *texture);
+
+  ASSERT_EQ(1u, sizeof(unsigned char));
+  ASSERT_EQ(400u, sizeof(bin2c_SimpleRedBlueVGradient_png));
+  ASSERT_EQ(399u, contents.size());
+
+  char* resultPngBytes = &(contents[0]);
+
+  int result = memcmp(resultPngBytes, bin2c_SimpleRedBlueVGradient_png, 399);
+  ASSERT_EQ(0, result);
+#endif
+}
+
+
+/* Autogenerated from MultiGradient.png */
+static const unsigned char bin2c_MultiGradient_png[774] = "\211PNG\15\12\32\12\0\0\0\15IHDR\0\0\1\0\0\0\0\200\10\6\0\0\0\344\265\267\12\0\0\2\314IDATx\234\355\325\301\11\3030\24\5\301/\242\376+6(E$ \314\354\30\337\215\364X\2573s\6\266\316\314\226\237\365\271}\5\227\255\331{\273\357s\373\374sY\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\25\0^\13\220\2559\347\354\231Q\337\317\372\303)\276\331Ys\377\26\256.\340\3673|\261}\373\3n{\360?\240>\200\347\351\376i\5\300V\0pz\0t\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0l\5\0W\0lz\0\276!\352\302\35+U\244b\0\0\0\0IEND\256B`\202";
+
+TEST(PixelTestPatterns, MultiGradient)
+{
+  std::auto_ptr<Orthanc::Image> texture;
+
+  const int CELLW = 64;
+  const int CELLH = 64;
+  const int NHCELLS = 4;
+  const int NVCELLS = 2;
+  const int NCELLS = NHCELLS * NVCELLS;
+
+  texture.reset(new Orthanc::Image(
+    Orthanc::PixelFormat_RGBA32,
+    NHCELLS * CELLW,
+    NVCELLS * CELLH,
+    /*forceMinimalPitch*/false));
+
+  // H:R->K, V:G->W, H:B->K
+
+  //                    R   G   B   K   C   M   Y   W
+  uint8_t startR[NCELLS] = {255,000,000,000,000,255,255,255};
+  uint8_t startG[NCELLS] = {000,255,000,000,255,000,255,255};
+  uint8_t startB[NCELLS] = {000,000,255,000,255,255,000,255};
+  
+  //                  K   W   K   W   W   K   W   K
+  uint8_t eeendR[NCELLS] = {000,255,000,255,255,000,255,000};
+  uint8_t eeendG[NCELLS] = {000,255,000,255,255,000,255,000 };
+  uint8_t eeendB[NCELLS] = {000,255,000,255,255,000,255,000 };
+
+  // vertical?
+  bool verticality[NCELLS] = { false,true,false,true,true,false,true,false };
+
+  for(size_t slot = 0; slot < NCELLS; ++slot)
+  {
+    int x0 = (slot % 4) * CELLW;
+    bool vertical = (((slot / NHCELLS) % 2) == 0) ? (slot % 2 == 0) : (slot % 2 == 1);
+    int y0 = static_cast<int>(slot / NHCELLS) * CELLH;
+    Orthanc::ImageAccessor target;
+    texture->GetRegion(target, x0, y0, CELLW, CELLH);
+    if (vertical)
+      OrthancStone::PixelTestPatterns::fillWithVGradient(target, startR[slot], startG[slot], startB[slot], eeendR[slot], eeendG[slot], eeendB[slot]);
+    else 
+      OrthancStone::PixelTestPatterns::fillWithHGradient(target, startR[slot], startG[slot], startB[slot], eeendR[slot], eeendG[slot], eeendB[slot]);
+  }
+ 
+  Orthanc::PngWriter writer;
+#if 0
+  writer.WriteToFile("MultiGradient.png", *texture);
+#else
+  std::string contents;
+  writer.WriteToMemory(contents, *texture);
+
+  ASSERT_EQ(1u, sizeof(unsigned char));
+  ASSERT_EQ(774u, sizeof(bin2c_MultiGradient_png));
+  ASSERT_EQ(773u, contents.size());
+
+  char* resultPngBytes = &(contents[0]);
+
+  int result = memcmp(resultPngBytes, bin2c_MultiGradient_png, 773);
+  ASSERT_EQ(0, result);
+#endif
+}
+