Merge branch 'T29109-itk5'
e662335bc1bf
Actions

Description

Merge branch 'T29109-itk5'

Details

Provenance

neher	Authored on Apr 28 2022, 2:18 PM
neher	Pushed on Apr 28 2022, 2:18 PM

Parents

rMITKDIFFb8770e886e48: Setting DynamicMultiThreadingOff in all multithreaded filters to enforce old…
rMITKDIFF2a48ddbaa8ea: Merge branch 'T28947-TractRad'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKDIFFe662335bc1bf: Merge branch 'T29109-itk5' (authored by neher).Apr 28 2022, 2:18 PM

Merged Changes

b8770e886e48 Setting DynamicMultiThreadingOff in all multithreaded filters to enforce old…
Author
neher
Browse Repository
No Builds
No Audits
e4f5779a2bd0 using hxx for vnl includes. building now. to-do: testing
Author
neher
Browse Repository
No Builds
No Audits
bbacaadf898e adapted to itk5
Author
neher
Browse Repository
No Builds
No Audits
b7049d6d25d2 itk 5 compatibility wip
Author
neher
Browse Repository
No Builds
No Audits

Changes (79)

Path

Size

Modules/

DiffusionCmdApps/

ImageQuantification/

DiffusionIndices.cpp

DiffusionIvimFit.cpp

MultishellMethods.cpp

TensorReconstruction.cpp

Misc/

DmriDenoising.cpp

DiffusionCore/

Algorithms/

Reconstruction/

MultishellProcessing/

itkADCFitFunctor.h

itkBiExpFitFunctor.h

itkKurtosisFitFunctor.h

itkRadialMultishellToSingleshellImageFilter.cpp

itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

itkBallAndSticksImageFilter.txx

itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

itkDiffusionKurtosisReconstructionImageFilter.cxx

itkDiffusionMultiShellQballReconstructionImageFilter.cpp

itkDiffusionQballReconstructionImageFilter.txx

itkMultiTensorImageFilter.txx

itkOrientationDistributionFunction.h

itkOrientationDistributionFunction.txx

itkPointShell.h

itkPointShell.txx

itkAdcImageFilter.h

itkAdcImageFilter.txx

itkDiffusionOdfGeneralizedFaImageFilter.h

itkDiffusionOdfGeneralizedFaImageFilter.txx

itkDiffusionOdfPrepareVisualizationImageFilter.cpp

itkDiffusionTensorPrincipalDirectionImageFilter.txx

itkDwiNormilzationFilter.txx

itkExtractDwiChannelFilter.txx

itkFlipPeaksFilter.cpp

itkGaussianInterpolateImageFunction.h

itkGaussianInterpolateImageFunction.txx

itkNonLocalMeansDenoisingFilter.txx

itkOdfMaximaExtractionFilter.cpp

itkRegularizedIVIMLocalVariationImageFilter.txx

itkRegularizedIVIMReconstructionFilter.txx

itkRegularizedIVIMReconstructionSingleIteration.txx

itkRemoveDwiChannelFilter.txx

itkResampleDwiImageFilter.h

itkShToOdfImageFilter.cpp

itkShToRgbImageFilter.h

itkTensorImageToDiffusionImageFilter.h

itkTensorImageToOdfImageFilter.h

itkTensorImageToOdfImageFilter.txx

itkTensorToL2NormImageFilter.h

itkTensorToL2NormImageFilter.txx

itkVectorImageToImageFilter.txx

mitkPartialVolumeAnalysisHistogramCalculator.cpp

CMakeLists.txt

DicomImport/

mitkDicomDiffusionImageHeaderReader.cpp

IODataStructures/

DiffusionWeightedImages/

mitkDiffusionImageCorrectionFilter.cpp

mitkOdfImage.h

Rendering/

mitkOdfVtkMapper2D.h

vtkOdfSource.h

Testing/

mitkNonLocalMeansDenoisingTest.cpp

DiffusionIO/

ObjectFactories/

mitkDiffusionCoreObjectFactory.cpp

ReaderWriter/

mitkDiffusionImageNrrdWriter.cpp

mitkNrrdOdfImageWriter.cpp

mitkNrrdTensorImageWriter.cpp

mitkPeakImageSerializer.cpp

mitkShImageWriter.cpp

mitkDiffusionIOMimeTypes.cpp

FiberTracking/

Algorithms/

GibbsTracking/

mitkMetropolisHastingsSampler.cpp

itkStreamlineTrackingFilter.cpp

itkStreamlineTrackingFilter.h

itkTdiToVolumeFractionFilter.cpp

Testing/

mitkPeakShImageReaderTest.cpp

MriSimulation/

Algorithms/

itkDftImageFilter.cpp

itkDftImageFilter.h

itkFieldmapGeneratorFilter.cpp

itkKspaceImageFilter.cpp

itkKspaceImageFilter.h

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

Plugins/

org.mitk.gui.qt.diffusionimaging.denoising/

src/

internal/

QmitkDenoisingView.cpp

org.mitk.gui.qt.diffusionimaging.ivim/

src/

internal/

QmitkIVIMView.cpp

org.mitk.gui.qt.diffusionimaging.partialvolume/

