Skip to content

Commit

Permalink
STYLE: Remove IdentifierType template argument from VectorContainer uses
Browse files Browse the repository at this point in the history
The index type (`ElementIdentifier`) of `itk::VectorContainer` is already
`itk::SizeValueType` by default, and `itk::IdentifierType` is just an alias of
`itk::SizeValueType`.
  • Loading branch information
N-Dekker committed Sep 26, 2024
1 parent 5750d61 commit 9269414
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Modules/Core/Mesh/include/itkMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class ITK_TEMPLATE_EXPORT Mesh : public PointSet<TPixelType, VDimension, TMeshTr
using CellDataContainer = typename MeshTraits::CellDataContainer;

/** For improving Python support for Triangle Meshes **/
using CellsVectorContainer = typename itk::VectorContainer<IdentifierType, IdentifierType>;
using CellsVectorContainer = typename itk::VectorContainer<IdentifierType>;
using CellsVectorContainerPointer = typename CellsVectorContainer::Pointer;

/** Used to support geometric operations on the toolkit. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/SpatialObjects/include/itkBlobSpatialObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class ITK_TEMPLATE_EXPORT BlobSpatialObject : public PointBasedSpatialObject<TDi
using typename Superclass::SpatialObjectPointType;
using typename Superclass::TransformType;
using typename Superclass::BoundingBoxType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

/** Method for creation through the object factory. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT ContourSpatialObject
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::BoundingBoxType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

using InterpolationMethodEnum = ContourSpatialObjectEnums::InterpolationMethod;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ITK_TEMPLATE_EXPORT DTITubeSpatialObject
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::SpatialObjectPointType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;
using typename Superclass::VectorType;
using typename Superclass::CovariantVectorType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ITK_TEMPLATE_EXPORT EllipseSpatialObject : public SpatialObject<TDimension
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::BoundingBoxType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

using ArrayType = FixedArray<double, TDimension>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ITK_TEMPLATE_EXPORT LandmarkSpatialObject : public PointBasedSpatialObject
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::BoundingBoxType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

/** Method for creation through the object factory. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/SpatialObjects/include/itkLineSpatialObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT LineSpatialObject
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::BoundingBoxType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

/** Method for creation through the object factory. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/SpatialObjects/include/itkMeshSpatialObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ITK_TEMPLATE_EXPORT MeshSpatialObject : public SpatialObject<TMesh::PointD
using typename Superclass::PointType;
using typename Superclass::BoundingBoxType;

using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = typename PointContainerType::Pointer;

/** Method for creation through the object factory. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/SpatialObjects/include/itkSpatialObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class ITK_TEMPLATE_EXPORT SpatialObject : public DataObject
using TransformPointer = typename TransformType::Pointer;
using TransformConstPointer = const TransformType *;

using VectorContainerType = VectorContainer<IdentifierType, PointType>;
using VectorContainerType = VectorContainer<PointType>;

using BoundingBoxType = BoundingBox<IdentifierType, VDimension, ScalarType, VectorContainerType>;
using BoundingBoxPointer = typename BoundingBoxType::Pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT SurfaceSpatialObject
using typename Superclass::BoundingBoxType;
using typename Superclass::CovariantVectorType;

using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;

/** Method for creation through the object factory. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/SpatialObjects/include/itkTubeSpatialObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ITK_TEMPLATE_EXPORT TubeSpatialObject : public PointBasedSpatialObject<TDi
using typename Superclass::PointType;
using typename Superclass::TransformType;
using typename Superclass::SpatialObjectPointType;
using PointContainerType = VectorContainer<IdentifierType, PointType>;
using PointContainerType = VectorContainer<PointType>;
using PointContainerPointer = SmartPointer<PointContainerType>;
using typename Superclass::VectorType;
using typename Superclass::CovariantVectorType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class ITK_TEMPLATE_EXPORT FastMarchingExtensionImageFilterBase : public FastMarc
/** AuxVarType type alias support */
using AuxValueType = TAuxValue;
using AuxValueVectorType = Vector<AuxValueType, AuxDimension>;
using AuxValueContainerType = VectorContainer<IdentifierType, AuxValueVectorType>;
using AuxValueContainerType = VectorContainer<AuxValueVectorType>;

using AuxValueContainerPointer = typename AuxValueContainerType::Pointer;
using AuxValueContainerConstIterator = typename AuxValueContainerType::ConstIterator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class FastMarchingTraitsBase
using OutputPixelType = typename OutputDomainType::PixelType;

using NodePairType = NodePair<NodeType, OutputPixelType>;
using NodePairContainerType = VectorContainer<IdentifierType, NodePairType>;
using NodePairContainerType = VectorContainer<NodePairType>;
using NodePairContainerPointer = typename NodePairContainerType::Pointer;
using NodePairContainerIterator = typename NodePairContainerType::Iterator;
using NodePairContainerConstIterator = typename NodePairContainerType::ConstIterator;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Registration/Common/include/itkPointsLocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace itk
*
* \ingroup ITKRegistrationCommon
*/
template <typename TPointsContainer = VectorContainer<IdentifierType, Point<float, 3>>>
template <typename TPointsContainer = VectorContainer<Point<float, 3>>>
class ITK_TEMPLATE_EXPORT PointsLocator : public Object
{
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ itkEuclideanDistancePointSetMetricTest3Run(double distanceThreshold)
using PointSetType = itk::PointSet<float, Dimension>;
using PointType = typename PointSetType::PointType;
using IdentifierType = itk::IdentifierType;
using PointsContainerType = itk::VectorContainer<IdentifierType, PointType>;
using PointsContainerType = itk::VectorContainer<PointType>;
using PointsLocatorType = itk::PointsLocator<PointsContainerType>;
auto pointsLocator = PointsLocatorType::New();

Expand Down

0 comments on commit 9269414

Please sign in to comment.