Skip to content

Commit fff7712

Browse files
committed
ENH: Remove fftPadPositiveIndex
The spatial location was wrongly shifted when using this filter Negative indices do not interfere with any processing. The scripts using this fftPad should instead use the ITK core: FFTPadImageFilter
1 parent 9fb132e commit fff7712

File tree

7 files changed

+2
-472
lines changed

7 files changed

+2
-472
lines changed

README.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,6 @@ maximize the response at every pixel.
300300
itkStructureTensor.hxx
301301

302302

303-
FFTPad but avoiding setting negative index, which is problematic working with
304-
neighborhoods.
305-
306-
::
307-
308-
itkFFTPadPositiveIndexImageFilter.h
309-
itkFFTPadPositiveIndexImageFilter.hxx
310-
311-
312303
Regular shrinkers without interpolation
313304
'''''''''''''''''''''''''''''''''''''''
314305

examples/runRieszWaveletAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "itkForwardFFTImageFilter.h"
2020
#include "itkInverseFFTImageFilter.h"
21-
#include "itkFFTPadPositiveIndexImageFilter.h"
21+
#include "itkFFTPadImageFilter.h"
2222
#include "itkWaveletFrequencyForward.h"
2323
#include "itkWaveletFrequencyInverse.h"
2424
#include "itkWaveletFrequencyForwardUndecimated.h"
@@ -74,7 +74,7 @@ runRieszWaveletPhaseAnalysis( const std::string& inputImage,
7474
reader->SetFileName( inputImage );
7575
reader->Update();
7676

77-
using FFTPadFilterType = itk::FFTPadPositiveIndexImageFilter<ImageType>;
77+
using FFTPadFilterType = itk::FFTPadImageFilter<ImageType>;
7878
auto fftPadFilter = FFTPadFilterType::New();
7979
fftPadFilter->SetInput(reader->GetOutput());
8080
fftPadFilter->SetBoundaryConditionToConstant(0);

include/itkFFTPadPositiveIndexImageFilter.h

Lines changed: 0 additions & 144 deletions
This file was deleted.

include/itkFFTPadPositiveIndexImageFilter.hxx

Lines changed: 0 additions & 169 deletions
This file was deleted.

test/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ set(IsotropicWaveletsTests
1717
# Syntactic sugar utilities
1818
itkVectorInverseFFTImageFilterTest.cxx
1919
itkZeroDCImageFilterTest.cxx
20-
# Alternative FFT padding
21-
itkFFTPadPositiveIndexImageFilterTest.cxx
2220
# Output data for each wavelet to visualize with python.
2321
itkIsotropicWaveletFrequencyFunctionTest.cxx
2422
itkHeldIsotropicWaveletTest.cxx
@@ -344,14 +342,6 @@ itk_add_test(NAME itkFrequencyShrinkEvenTest
344342
${ITK_TEST_OUTPUT_DIR}/itkFrequencyShrinkEvenTest2D.tiff
345343
2
346344
)
347-
##FFTPad
348-
# TODO: Add 2D Odd Data, current 512x512 input does not cover the class well. Other boundary conditions have been removed.
349-
itk_add_test(NAME itkFFTPadPositiveIndexImageFilterTestConstant
350-
COMMAND IsotropicWaveletsTestDriver
351-
itkFFTPadPositiveIndexImageFilterTest
352-
DATA{Input/checkershadow_Lch_512x512.tiff}
353-
${ITK_TEST_OUTPUT_DIR}/itkFFTPadPositiveIndexImageFilterTestConstant.tiff 2 CONSTANT
354-
)
355345
## ZeroDC
356346
itk_add_test(NAME itkZeroDCImageFilterTest
357347
COMMAND IsotropicWaveletsTestDriver
@@ -388,8 +378,6 @@ if(ITK_USE_FFTWF)
388378
itkFrequencyExpandOddTest itkFrequencyShrinkOddTest)
389379
endif()
390380

391-
itk_python_expression_add_test(NAME itkFFTPadPositiveIndexImageFilterPythonTest
392-
EXPRESSION "instance = itk.FFTPadPositiveIndexImageFilter.New()")
393381
itk_python_expression_add_test(NAME itkFrequencyExpandImageFilterPythonTest
394382
EXPRESSION "instance = itk.FrequencyExpandImageFilter.New()")
395383
itk_python_expression_add_test(NAME itkFrequencyFunctionPythonTest

0 commit comments

Comments
 (0)