src/

internal/

QmitkPartialVolumeAnalysisView.cpp

org.mitk.gui.qt.diffusionimaging.preprocessing/

src/

internal/

QmitkPreprocessingView.cpp

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

rMITKDIFFe662335bc1bf

View Options

Modules/DiffusionCmdApps/ImageQuantification/DiffusionIndices.cpp

View Options

Modules/DiffusionCmdApps/ImageQuantification/DiffusionIvimFit.cpp

View Options

Modules/DiffusionCmdApps/ImageQuantification/MultishellMethods.cpp

View Options

Modules/DiffusionCmdApps/ImageQuantification/TensorReconstruction.cpp

View Options

Modules/DiffusionCmdApps/Misc/DmriDenoising.cpp

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkADCFitFunctor.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkBiExpFitFunctor.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkKurtosisFitFunctor.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkRadialMultishellToSingleshellImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkBallAndSticksImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.cxx

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionQballReconstructionImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkMultiTensorImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.txx

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkPointShell.h

View Options

Modules/DiffusionCore/Algorithms/Reconstruction/itkPointShell.txx

View Options

Modules/DiffusionCore/Algorithms/itkAdcImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkAdcImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkDiffusionOdfGeneralizedFaImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkDiffusionOdfGeneralizedFaImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkDiffusionOdfPrepareVisualizationImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkDwiNormilzationFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkFlipPeaksFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/itkGaussianInterpolateImageFunction.h

View Options

Modules/DiffusionCore/Algorithms/itkGaussianInterpolateImageFunction.txx

View Options

Modules/DiffusionCore/Algorithms/itkNonLocalMeansDenoisingFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkOdfMaximaExtractionFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMReconstructionFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.txx

View Options

Modules/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkResampleDwiImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkShToOdfImageFilter.cpp

View Options

Modules/DiffusionCore/Algorithms/itkShToRgbImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkTensorImageToDiffusionImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkTensorImageToOdfImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkTensorImageToOdfImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkTensorToL2NormImageFilter.h

View Options

Modules/DiffusionCore/Algorithms/itkTensorToL2NormImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/itkVectorImageToImageFilter.txx

View Options

Modules/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

View Options

Modules/DiffusionCore/CMakeLists.txt

View Options

Modules/DiffusionCore/DicomImport/mitkDicomDiffusionImageHeaderReader.cpp

View Options

Modules/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.cpp

View Options

Modules/DiffusionCore/IODataStructures/mitkOdfImage.h

View Options

Modules/DiffusionCore/Rendering/mitkOdfVtkMapper2D.h

View Options

Modules/DiffusionCore/Rendering/vtkOdfSource.h

View Options

Modules/DiffusionCore/Testing/mitkNonLocalMeansDenoisingTest.cpp

View Options

Modules/DiffusionIO/ObjectFactories/mitkDiffusionCoreObjectFactory.cpp

View Options

Modules/DiffusionIO/ReaderWriter/mitkDiffusionImageNrrdWriter.cpp

View Options

Modules/DiffusionIO/ReaderWriter/mitkNrrdOdfImageWriter.cpp

View Options

Modules/DiffusionIO/ReaderWriter/mitkNrrdTensorImageWriter.cpp

View Options

Modules/DiffusionIO/ReaderWriter/mitkPeakImageSerializer.cpp

View Options

Modules/DiffusionIO/ReaderWriter/mitkShImageWriter.cpp

View Options

Modules/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

View Options

Modules/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.cpp

View Options

Modules/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

View Options

Modules/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

View Options

Modules/FiberTracking/Algorithms/itkTdiToVolumeFractionFilter.cpp

View Options

Modules/FiberTracking/Testing/mitkPeakShImageReaderTest.cpp

View Options

Modules/MriSimulation/Algorithms/itkDftImageFilter.cpp

View Options

Modules/MriSimulation/Algorithms/itkDftImageFilter.h

View Options

Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.cpp

View Options

Modules/MriSimulation/Algorithms/itkKspaceImageFilter.cpp

View Options

Modules/MriSimulation/Algorithms/itkKspaceImageFilter.h

View Options

Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.denoising/src/internal/QmitkDenoisingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.ivim/src/internal/QmitkIVIMView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.partialvolume/src/internal/QmitkPartialVolumeAnalysisView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp

Merge branch 'T29109-itk5'e662335bc1bfActions

Description

Details

Event Timeline

Merged Changes

Changes (79)

rMITKDIFFe662335bc1bf

Modules/DiffusionCmdApps/ImageQuantification/DiffusionIndices.cpp

Modules/DiffusionCmdApps/ImageQuantification/DiffusionIvimFit.cpp

Modules/DiffusionCmdApps/ImageQuantification/MultishellMethods.cpp

Modules/DiffusionCmdApps/ImageQuantification/TensorReconstruction.cpp

Modules/DiffusionCmdApps/Misc/DmriDenoising.cpp

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkADCFitFunctor.h

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkBiExpFitFunctor.h

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkKurtosisFitFunctor.h

