Merge branch 'T23119-PeakMapper2'
ca125b9615c2
Actions

Description

Merge branch 'T23119-PeakMapper2'

Details

Provenance

neher	Authored on Sep 20 2017, 12:30 PM
neher	Pushed on Sep 20 2017, 12:31 PM

Parents

rMITK6811759d3f7f: Remove unused tests
rMITK286c48262be0: Merge branch 'T23376-StatisticsPluginBinSizeFreeze'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKca125b9615c2: Merge branch 'T23119-PeakMapper2' (authored by neher).Sep 20 2017, 12:30 PM

Merged Changes

6811759d3f7f Remove unused tests
Author
neher
Browse Repository
No Builds
No Audits
a9a2fe056a20 Update tracts to vector image filter
Author
neher
Browse Repository
No Builds
No Audits
c3d055d5bf44 Extend mapper. Finalize mimetype
Author
neher
Browse Repository
No Builds
No Audits
a6431f218ecb Add peak image and mapper
Author
neher
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Packages

Modules/

DiffusionImaging/

DiffusionCore/

autoload/

IO/

files.cmake

mitkDiffusionCoreIOActivator.cpp

mitkDiffusionCoreIOMimeTypes.cpp

mitkDiffusionCoreIOMimeTypes.h

mitkPeakImageReader.cpp

	mitkPeakImageReader.h
	mitkNrrdOdfImageReader.h

files.cmake

include/

Algorithms/

itkDiffusionTensorPrincipalDirectionImageFilter.h

itkDiffusionTensorPrincipalDirectionImageFilter.txx

itkFiniteDiffOdfMaximaExtractionFilter.cpp

itkFiniteDiffOdfMaximaExtractionFilter.h

itkFlipPeaksFilter.cpp

itkFlipPeaksFilter.h

	IODataStructures/	mitkPeakImage.h/
	IODataStructures/	TensorImages/


	mitkTensorImage.h

src/

Algorithms/

itkDwiPhantomGenerationFilter.cpp

IODataStructures/

mitkPeakImage.cpp

DiffusionIO/

files.cmake

mitkDiffusionIOMimeTypes.cpp

mitkFiberTrackingObjectFactory.cpp

mitkFiberTrackingObjectFactory.h

mitkPeakImageMapper2D.cpp

	mitkPeakImageMapper2D.h
	mitkFiberBundleMapper2D.h

FiberTracking/

Algorithms/

itkTractsToVectorImageFilter.cpp

itkTractsToVectorImageFilter.h

Testing/

CMakeLists.txt

files.cmake

mitkLocalFiberPlausibilityTest.cpp

mitkPeakExtractionTest.cpp

cmdapps/

FiberProcessing/

FiberDirectionExtraction.cpp

Misc/

PeakExtraction.cpp

TractographyEvaluation/

FitFibersToImage.cpp

Plugins/

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.diffusionimaging.fiberprocessing/

src/

internal/

QmitkFiberQuantificationView.cpp

QmitkFiberQuantificationViewControls.ui

org.mitk.gui.qt.diffusionimaging.odfpeaks/

src/

internal/

QmitkOdfMaximaExtractionView.cpp

QmitkOdfMaximaExtractionViewControls.ui

org.mitk.gui.qt.diffusionimaging/

files.cmake

resources/

QmitkDiffusionImaging.qrc

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

QmitkControlVisualizationPropertiesView.h

QmitkControlVisualizationPropertiesViewControls.ui

mitkPluginActivator.cpp

	org.mitk.gui.qt.diffusionimaging/	resources/
	org.mitk.gui.qt.diffusionimaging.odfpeaks/	resources/

odf_peaks.png

rMITKca125b9615c2

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/files.cmake

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOActivator.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.h

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkPeakImageReader.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkPeakImageReader.h

View Options

Modules/DiffusionImaging/DiffusionCore/files.cmake

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.txx

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFlipPeaksFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFlipPeaksFilter.h

View Options

Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/mitkPeakImage.h

View Options

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/itkDwiPhantomGenerationFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/mitkPeakImage.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/files.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/Testing/files.cmake

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberDirectionExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/Misc/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/FitFibersToImage.cpp

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/resources/odf_peaks.png

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

View Options

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

Merge branch 'T23119-PeakMapper2'ca125b9615c2Actions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITKca125b9615c2

Modules/DiffusionImaging/DiffusionCore/autoload/IO/files.cmake

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOActivator.cpp

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.cpp

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkDiffusionCoreIOMimeTypes.h

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkPeakImageReader.cpp

Modules/DiffusionImaging/DiffusionCore/autoload/IO/mitkPeakImageReader.h

Modules/DiffusionImaging/DiffusionCore/files.cmake

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.h

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkDiffusionTensorPrincipalDirectionImageFilter.txx

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.h

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFlipPeaksFilter.cpp

Modules/DiffusionImaging/DiffusionCore/include/Algorithms/itkFlipPeaksFilter.h

Modules/DiffusionImaging/DiffusionCore/include/IODataStructures/mitkPeakImage.h

Modules/DiffusionImaging/DiffusionCore/src/Algorithms/itkDwiPhantomGenerationFilter.cpp

Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/mitkPeakImage.cpp

Modules/DiffusionImaging/DiffusionIO/files.cmake

Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberTrackingObjectFactory.h

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkPeakImageMapper2D.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.h

Modules/DiffusionImaging/FiberTracking/Testing/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/Testing/files.cmake

Modules/DiffusionImaging/FiberTracking/Testing/mitkLocalFiberPlausibilityTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkPeakExtractionTest.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/FiberProcessing/FiberDirectionExtraction.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/Misc/PeakExtraction.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/TractographyEvaluation/FitFibersToImage.cpp

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberQuantificationViewControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionViewControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc

Plugins/org.mitk.gui.qt.diffusionimaging/resources/odf_peaks.png

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

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui

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

Merge branch 'T23119-PeakMapper2'
ca125b9615c2
Actions