Merge branch 'master' of github.com:DGtal-team/DGtalTools into MeshVi…

…ewerEdit
DGtal-team · Feb 13, 2023 · 8b12bd3 · 8b12bd3
2 parents b80abe2 + 288cdca
commit 8b12bd3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -11,6 +11,16 @@
     Kerautret
     [#448](https://github.com/DGtal-team/DGtalTools/pull/448))
 
+- *volumetric*
+    - volReSample: fix the impossibility to export to vol when ITK is activated
+      (Bertrand Kerautret [#445](https://github.com/DGtal-team/DGtalTools/pull/445))
+
+- *converters*
+   - mesh2vol: small fix to read generic mesh. 
+     (Bertrand Kerautret [#444](https://github.com/DGtal-team/DGtal/pull/444))
+
+
+
 
 # DGtalTools 1.3
 

diff --git a/converters/mesh2vol.cpp b/converters/mesh2vol.cpp
@@ -88,7 +88,7 @@ void voxelizeAndExport(const std::string& inputFilename,
   trace.beginBlock("Preparing the mesh");
   trace.info() << "Reading input file: " << inputFilename;
   Mesh<PointR3> inputMesh;
-  MeshReader<PointR3>::importOFFFile(inputFilename.c_str(), inputMesh);
+  inputMesh << inputFilename.c_str();
   trace.info() << " [done]" << std::endl;
   const std::pair<PointR3, PointR3> bbox = inputMesh.getBoundingBox();
   trace.info()<< "Mesh bounding box: "<<bbox.first <<" "<<bbox.second<<std::endl;

diff --git a/volumetric/volReSample.cpp b/volumetric/volReSample.cpp
@@ -135,13 +135,22 @@ int main( int argc, char** argv )
   const functors::Identity aFunctor{};
   SamplerImageAdapter sampledImage ( input3dImage, reSampler.getSubSampledDomain(), reSampler, aFunctor );
 #ifdef WITH_ITK
-  ITKWriter<SamplerImageAdapter>::exportITK(outputFileName, sampledImage,
-                                            Z3i::RealPoint(aGridSizeReSample[0],
-                                                           aGridSizeReSample[1],
-                                                           aGridSizeReSample[2]));
+    const std::string ext = outputFileName.substr( outputFileName.find_last_of(".") + 1 );
+    if (std::find(ITK_IO_IMAGE_EXT.begin(),
+                  ITK_IO_IMAGE_EXT.end(), ext) != ITK_IO_IMAGE_EXT.end() )
+    {
+        ITKWriter<SamplerImageAdapter>::exportITK(outputFileName, sampledImage,
+                                                  Z3i::RealPoint(aGridSizeReSample[0],
+                                                                 aGridSizeReSample[1],
+                                                                 aGridSizeReSample[2]));
+    }
+    else
+    {
+        GenericWriter<SamplerImageAdapter>::exportFile(outputFileName, sampledImage);
+    }
+
 #else
   GenericWriter<SamplerImageAdapter>::exportFile(outputFileName, sampledImage);
-
 #endif
 
   return 0;