Merge pull request #1072 from ramonemiliani93/main

fix: Compute origin using largest possible region

Author: thewtex

include/itkImageToWasmImageFilter.hxx

@@ -137,6 +137,7 @@ ImageToWasmImageFilter<TImage>
 
   imageJSON->SetImage(image);
 
+  using PointType = typename TImage::PointType;
   using PixelType = typename TImage::IOPixelType;
   using ConvertPixelTraits = DefaultConvertPixelTraits<PixelType>;
   using ComponentType = typename ConvertPixelTraits::ComponentType;
@@ -164,7 +165,10 @@ ImageToWasmImageFilter<TImage>
   document.AddMember( "imageType", imageType.Move(), allocator );
 
   rapidjson::Value origin(rapidjson::kArrayType);
-  const auto imageOrigin = image->GetOrigin();
+
+  const auto largestRegion = image->GetLargestPossibleRegion();
+  PointType imageOrigin;
+  image->TransformIndexToPhysicalPoint(largestRegion.GetIndex(), imageOrigin);
   for( unsigned int ii = 0; ii < dimension; ++ii )
     {
     origin.PushBack(rapidjson::Value().SetDouble(imageOrigin[ii]), allocator);

itk-module.cmake

@@ -15,6 +15,7 @@ itk_module(WebAssemblyInterface
   TEST_DEPENDS
     ITKTestKernel
     ITKMesh
+    ITKImageGrid
   FACTORY_NAMES
     ImageIO::Wasm
     MeshIO::Wasm

test/Baseline/negative_idx_padded.mha.cid

@@ -0,0 +1 @@
+bafkreifzpwttltw372hen6ouewhpqwodxs4zo4kjk7ekyclzcoshfnxq3u

test/CMakeLists.txt

@@ -30,6 +30,7 @@ ExternalData_Expand_Arguments(
   DATA{Input/sphere.fsa}
   DATA{Input/sphere.fsb}
   DATA{Input/box.obj}
+  DATA{Input/negative_idx_base.mha}
   DATA{Input/octa.off}
   DATA{Input/sphere.stl}
   DATA{Input/cthead1.iwi.cbor}
@@ -50,10 +51,12 @@ ExternalData_Expand_Arguments(
   DATA{Input/PNGSeries/,REGEX:mri3D_.[0-9]+.png}
   DATA{Input/11706c2.CNG.swc}
   DATA{Baseline/web_worker_pool.cy.png}
-  )
+  DATA{Baseline/negative_idx_padded.mha}
+)
 
 set(WebAssemblyInterfaceTests
   itkWasmImageInterfaceTest.cxx
+  itkWasmImageInterfaceWithNegativeIndexTest.cxx
   itkWasmMeshInterfaceTest.cxx
   itkWasmPolyDataInterfaceTest.cxx
   itkWasmImageIOTest.cxx
@@ -84,6 +87,15 @@ itk_add_test(NAME itkWasmImageInterfaceTest
       ${ITK_TEST_OUTPUT_DIR}/itkWasmImageInterfaceTest.mha
 )
 
+itk_add_test(NAME itkWasmImageInterfaceWithNegativeIndexTest
+        COMMAND WebAssemblyInterfaceTestDriver
+        --compare DATA{Baseline/negative_idx_padded.mha}
+        ${ITK_TEST_OUTPUT_DIR}/itkWasmImageInterfaceWithNegativeIndexTest.mha
+        itkWasmImageInterfaceWithNegativeIndexTest
+        DATA{Input/negative_idx_base.mha}
+        ${ITK_TEST_OUTPUT_DIR}/itkWasmImageInterfaceWithNegativeIndexTest.mha
+)
+
 itk_add_test(NAME itkWasmMeshInterfaceTest
     COMMAND WebAssemblyInterfaceTestDriver
     itkWasmMeshInterfaceTest

test/Input/negative_idx_base.mha.cid

@@ -0,0 +1 @@
+bafkreiec2npcdz52d6gjmod7f4cfckgqcmizch3dpujxhjpxxqggxlkemy

test/itkWasmImageInterfaceWithNegativeIndexTest.cxx

@@ -0,0 +1,78 @@
+/*=========================================================================
+ *
+ *  Copyright NumFOCUS
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         https://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *=========================================================================*/
+#include "itkImageToWasmImageFilter.h"
+#include "itkWasmImageToImageFilter.h"
+
+#include "itkConstantPadImageFilter.h"
+#include "itkImageFileReader.h"
+#include "itkImageFileWriter.h"
+#include "itkTestingMacros.h"
+
+int
+itkWasmImageInterfaceWithNegativeIndexTest(int argc, char * argv[])
+{
+  if (argc < 3)
+  {
+    std::cerr << "Missing parameters" << std::endl;
+    std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv) << " InputImage OutputImage" << std::endl;
+    return EXIT_FAILURE;
+  }
+  const char * inputImageFile = argv[1];
+  const char * outputImageFile = argv[2];
+
+  constexpr unsigned int Dimension = 3;
+  using PixelType = unsigned char;
+  using ImageType = itk::Image<PixelType, Dimension>;
+  using ImagePointer = ImageType::Pointer;
+
+  ImagePointer inputImage = nullptr;
+  ITK_TRY_EXPECT_NO_EXCEPTION(inputImage = itk::ReadImage<ImageType>(inputImageFile));
+  std::cout << "inputImage: " << inputImage << std::endl;
+
+  ImageType::SizeType lowerExtendRegion;
+  lowerExtendRegion.Fill(1);
+
+  ImageType::SizeType upperExtendRegion;
+  upperExtendRegion.Fill(1);
+
+  using ConstantPadImageFilterType = itk::ConstantPadImageFilter<ImageType,ImageType>;
+  auto constantPad = ConstantPadImageFilterType::New();
+  constantPad->SetInput(inputImage);
+  constantPad->SetPadLowerBound(lowerExtendRegion);
+  constantPad->SetPadUpperBound(upperExtendRegion);
+  constantPad->SetConstant(0);
+
+  using ImageToWasmImageFilterType = itk::ImageToWasmImageFilter<ImageType>;
+  auto imageToJSON = ImageToWasmImageFilterType::New();
+  imageToJSON->SetInput(constantPad->GetOutput());
+  imageToJSON->Update();
+  auto imageJSON = imageToJSON->GetOutput();
+  std::cout << "Image JSON: " << imageJSON->GetJSON() << std::endl;
+
+  using WasmImageToImageFilterType = itk::WasmImageToImageFilter<ImageType>;
+  auto jsonToImage = WasmImageToImageFilterType::New();
+  jsonToImage->SetInput(imageToJSON->GetOutput());
+  jsonToImage->Update();
+  ImageType::Pointer convertedImage = jsonToImage->GetOutput();
+
+  std::cout << "convertedImage: " << convertedImage << std::endl;
+
+  ITK_TRY_EXPECT_NO_EXCEPTION(itk::WriteImage(convertedImage, outputImageFile));
+
+  return EXIT_SUCCESS;
+}