HomePhabricator
Diffusion MITK 2e5c698299a7

Merge branch 'master' into niftk
2e5c698299a7Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into niftk

Details

Provenance
clarksonAuthored on Apr 20 2012, 8:21 AM
kislinskPushed on Aug 6 2018, 4:04 PM
Parents
rMITK5342dbafbc55: Resolve conflicts
rMITKcdaf95f4cd65: Merge branch 'bug-11532-FibColorChange'
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Changes (152)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSizePackages
Applications/
Tutorial/
mitkDiffusion/
Applications/
mitkDiffusion/
CMake/
CPackConfig.cmake.in
CPackDiffusionConfig.cmake.in
CPackOptions.cmake
CPackOptionsDiffusion.cmake
mitkDiffusion/
Copyright.txt
DiffusionCopyright.txt
CMake/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
PackageDepends/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Core/
Code/
IO/
Interactions/
Documentation/
Doxygen/
Tutorial/
Modules/
DiffusionImaging/
Algorithms/
Connectomics/
IODataStructures/
ConnectomicsNetwork/
DiffusionWeightedImages/
FiberBundleX/
Rendering/
GPGPU/
IGT/
IGTToolManagement/
MitkExt/
Interactions/
PlanarFigure/
Algorithms/
O1: MITK Reviewer Group I
Interactions/
O1: MITK Reviewer Group I
Qmitk/
QmitkExt/
ToFHardware/
Testing/
ToFUI/
Qmitk/
Plugins/
org.mitk.diffusionimaging/
src/
internal/
org.mitk.gui.qt.common.legacy/
src/
org.mitk.gui.qt.datamanager/
src/
O1: MITK Reviewer Group I
org.mitk.gui.qt.diffusionimaging/
resources/
src/
internal/
Connectomics/
org.mitk.gui.qt.diffusionimagingapp/
src/
internal/
Perspectives/
org.mitk.gui.qt.toftutorial/
src/
internal/
Utilities/

rMITK2e5c698299a7

View Options

Applications/CMakeLists.txt

View Options

Applications/Tutorial/Step1.cpp

View Options

Applications/mitkDiffusion/CMakeLists.txt

View Options

Applications/mitkDiffusion/CPackConfig.cmake.in

View Options

Applications/mitkDiffusion/CPackOptions.cmake

View Options

Applications/mitkDiffusion/Copyright.txt

View Options

CMake/CPackDiffusionConfig.cmake.in

View Options

CMake/CPackOptionsDiffusion.cmake

View Options

CMake/PackageDepends/MITK_X11_Config.cmake

View Options

CMake/mitkSetupCPack.cmake

View Options

CMake/mitkSetupVariables.cmake

View Options

CMakeLists.txt

View Options

Core/Code/CMakeLists.txt

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/IO/mitkImageWriter.cpp

View Options

Core/Code/Interactions/StateMachine.xml

View Options

DiffusionCopyright.txt

View Options

Documentation/Doxygen/Tutorial/Step09.dox

View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.cpp

View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSyntheticNetworkGenerator.cpp

View Options

Modules/DiffusionImaging/Algorithms/itkExtractChannelFromRgbaImageFilter.cpp

View Options

Modules/DiffusionImaging/Algorithms/itkExtractChannelFromRgbaImageFilter.h

View Options

Modules/DiffusionImaging/Algorithms/itkTractDensityImageFilter.cpp

View Options

Modules/DiffusionImaging/Algorithms/itkTractsToRgbaImageFilter.cpp

View Options

Modules/DiffusionImaging/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cpp

View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.cpp

View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.h

View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetworkReader.cpp

View Options

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.txx

View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleXMapper2D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h

View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/DiffusionImaging/Rendering/mitkPlanarCircleMapper3D.cpp

View Options

Modules/DiffusionImaging/Rendering/vtkOdfSource.cxx

View Options

Modules/DiffusionImaging/Rendering/vtkOdfSource.h

View Options

Modules/DiffusionImaging/files.cmake

View Options

Modules/GPGPU/CMakeLists.txt

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageDeserializer.cpp

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorageSerializer.cpp

View Options

Modules/MitkExt/CMakeLists.txt

View Options

Modules/MitkExt/Interactions/mitkContourTool.cpp

View Options

Modules/PlanarFigure/Algorithms/mitkPlanarFigureObjectFactory.cpp

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/Qmitk/QmitkRenderWindowMenu.cpp

View Options

Modules/QmitkExt/QmitkSlicesInterpolator.cpp

View Options

Modules/ToFHardware/Testing/files.cmake

View Options

Modules/ToFHardware/Testing/mitkToFImageGrabberCreatorTest.cpp

View Options

Modules/ToFHardware/Testing/mitkToFOpenCVImageGrabberTest.cpp

View Options

Modules/ToFHardware/files.cmake

View Options

Modules/ToFHardware/mitkToFImageGrabber.h

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.cpp

View Options

Modules/ToFHardware/mitkToFImageGrabberCreator.h

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFMESAParameterWidget.h

View Options

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFPMDParameterWidget.h

View Options

Plugins/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp

View Options

Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisView.cpp

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/QmitkDiffusionQuantificationView.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppConnectomicsPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppConnectomicsPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppDicomImportPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppDicomImportPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppIVIMPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppIVIMPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppPreprocessingReconstructionPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppPreprocessingReconstructionPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppQuantificationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppQuantificationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppScreenshotsMoviesPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppScreenshotsMoviesPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppTBSSPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppTBSSPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppTrackingEvaluationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppTrackingEvaluationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppVolumeVisualizationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppVolumeVisualizationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDiffusionImagingAppPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDiffusionImagingAppPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkWelcomePerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkWelcomePerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppApplication.h~bug-8511-DTI-atlas-app

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.h

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.h

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.h

View Options

Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp

View Options

Utilities/CMakeLists.txt

MITK · MIC · IMSY · DKFZ