Skip to content

Commit 65e7623

Browse files
committed
style(itk-wasm): CoordRepType -> CoordinateType code readability
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.
1 parent 2467084 commit 65e7623

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

include/itkMeshJSON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ auto meshToMeshJSON(const TMesh * mesh, const WasmMesh<TMesh> * wasmMesh, bool i
8989

9090
meshJSON.meshType.dimension = MeshType::PointDimension;
9191

92-
meshJSON.meshType.pointComponentType = wasm::MapComponentType<typename MeshType::CoordRepType>::JSONFloatTypeEnum;
92+
meshJSON.meshType.pointComponentType = wasm::MapComponentType<typename MeshType::CoordinateType>::JSONFloatTypeEnum;
9393
using PointPixelType = typename TMesh::PixelType;
9494
using ConvertPointPixelTraits = MeshConvertPixelTraits<PointPixelType>;
9595
meshJSON.meshType.pointPixelComponentType = wasm::MapComponentType<typename ConvertPointPixelTraits::ComponentType>::JSONComponentEnum;

include/itkOutputMesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class ITK_TEMPLATE_EXPORT OutputMesh
8888
if (this->m_Mesh->GetNumberOfPoints() > 0)
8989
{
9090
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmMesh->GetMesh()->GetPoints()->at(0)) );
91-
const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordRepType) * MeshType::PointDimension;
91+
const auto pointsSize = wasmMesh->GetMesh()->GetPoints()->Size() * sizeof(typename MeshType::CoordinateType) * MeshType::PointDimension;
9292
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
9393
}
9494

include/itkOutputPointSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPointSet
8787
if (this->m_PointSet->GetNumberOfPoints() > 0)
8888
{
8989
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPointSet->GetPointSet()->GetPoints()->at(0)) );
90-
const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordRepType) * PointSetType::PointDimension;
90+
const auto pointsSize = wasmPointSet->GetPointSet()->GetPoints()->Size() * sizeof(typename PointSetType::CoordinateType) * PointSetType::PointDimension;
9191
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
9292
}
9393

include/itkOutputPolyData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ITK_TEMPLATE_EXPORT OutputPolyData
8787
if (this->m_PolyData->GetNumberOfPoints() > 0)
8888
{
8989
const auto pointsAddress = reinterpret_cast< size_t >( &(wasmPolyData->GetPolyData()->GetPoints()->at(0)) );
90-
const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordRepType);
90+
const auto pointsSize = wasmPolyData->GetPolyData()->GetPoints()->Size() * PolyDataType::PointDimension * sizeof(typename PolyDataType::CoordinateType);
9191
setMemoryStoreOutputArray(0, index, 0, pointsAddress, pointsSize);
9292
}
9393

include/itkPointSetJSON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ auto pointSetToPointSetJSON(const TPointSet * pointSet, const WasmPointSet<TPoin
7777

7878
pointSetJSON.pointSetType.dimension = PointSetType::PointDimension;
7979

80-
pointSetJSON.pointSetType.pointComponentType = wasm::MapComponentType<typename PointSetType::CoordRepType>::JSONFloatTypeEnum;
80+
pointSetJSON.pointSetType.pointComponentType = wasm::MapComponentType<typename PointSetType::CoordinateType>::JSONFloatTypeEnum;
8181
using PointPixelType = typename TPointSet::PixelType;
8282
using ConvertPointPixelTraits = MeshConvertPixelTraits<PointPixelType>;
8383
pointSetJSON.pointSetType.pointPixelComponentType = wasm::MapComponentType<typename ConvertPointPixelTraits::ComponentType>::JSONComponentEnum;

include/itkWasmMeshToMeshFilter.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ WasmMeshToMeshFilter<TMesh>
440440
const std::string pointsString = meshJSON.points;
441441
if (numberOfPoints)
442442
{
443-
if (pointComponentType == itk::wasm::MapComponentType<typename MeshType::CoordRepType>::JSONFloatTypeEnum)
443+
if (pointComponentType == itk::wasm::MapComponentType<typename MeshType::CoordinateType>::JSONFloatTypeEnum)
444444
{
445445
const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
446446
mesh->GetPoints()->assign(pointsPtr, pointsPtr + meshJSON.numberOfPoints);
@@ -449,14 +449,14 @@ WasmMeshToMeshFilter<TMesh>
449449
{
450450
auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
451451
const size_t pointComponents = numberOfPoints * dimension;
452-
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordRepType *>(&(mesh->GetPoints()->at(0)) );
452+
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordinateType *>(&(mesh->GetPoints()->at(0)) );
453453
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
454454
}
455455
else if (pointComponentType == itk::wasm::MapComponentType<double>::JSONFloatTypeEnum)
456456
{
457457
auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
458458
const size_t pointComponents = numberOfPoints * dimension;
459-
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordRepType *>(&(mesh->GetPoints()->at(0)) );
459+
auto * pointsContainerPtr = reinterpret_cast<typename MeshType::CoordinateType *>(&(mesh->GetPoints()->at(0)) );
460460
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
461461
}
462462
else

include/itkWasmPointSetToPointSetFilter.hxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ WasmPointSetToPointSetFilter<TPointSet>
173173
const std::string pointsString = pointSetJSON.points;
174174
if (numberOfPoints)
175175
{
176-
if (pointComponentType == itk::wasm::MapComponentType<typename PointSetType::CoordRepType>::JSONFloatTypeEnum)
176+
if (pointComponentType == itk::wasm::MapComponentType<typename PointSetType::CoordinateType>::JSONFloatTypeEnum)
177177
{
178178
const auto * pointsPtr = reinterpret_cast< PointType * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
179179
pointSet->GetPoints()->assign(pointsPtr, pointsPtr + pointSetJSON.numberOfPoints);
@@ -182,14 +182,14 @@ WasmPointSetToPointSetFilter<TPointSet>
182182
{
183183
auto * pointsPtr = reinterpret_cast< float * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
184184
const size_t pointComponents = numberOfPoints * dimension;
185-
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordRepType *>(&(pointSet->GetPoints()->at(0)) );
185+
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordinateType *>(&(pointSet->GetPoints()->at(0)) );
186186
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
187187
}
188188
else if (pointComponentType == itk::wasm::MapComponentType<double>::JSONFloatTypeEnum)
189189
{
190190
auto * pointsPtr = reinterpret_cast< double * >( std::strtoull(pointsString.substr(35).c_str(), nullptr, 10) );
191191
const size_t pointComponents = numberOfPoints * dimension;
192-
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordRepType *>(&(pointSet->GetPoints()->at(0)) );
192+
auto * pointsContainerPtr = reinterpret_cast<typename PointSetType::CoordinateType *>(&(pointSet->GetPoints()->at(0)) );
193193
std::copy(pointsPtr, pointsPtr + pointComponents, pointsContainerPtr);
194194
}
195195
else

0 commit comments

Comments
 (0)