Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMP: Replace CoordRepType with CoordinateType #234

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

COMP: Replace CoordRepType with CoordinateType #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adb8be5
COMP: Replace `CoordRepType` with `CoordinateType`
N-Dekker Dec 6, 2024
e410de2
ENH: Update CI to 6.0 master
dzenanz Dec 6, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@41f4e23ad1a405bcd83c7dc312f118ca8ea66b43
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@3e664701905234d13e9a442de7aecbd9e29492c4
with:
cmake-options: "Module_Montage_BUILD_EXAMPLES:BOOL=ON"
itk-git-tag: '814a24c84d3bf4bdc42ce8f07276997fabdb45d3'

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@41f4e23ad1a405bcd83c7dc312f118ca8ea66b43
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@3e664701905234d13e9a442de7aecbd9e29492c4
with:
test-notebooks: true
secrets:
Expand Down
4 changes: 2 additions & 2 deletions include/itkTileMergeImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ template <typename TImageType,
class ITK_TEMPLATE_EXPORT TileMergeImageFilter
: public TileMontage<
Image<typename NumericTraits<typename TImageType::PixelType>::ValueType, TImageType::ImageDimension>,
typename TInterpolator::CoordRepType>
typename TInterpolator::CoordinateType>
{
public:
ITK_DISALLOW_COPY_AND_MOVE(TileMergeImageFilter);

/** We define superclass with scalar pixel type, to enable compiling even when RGB pixel is supplied. */
using Superclass =
TileMontage<Image<typename NumericTraits<typename TImageType::PixelType>::ValueType, TImageType::ImageDimension>,
typename TInterpolator::CoordRepType>;
typename TInterpolator::CoordinateType>;

/** Standard class type aliases. */
using Self = TileMergeImageFilter;
Expand Down
10 changes: 5 additions & 5 deletions include/itkTileMergeImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@ TileMergeImageFilter<TImageType, TPixelAccumulateType, TInterpolator>::GenerateO
if (m_Montage.IsNull())
{
// initialize mosaic bounds
this->m_MinInner.Fill(NumericTraits<typename TInterpolator::CoordRepType>::NonpositiveMin());
this->m_MinOuter.Fill(NumericTraits<typename TInterpolator::CoordRepType>::max());
this->m_MaxOuter.Fill(NumericTraits<typename TInterpolator::CoordRepType>::NonpositiveMin());
this->m_MaxInner.Fill(NumericTraits<typename TInterpolator::CoordRepType>::max());
this->m_MinInner.Fill(NumericTraits<typename TInterpolator::CoordinateType>::NonpositiveMin());
this->m_MinOuter.Fill(NumericTraits<typename TInterpolator::CoordinateType>::max());
this->m_MaxOuter.Fill(NumericTraits<typename TInterpolator::CoordinateType>::NonpositiveMin());
this->m_MaxInner.Fill(NumericTraits<typename TInterpolator::CoordinateType>::max());

for (SizeValueType i = 0; i < this->m_LinearMontageSize; i++)
{
Expand Down Expand Up @@ -315,7 +315,7 @@ TileMergeImageFilter<TImageType, TPixelAccumulateType, TInterpolator>::GenerateO
iOrigin = inverseT->TransformPoint(iOrigin);

const ContinuousIndexType ci =
outputImage->template TransformPhysicalPointToContinuousIndex<typename TInterpolator::CoordRepType,
outputImage->template TransformPhysicalPointToContinuousIndex<typename TInterpolator::CoordinateType,
typename PointType::ValueType>(iOrigin);
for (unsigned d = 0; d < ImageDimension; d++)
{
Expand Down
Loading