Merge pull request #16 from InsightSoftwareConsortium/wipTest

Author: dzenanz

.github/workflows/build-test-package.yml

@@ -4,9 +4,9 @@ on: [push,pull_request]
 
 jobs:
   cxx-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].0
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].4
 
   python-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].0
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].4
     secrets:
       pypi_password: ${{ secrets.pypi_password }}

.github/workflows/clang-format-linter.yml

@@ -7,6 +7,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
+      with:
+        itk-branch: main

itk-module.cmake

@@ -19,6 +19,7 @@ itk_module(Fpfh
   TEST_DEPENDS
     ITKTestKernel
     ITKMetaIO
+    ITKIOMeshBase
   DESCRIPTION
     "${DOCUMENTATION}"
   EXCLUDE_FROM_DEFAULT

pyproject.toml

@@ -4,12 +4,13 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "itk-fpfh"
-version = "0.2.0"
+version = "0.2.1"
 description = "The feature points could be used obtain salient points while performing registration using RANSAC remote module. The class PointFeature is the main driver that takes a PointSet as argument. Please refer to the documentation for a detailed description and sample usage: https://github.com/InsightSoftwareConsortium/ITKFPFH"
 readme = "README.md"
 license = {file = "LICENSE"}
 authors = [
     { name = "Pranjal Sahu", email = "[email protected]" },
+    { name = "Dženan Zukić", email = "[email protected]" },
 ]
 keywords = [
     "itk",
@@ -33,7 +34,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Medical Science Apps.",
     "Topic :: Software Development :: Libraries",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "itk == 5.4.*",
 ]

test/CMakeLists.txt

@@ -10,5 +10,5 @@ CreateTestDriver(Fpfh "${Fpfh-Test_LIBRARIES}" "${FpfhTests}")
 itk_add_test(NAME itkPointFeatureTest
   COMMAND FpfhTestDriver
   itkPointFeatureTest
-    ${ITK_TEST_OUTPUT_DIR}/itkPointFeatureTestOutput.mha
+    DATA{Input/WSB_subsampled.vtk}
   )

test/Input/WSB_subsampled.vtk

@@ -19,6 +19,47 @@
 #include "itkPointFeature.h"
 #include "itkPointSet.h"
 #include "itkTestingMacros.h"
+#include "itkMesh.h"
+#include "itkVector.h"
+#include "itkMeshFileReader.h"
+
+
+namespace
+{
+constexpr unsigned int Dimension = 3;
+using CoordType = double;
+using VectorType = itk::Vector<CoordType, Dimension>;
+using MeshType = itk::Mesh<CoordType, Dimension, itk::DefaultStaticMeshTraits<VectorType, Dimension>>;
+constexpr unsigned numDebugPoints = 10;
+
+MeshType::Pointer
+ReadMesh(std::string filename)
+{
+  using ReaderType = itk::MeshFileReader<MeshType>;
+  ReaderType::Pointer reader = ReaderType::New();
+  reader->SetFileName(filename);
+  reader->Update();
+  MeshType::Pointer output = reader->GetOutput();
+  output->DisconnectPipeline();
+  return output;
+}
+
+int
+BasicTests()
+{
+  using PixelType = float;
+  using PointSetType = itk::PointSet<PixelType, Dimension>;
+
+  using FilterType = itk::PointFeature<PointSetType, PointSetType>;
+  FilterType::Pointer filter = FilterType::New();
+
+  ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, PointFeature, MeshToMeshFilter);
+
+  std::cout << "Basic tests finished." << std::endl;
+
+  return EXIT_SUCCESS;
+}
+} // namespace
 
 int
 itkPointFeatureTest(int argc, char * argv[])
@@ -27,21 +68,56 @@ itkPointFeatureTest(int argc, char * argv[])
   {
     std::cerr << "Missing parameters." << std::endl;
     std::cerr << "Usage: " << itkNameOfTestExecutableMacro(argv);
-    std::cerr << " outputImage";
+    std::cerr << " inputMesh";
     std::cerr << std::endl;
-    return EXIT_FAILURE;
+    std::cout << "Running basic tests only." << std::endl;
+    return BasicTests();
   }
-  const char * outputImageFileName = argv[1];
 
-  constexpr unsigned int Dimension = 3;
-  using PixelType = float;
-  using PointSetType = itk::PointSet<PixelType, Dimension>;
+  MeshType::Pointer points = ReadMesh(argv[1]);
+  MeshType::Pointer normals = ReadMesh(argv[1]);
 
-  using FilterType = itk::PointFeature<PointSetType, PointSetType>;
-  FilterType::Pointer filter = FilterType::New();
+  MeshType::PointsContainerPointer  normal_points = normals->GetPoints();
+  MeshType::PointsContainerIterator p_it = normal_points->Begin();
 
-  ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, PointFeature, MeshToMeshFilter);
+  MeshType::PointDataContainerPointer  normal_normals = normals->GetPointData();
+  MeshType::PointDataContainerIterator d_it = normal_normals->Begin();
+
+  // Print first 10 points and normals for sanity check and debugging
+  std::cout << "Index * Point * Normal (up to first 10)" << std::endl;
+  unsigned i = 0;
+  while (p_it != normal_points->End())
+  {
+    if (i < numDebugPoints) // debug
+    {
+      std::cout << p_it.Index() << " * ";
+      std::cout << p_it.Value() << " * ";
+      std::cout << d_it.Value() << std::endl;
+    }
+
+    for (unsigned d = 0; d < Dimension; ++d)
+    {
+      p_it.Value()[d] = d_it.Value()[d];
+    }
+
+    ++p_it;
+    ++d_it;
+    ++i;
+  }
+
+  // Code specific for this test
+  using FilterType = itk::PointFeature<MeshType, MeshType>;
+  FilterType::Pointer fpfh = FilterType::New();
+  fpfh->ComputeFPFHFeature(points, normals, 2.4219912533797725, 100);
+  auto result = fpfh->GetFpfhFeature();
+  auto resultSTL = result->CastToSTLConstContainer();
+  for (i = 0; i < numDebugPoints; ++i)
+  {
+    std::cout << "FPFH Feature for point " << i << ":";
+    for (unsigned k = 0; k < 33; ++k)
+      std::cout << ' ' << resultSTL[i * 33 + k];
+    std::cout << std::endl;
+  }
 
-  std::cout << "Test finished." << std::endl;
   return EXIT_SUCCESS;
 }