Import 2017-06-07 23:51:09: master 482471ad

Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-10-28 21:54:52 master 19c03077
Changeset

STYLE: Remove unused code related to now disabled ITKv3 compatibility mode

Reviewing changes introduced in r24669 (COMP: Add ITK_OVERRIDE
designations for C++11) also identified some now dead code that
was used to override a parent class method when ITKv3 compatibility
was enabled. Considering that ITKv3_COMPATIBILITY is disabled since
r23960 (ENH: Disable ITKv3 compatibility to enable 64-bit ids on
windows), this commit removes the code that was initially introduced
in r17784 (ENH: Transform classes compatible with ITKv[34])

Note that the code associated with itkAnisotropicSimilarity3DTransformTest
is now broken. Since it is not compiled and is associated with a module
in the legacy category, a comment has been added to provide hint.

Finally, note that all tests associated with ResampleDTI and
ExpertAutomatedRegistration modules are passing:

$ ctest -L ExpertAutomated
Test project /home/jcfr/Projects/Slicer-Debug/Slicer-build
Start 494: ExpertAutomatedRegistrationTestDataFixed
1/5 Test 0000494: ExpertAutomatedRegistrationTestDataFixed ....... Passed 0.17 sec
Start 495: ExpertAutomatedRegistrationTestDataRigidArgs
2/5 Test 0000495: ExpertAutomatedRegistrationTestDataRigidArgs ... Passed 0.15 sec
Start 496: ExpertAutomatedRegistrationTestDataRigid
3/5 Test 0000496: ExpertAutomatedRegistrationTestDataRigid ....... Passed 0.20 sec
Start 497: ExpertAutomatedRegistrationTestDataAffine
4/5 Test 0000497: ExpertAutomatedRegistrationTestDataAffine ...... Passed 0.19 sec
Start 498: ExpertAutomatedRegistrationTestDataBSpline
5/5 Test 0000498: ExpertAutomatedRegistrationTestDataBSpline ..... Passed 0.90 sec

100% tests passed, 0 tests failed out of 5

Label Time Summary:
ExpertAutomatedRegistration = 1.61 sec

Total Test time (real) = 1.67 sec

$ ctest -L ResampleDTI
Test project /home/jcfr/Projects/Slicer-Debug/Slicer-build
Start 470: ResampleDTIVolumeRotationNNTest
1/7 Test 0000470: ResampleDTIVolumeRotationNNTest ............... Passed 1.02 sec
Start 471: ResampleDTIVolume2RigidTransformsLinearTest
2/7 Test 0000471: ResampleDTIVolume2RigidTransformsLinearTest ... Passed 0.91 sec
Start 472: ResampleDTIVolumeBSplineWSInterpolationTest
3/7 Test 0000472: ResampleDTIVolumeBSplineWSInterpolationTest ... Passed 10.66 sec
Start 473: ResampleDTIVolumeBSplineInterpolationTest
4/7 Test 0000473: ResampleDTIVolumeBSplineInterpolationTest ..... Passed 1.90 sec
Start 474: ResampleDTIVolumeHFieldTest
5/7 Test 0000474: ResampleDTIVolumeHFieldTest ................... Passed 3.14 sec
Start 475: itkTestMainExtendedScalarTest
6/7 Test 0000475: itkTestMainExtendedScalarTest ................. Passed 1.24 sec
Start 476: itkTestMainExtendedFailedTest
7/7 Test 0000476: itkTestMainExtendedFailedTest ................. Passed 1.66 sec

100% tests passed, 0 tests failed out of 7

Label Time Summary:
ResampleDTIVolume = 20.54 sec

Total Test time (real) = 20.60 sec

Co-authored-by: Francois Budin <fbudin@unc.edu>
Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>

From: Hans Johnson <hans-johnson@uiowa.edu>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24672 3bd1e089-480b-0410-8dfb-8563597acbee

mod - Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h Diff File
mod - Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.txx Diff File
mod - Modules/CLI/ExpertAutomatedRegistration/itkAnisotropicSimilarity3DTransformTest.cxx Diff File
mod - Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.h Diff File
mod - Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.txx Diff File
mod - Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.h Diff File
mod - Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.txx Diff File