Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.6
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.4

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.6
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.4
with:
itk-wheel-tag: 'v5.4.5'
itk-python-package-tag: 'v5.4.5'
Expand Down
2 changes: 0 additions & 2 deletions include/itkCannyEdgesDistanceAdvectionFieldFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesDistanceAdvectionFieldFeatureGenerator : pub
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkCannyEdgesDistanceFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesDistanceFeatureGenerator : public FeatureGen
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkCannyEdgesFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ class ITK_TEMPLATE_EXPORT CannyEdgesFeatureGenerator : public FeatureGenerator<N
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkDescoteauxSheetnessFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ class ITK_TEMPLATE_EXPORT DescoteauxSheetnessFeatureGenerator : public FeatureGe
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
7 changes: 7 additions & 0 deletions include/itkFeatureGenerator.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ FeatureGenerator<NDimension>::SetInput(const SpatialObjectType * spatialObject)
this->SetNthInput(0, const_cast<SpatialObjectType *>(spatialObject));
}

template <unsigned int NDimension>
const typename FeatureGenerator<NDimension>::SpatialObjectType *
FeatureGenerator<NDimension>::GetInput() const
{
return dynamic_cast<const SpatialObjectType *>(this->ProcessObject::GetInput(0));
}

template <unsigned int NDimension>
const typename FeatureGenerator<NDimension>::SpatialObjectType *
FeatureGenerator<NDimension>::GetFeature() const
Expand Down
2 changes: 0 additions & 2 deletions include/itkFrangiTubularnessFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT FrangiTubularnessFeatureGenerator : public FeatureGene
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkGradientMagnitudeSigmoidFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT GradientMagnitudeSigmoidFeatureGenerator : public Feat
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
7 changes: 7 additions & 0 deletions include/itkIsotropicResampler.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ IsotropicResampler<NDimension>::SetInput(const SpatialObjectType * spatialObject
this->SetNthInput(0, const_cast<SpatialObjectType *>(spatialObject));
}

template <unsigned int NDimension>
const typename IsotropicResampler<NDimension>::SpatialObjectType *
IsotropicResampler<NDimension>::GetInput() const
{
return dynamic_cast<const SpatialObjectType *>(this->ProcessObject::GetInput(0));
}

template <unsigned int NDimension>
const typename IsotropicResampler<NDimension>::SpatialObjectType *
IsotropicResampler<NDimension>::GetOutput() const
Expand Down
2 changes: 0 additions & 2 deletions include/itkLungWallFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ class ITK_TEMPLATE_EXPORT LungWallFeatureGenerator : public FeatureGenerator<NDi
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkMorphologicalOpeningFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ class ITK_TEMPLATE_EXPORT MorphologicalOpeningFeatureGenerator : public FeatureG
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkMorphologicalOpenningFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ class ITK_EXPORT MorphologicalOpenningFeatureGenerator : public FeatureGenerator
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkSatoLocalStructureFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ class ITK_TEMPLATE_EXPORT SatoLocalStructureFeatureGenerator : public FeatureGen
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkSatoVesselnessFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ class ITK_TEMPLATE_EXPORT SatoVesselnessFeatureGenerator : public FeatureGenerat
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
2 changes: 0 additions & 2 deletions include/itkSigmoidFeatureGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ class ITK_TEMPLATE_EXPORT SigmoidFeatureGenerator : public FeatureGenerator<NDim
using ProcessObject::SetInput;
void
SetInput(const SpatialObjectType * input);
const SpatialObjectType *
GetInput() const;