Modules/DiffusionCore/Algorithms/Reconstruction/MultishellProcessing/itkRadialMultishellToSingleshellImageFilter.cpp

Modules/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

Modules/DiffusionCore/Algorithms/Reconstruction/itkBallAndSticksImageFilter.txx

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.cpp

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionIntravoxelIncoherentMotionReconstructionImageFilter.h

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionKurtosisReconstructionImageFilter.cxx

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cpp

Modules/DiffusionCore/Algorithms/Reconstruction/itkDiffusionQballReconstructionImageFilter.txx

Modules/DiffusionCore/Algorithms/Reconstruction/itkMultiTensorImageFilter.txx

Modules/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.h

Modules/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.txx

Modules/DiffusionCore/Algorithms/Reconstruction/itkPointShell.h

Modules/DiffusionCore/Algorithms/Reconstruction/itkPointShell.txx

Modules/DiffusionCore/Algorithms/itkAdcImageFilter.h

Modules/DiffusionCore/Algorithms/itkAdcImageFilter.txx

Modules/DiffusionCore/Algorithms/itkDiffusionOdfGeneralizedFaImageFilter.h

Modules/DiffusionCore/Algorithms/itkDiffusionOdfGeneralizedFaImageFilter.txx

Modules/DiffusionCore/Algorithms/itkDiffusionOdfPrepareVisualizationImageFilter.cpp

Modules/DiffusionCore/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.txx

Modules/DiffusionCore/Algorithms/itkDwiNormilzationFilter.txx

Modules/DiffusionCore/Algorithms/itkExtractDwiChannelFilter.txx

Modules/DiffusionCore/Algorithms/itkFlipPeaksFilter.cpp

Modules/DiffusionCore/Algorithms/itkGaussianInterpolateImageFunction.h

Modules/DiffusionCore/Algorithms/itkGaussianInterpolateImageFunction.txx

Modules/DiffusionCore/Algorithms/itkNonLocalMeansDenoisingFilter.txx

Modules/DiffusionCore/Algorithms/itkOdfMaximaExtractionFilter.cpp

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMLocalVariationImageFilter.txx

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMReconstructionFilter.txx

Modules/DiffusionCore/Algorithms/itkRegularizedIVIMReconstructionSingleIteration.txx

Modules/DiffusionCore/Algorithms/itkRemoveDwiChannelFilter.txx

Modules/DiffusionCore/Algorithms/itkResampleDwiImageFilter.h

Modules/DiffusionCore/Algorithms/itkShToOdfImageFilter.cpp

Modules/DiffusionCore/Algorithms/itkShToRgbImageFilter.h

Modules/DiffusionCore/Algorithms/itkTensorImageToDiffusionImageFilter.h

Modules/DiffusionCore/Algorithms/itkTensorImageToOdfImageFilter.h

Modules/DiffusionCore/Algorithms/itkTensorImageToOdfImageFilter.txx

Modules/DiffusionCore/Algorithms/itkTensorToL2NormImageFilter.h

Modules/DiffusionCore/Algorithms/itkTensorToL2NormImageFilter.txx

Modules/DiffusionCore/Algorithms/itkVectorImageToImageFilter.txx

Modules/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

Modules/DiffusionCore/CMakeLists.txt

Modules/DiffusionCore/DicomImport/mitkDicomDiffusionImageHeaderReader.cpp

Modules/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImageCorrectionFilter.cpp

Modules/DiffusionCore/IODataStructures/mitkOdfImage.h

Modules/DiffusionCore/Rendering/mitkOdfVtkMapper2D.h

Modules/DiffusionCore/Rendering/vtkOdfSource.h

Modules/DiffusionCore/Testing/mitkNonLocalMeansDenoisingTest.cpp

Modules/DiffusionIO/ObjectFactories/mitkDiffusionCoreObjectFactory.cpp

Modules/DiffusionIO/ReaderWriter/mitkDiffusionImageNrrdWriter.cpp

Modules/DiffusionIO/ReaderWriter/mitkNrrdOdfImageWriter.cpp

Modules/DiffusionIO/ReaderWriter/mitkNrrdTensorImageWriter.cpp

Modules/DiffusionIO/ReaderWriter/mitkPeakImageSerializer.cpp

Modules/DiffusionIO/ReaderWriter/mitkShImageWriter.cpp

Modules/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

Modules/FiberTracking/Algorithms/GibbsTracking/mitkMetropolisHastingsSampler.cpp

Modules/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

Modules/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

Modules/FiberTracking/Algorithms/itkTdiToVolumeFractionFilter.cpp

Modules/FiberTracking/Testing/mitkPeakShImageReaderTest.cpp

Modules/MriSimulation/Algorithms/itkDftImageFilter.cpp

Modules/MriSimulation/Algorithms/itkDftImageFilter.h

Modules/MriSimulation/Algorithms/itkFieldmapGeneratorFilter.cpp

Modules/MriSimulation/Algorithms/itkKspaceImageFilter.cpp

Modules/MriSimulation/Algorithms/itkKspaceImageFilter.h

Modules/MriSimulation/Algorithms/itkTractsToDWIImageFilter.cpp

Merge branch 'T29109-itk5'
e662335bc1bf
Actions