Skip to content

Commit

Permalink
STYLE: CoordRepType -> CoordinateType code readability
Browse files Browse the repository at this point in the history 
For the sake of code readability, a new 'CoordinateType' alias is added for
each nested 'CoordRepType' alias. The old 'CoordRepType' aliases will still be
available with ITK 6.0, but it is recommended to use 'CoordinateType' instead.
The 'CoordRepType' aliases will be removed when 'ITK_FUTURE_LEGACY_REMOVE' is
enabled. Similarly, 'InputCoordinateType', 'OutputCoordinateType', and
'ImagePointCoordinateType' replace 'InputCoordRepType', 'OutputCoordRepType',
and 'ImagePointCoordRepType', respectively.
  • Loading branch information
@hjmjohnson
hjmjohnson committed Jan 26, 2025
1 parent 4b4c5d9 commit e1f19f0
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion include/itkMeshJSON.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ auto meshToMeshJSON(const TMesh * mesh, const WasmMesh<TMesh> * wasmMesh, bool i

meshJSON.meshType.dimension = MeshType::PointDimension;

meshJSON.meshType.pointComponentType = wasm::MapComponentType<typename MeshType::CoordRepType>::JSONFloatTypeEnum;
meshJSON.meshType.pointComponentType = wasm::MapComponentType<typename MeshType::CoordinateType>::JSONFloatTypeEnum;
using PointPixelType = typename TMesh::PixelType;
using ConvertPointPixelTraits = MeshConvertPixelTraits<PointPixelType>;
meshJSON.meshType.pointPixelComponentType = wasm::MapComponentType<typename ConvertPointPixelTraits::ComponentType>::JSONComponentEnum;
Expand Down
2 changes: 1 addition & 1 deletion include/itkOutputMesh.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputMesh
if (this->m_Mesh->GetNumberOfPoints() > 0)
{
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmMesh->GetMesh()->GetPoints()->at(0)) );
const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordRepType) * MeshType::PointDimension;
const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordinateType) * MeshType::PointDimension;
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
}

Expand Down
2 changes: 1 addition & 1 deletion include/itkOutputPointSet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPointSet
if (this->m_PointSet->GetNumberOfPoints() > 0)
{
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPointSet->GetPointSet()->GetPoints()->at(0)) );
const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordRepType) * PointSetType::PointDimension;
const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordinateType) * PointSetType::PointDimension;
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
}

Expand Down
2 changes: 1 addition & 1 deletion include/itkOutputPolyData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPolyData
if (this->m_PolyData->GetNumberOfPoints() > 0)
{
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPolyData->GetPolyData()->GetPoints()->at(0)) );
const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordRepType);
const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordinateType);
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
}

Expand Down
2 changes: 1 addition & 1 deletion include/itkPointSetJSON.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ auto pointSetToPointSetJSON(const TPointSet * pointSet, const WasmPointSet<TPoin

pointSetJSON.pointSetType.dimension = PointSetType::PointDimension;

pointSetJSON.pointSetType.pointComponentType = wasm::MapComponentType<typename PointSetType::CoordRepType>::JSONFloatTypeEnum;
pointSetJSON.pointSetType.pointComponentType = wasm::MapComponentType<typename PointSetType::CoordinateType>::JSONFloatTypeEnum;
using PointPixelType = typename TPointSet::PixelType;
using ConvertPointPixelTraits = MeshConvertPixelTraits<PointPixelType>;
pointSetJSON.pointSetType.pointPixelComponentType = wasm::MapComponentType<typename ConvertPointPixelTraits::ComponentType>::JSONComponentEnum;
Expand Down
6 changes: 3 additions & 3 deletions include/itkWasmMeshToMeshFilter.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ WasmMeshToMeshFilter<TMesh>
const std::string pointsString = meshJSON.points;
if (numberOfPoints)
{
if (pointComponentType == itk::wasm::MapComponentType<typename MeshType::CoordRepType>::JSONFloatTypeEnum)
if (pointComponentType == itk::wasm::MapComponentType<typename MeshType::CoordinateType>::JSONFloatTypeEnum)
{
const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
mesh->GetPoints()->assign(pointsPtr, pointsPtr + meshJSON.numberOfPoints);
Expand All @@ -428,14 +428,14 @@ WasmMeshToMeshFilter<TMesh>
{
auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
const size_t pointComponents = numberOfPoints * dimension;
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordRepType *>(&(mesh->GetPoints()->at(0)) );
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordinateType *>(&(mesh->GetPoints()->at(0)) );
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
}
else if (pointComponentType == itk::wasm::MapComponentType<double>::JSONFloatTypeEnum)
{
auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
const size_t pointComponents = numberOfPoints * dimension;
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordRepType *>(&(mesh->GetPoints()->at(0)) );
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordinateType *>(&(mesh->GetPoints()->at(0)) );
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
}
else
Expand Down
6 changes: 3 additions & 3 deletions include/itkWasmPointSetToPointSetFilter.hxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ WasmPointSetToPointSetFilter<TPointSet>
const std::string pointsString = pointSetJSON.points;
if (numberOfPoints)
{
if (pointComponentType == itk::wasm::MapComponentType<typename PointSetType::CoordRepType>::JSONFloatTypeEnum)
if (pointComponentType == itk::wasm::MapComponentType<typename PointSetType::CoordinateType>::JSONFloatTypeEnum)
{
const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
pointSet->GetPoints()->assign(pointsPtr, pointsPtr + pointSetJSON.numberOfPoints);
Expand All @@ -182,14 +182,14 @@ WasmPointSetToPointSetFilter<TPointSet>
{
auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
const size_t pointComponents = numberOfPoints * dimension;
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordRepType *>(&(pointSet->GetPoints()->at(0)) );
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordinateType *>(&(pointSet->GetPoints()->at(0)) );
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
}
else if (pointComponentType == itk::wasm::MapComponentType<double>::JSONFloatTypeEnum)
{
auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
const size_t pointComponents = numberOfPoints * dimension;
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordRepType *>(&(pointSet->GetPoints()->at(0)) );
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordinateType *>(&(pointSet->GetPoints()->at(0)) );
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
}
else
Expand Down

0 comments on commit e1f19f0

Please sign in to comment.