/** Output data that carries the feature in the form of a
* SpatialObject. */
Expand Down
21 changes: 11 additions & 10 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
include_directories("${LesionSizingToolkit_SOURCE_DIR}/src") # to include itkIncludeRequiredIOFactories.h
include_directories("${LesionSizingToolkit_SOURCE_DIR}/include")
add_executable(itkCannyEdgeDetectionImageFilter1 itkCannyEdgeDetectionImageFilter1.cxx )
target_link_libraries(itkCannyEdgeDetectionImageFilter1 ITK::LesionSizingToolkitModule)
target_link_libraries(itkCannyEdgeDetectionImageFilter1 ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkCannyEdgeDetectionImageFilter2 itkCannyEdgeDetectionImageFilter2.cxx )
target_link_libraries(itkCannyEdgeDetectionImageFilter2 ITK::LesionSizingToolkitModule)
target_link_libraries(itkCannyEdgeDetectionImageFilter2 ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkDicomSeriesReadImageWrite itkDicomSeriesReadImageWrite.cxx)
target_link_libraries(itkDicomSeriesReadImageWrite ITK::LesionSizingToolkitModule)
target_link_libraries(itkDicomSeriesReadImageWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkGradientMagnitudeImageFilter itkGradientMagnitudeImageFilter.cxx)
target_link_libraries(itkGradientMagnitudeImageFilter ITK::LesionSizingToolkitModule)
target_link_libraries(itkGradientMagnitudeImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkGradientMagnitudeRecursiveGaussianImageFilter itkGradientMagnitudeRecursiveGaussianImageFilter.cxx)
target_link_libraries(itkGradientMagnitudeRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule)
target_link_libraries(itkGradientMagnitudeRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkImageReadRegionOfInterestAroundSeedWrite itkImageReadRegionOfInterestAroundSeedWrite.cxx)
target_link_libraries(itkImageReadRegionOfInterestAroundSeedWrite ITK::LesionSizingToolkitModule)
target_link_libraries(itkImageReadRegionOfInterestAroundSeedWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkImageReadRegionOfInterestWrite itkImageReadRegionOfInterestWrite.cxx)
target_link_libraries(itkImageReadRegionOfInterestWrite ITK::LesionSizingToolkitModule)
target_link_libraries(itkImageReadRegionOfInterestWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkImageReadWrite itkImageReadWrite.cxx)
target_link_libraries(itkImageReadWrite ITK::LesionSizingToolkitModule)
target_link_libraries(itkImageReadWrite ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkLaplacianRecursiveGaussianImageFilter itkLaplacianRecursiveGaussianImageFilter.cxx)
target_link_libraries(itkLaplacianRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule)
target_link_libraries(itkLaplacianRecursiveGaussianImageFilter ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})

add_executable(itkResampleVolumeToBeIsotropic itkResampleVolumeToBeIsotropic.cxx)
target_link_libraries(itkResampleVolumeToBeIsotropic ITK::LesionSizingToolkitModule)
target_link_libraries(itkResampleVolumeToBeIsotropic ITK::LesionSizingToolkitModule ${ITK_LIBRARIES})
16 changes: 8 additions & 8 deletions wrapping/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
itk_wrap_module(LesionSizingToolkit)

set(WRAPPER_SUBMODULE_ORDER
itkFeatureGenerator
itkFeatureAggregator
itkSatoVesselnessFeatureGenerator
itkSegmentationModule
itkRegionGrowingSegmentationModule
itkSinglePhaseLevelSetSegmentationModule
itkFastMarchingSegmentationModule
itkSegmentationVolumeEstimator
itkBinaryThresholdFeatureGenerator
itkCannyEdgeDetectionRecursiveGaussianImageFilter
itkCannyEdgesDistanceAdvectionFieldFeatureGenerator
Expand All @@ -12,9 +20,6 @@ set(WRAPPER_SUBMODULE_ORDER
itkDescoteauxSheetnessImageFilter
itkFastMarchingAndGeodesicActiveContourLevelSetSegmentationModule
itkFastMarchingAndShapeDetectionLevelSetSegmentationModule
itkFastMarchingSegmentationModule
itkFeatureAggregator
itkFeatureGenerator
itkFrangiTubularnessFeatureGenerator
itkFrangiTubularnessImageFilter
itkGeodesicActiveContourLevelSetSegmentationModule
Expand All @@ -31,15 +36,10 @@ set(WRAPPER_SUBMODULE_ORDER
itkMinimumFeatureAggregator
itkMorphologicalOpeningFeatureGenerator
itkRegionCompetitionImageFilter
itkRegionGrowingSegmentationModule
itkSatoLocalStructureFeatureGenerator
itkSatoVesselnessFeatureGenerator
itkSatoVesselnessSigmoidFeatureGenerator
itkSegmentationModule
itkSegmentationVolumeEstimator
itkShapeDetectionLevelSetSegmentationModule
itkSigmoidFeatureGenerator
itkSinglePhaseLevelSetSegmentationModule
itkVesselEnhancingDiffusion3DImageFilter
itkVotingBinaryHoleFillFloodingImageFilter
itkWeightedSumFeatureAggregator
Expand Down
4 changes: 2 additions & 2 deletions wrapping/itkDescoteauxSheetnessImageFilter.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk_wrap_class("itk::DescoteauxSheetnessImageFilter" POINTER)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
itk_wrap_class("itk::DescoteauxSheetnessImageFilter" POINTER_WITH_SUPERCLASS)
itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
itk_end_wrap_class()
4 changes: 2 additions & 2 deletions wrapping/itkFrangiTubularnessImageFilter.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk_wrap_class("itk::FrangiTubularnessImageFilter" POINTER)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
itk_wrap_class("itk::FrangiTubularnessImageFilter" POINTER_WITH_SUPERCLASS)
itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
itk_end_wrap_class()
2 changes: 1 addition & 1 deletion wrapping/itkLesionSegmentationImageFilter8.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk_wrap_class("itk::LesionSegmentationImageFilter8" POINTER)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
itk_wrap_image_filter_combinations("${WRAP_ITK_SCALAR}" "${WRAP_ITK_REAL}" 3)
itk_end_wrap_class()
2 changes: 1 addition & 1 deletion wrapping/itkLocalStructureImageFilter.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk_wrap_class("itk::LocalStructureImageFilter" POINTER_WITH_SUPERCLASS)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2)
itk_wrap_image_filter_combinations("${WRAP_ITK_COV_VECTOR_REAL}" "${WRAP_ITK_REAL}")
itk_end_wrap_class()
2 changes: 1 addition & 1 deletion wrapping/itkRegionCompetitionImageFilter.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk_wrap_class("itk::RegionCompetitionImageFilter" POINTER)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
itk_wrap_image_filter("${WRAP_ITK_INT}" 2 2+)
itk_end_wrap_class()
11 changes: 6 additions & 5 deletions wrapping/itkSatoVesselnessFeatureGenerator.wrap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
itk_wrap_template(${d} ${d})
endforeach()
itk_end_wrap_class()
itk_wrap_filter_dims(has_d_3 3)
if(has_d_3)
itk_wrap_class("itk::SatoVesselnessFeatureGenerator" POINTER)
itk_wrap_template(3 3)
itk_end_wrap_class()
endif()
11 changes: 6 additions & 5 deletions wrapping/itkSatoVesselnessSigmoidFeatureGenerator.wrap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
itk_wrap_template(${d} ${d})
endforeach()
itk_end_wrap_class()
itk_wrap_filter_dims(has_d_3 3)
if(has_d_3)
itk_wrap_class("itk::SatoVesselnessSigmoidFeatureGenerator" POINTER)
itk_wrap_template(3 3)
itk_end_wrap_class()
endif()
11 changes: 8 additions & 3 deletions wrapping/itkVesselEnhancingDiffusion3DImageFilter.wrap
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
itk_wrap_class("itk::VesselEnhancingDiffusion3DImageFilter" POINTER)
itk_wrap_image_filter("${WRAP_ITK_SCALAR}" 2+)
itk_end_wrap_class()
itk_wrap_filter_dims(has_d_3 3)
if(has_d_3)
itk_wrap_class("itk::VesselEnhancingDiffusion3DImageFilter" POINTER)
foreach(t ${WRAP_ITK_SCALAR})
itk_wrap_template("${ITKM_${t}}3" "${ITKT_${t}}, 3")
endforeach()
itk_end_wrap_class()
endif()
Loading