HomePhabricator
Diffusion MITK 8752e930349f

Merge remote-tracking branch 'origin/personal/hering/MITKDiffusion-2012…
8752e930349f
Actions

Description

Merge remote-tracking branch 'origin/personal/hering/MITKDiffusion-2012-Bugfixes' into bug-11666-help-404

Conflicts:
Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp

Details

Provenance
• gochAuthored on Apr 17 2012, 4:41 PM
Parents
rMITK8d79401d9bbc: Merge remote-tracking branch 'origin/bug-11648-SubtractFibsCrash' into…
rMITK0e44bb3bd645: Changed include directories
Branches
Unknown
Tags
Unknown

Merged Changes

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

Changes (64)

PathSizePackages
Applications/
Tests/
QtFreeRender/
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
O1: MITK Reviewer Group I
CMakeExternals/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Documentation/
Doxygen/
Tutorial/
Modules/
DiffusionImaging/
Algorithms/
Connectomics/
IODataStructures/
ConnectomicsNetwork/
FiberBundleX/
Reconstruction/
Rendering/
IGT/
IGTFilters/
Testing/
Qmitk/
QmitkExt/
Plugins/
org.mitk.diffusionimaging/
src/
internal/
org.mitk.gui.qt.common.legacy/
src/
org.mitk.gui.qt.diffusionimaging/
resources/
src/
internal/
Connectomics/
org.mitk.gui.qt.diffusionimagingapp/
src/
internal/
org.mitk.gui.qt.moviemaker/
src/
internal/
O3: MITK Reviewer Group II
org.mitk.gui.qt.segmentation/
src/
internal/
O1: MITK Reviewer Group I
org.mitk.gui.qt.stdmultiwidgeteditor/
src/
O1: MITK Reviewer Group I

rMITK8752e930349f

View Options

Applications/Tests/QtFreeRender/CMakeLists.txt

Loading...
View Options

Applications/mitkDiffusion/CPackConfig.cmake.in

Loading...
View Options

Applications/mitkDiffusion/CPackOptions.cmake

Loading...
View Options

Applications/mitkDiffusion/Copyright.txt

Loading...
View Options

Applications/mitkDiffusion/target_libraries.cmake

Loading...
View Options

CMake/CPackDiffusionConfig.cmake.in

Loading...
View Options

CMake/CPackOptionsDiffusion.cmake

Loading...
View Options

CMake/mitkSetupCPack.cmake

Loading...
View Options

CMakeExternals/CTK.cmake

Loading...
View Options

CMakeLists.txt

Loading...
View Options

DiffusionCopyright.txt

Loading...
View Options

Documentation/Doxygen/Tutorial/Step01.dox

Loading...
View Options

Documentation/Doxygen/Tutorial/Step02.dox

Loading...
View Options

Documentation/Doxygen/Tutorial/Step03.dox

Loading...
View Options

Documentation/Doxygen/Tutorial/Step04.dox

Loading...
View Options

Documentation/Doxygen/Tutorial/Step06.dox

Loading...
View Options

Documentation/Doxygen/Tutorial/Tutorial.dox

Loading...
View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.cpp

Loading...
View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSyntheticNetworkGenerator.cpp

Loading...
View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.cpp

Loading...
View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.h

Loading...
View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetworkReader.cpp

Loading...
View Options

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Loading...
View Options

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

Loading...
View Options

Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h

Loading...
View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.h

Loading...
View Options

Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx

Loading...
View Options

Modules/DiffusionImaging/Rendering/vtkOdfSource.cxx

Loading...
View Options

Modules/DiffusionImaging/Rendering/vtkOdfSource.h

Loading...
View Options

Modules/IGT/IGTFilters/mitkNavigationData.h

Loading...
View Options

Modules/IGT/Testing/mitkNavigationDataTest.cpp

Loading...
View Options

Modules/Qmitk/QmitkRenderWindow.cpp

Loading...
View Options

Modules/Qmitk/QmitkRenderWindow.h

Loading...
View Options

Modules/Qmitk/QmitkRenderWindowMenu.cpp

Loading...
View Options

Modules/Qmitk/QmitkRenderWindowMenu.h

Loading...
View Options

Modules/Qmitk/QmitkStdMultiWidget.cpp

Loading...
View Options

Modules/Qmitk/QmitkStdMultiWidget.h

Loading...
View Options

Modules/QmitkExt/QmitkSlicesInterpolator.cpp

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp

Loading...
View Options

Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp

Loading...
MITK · MIC · IMSY · DKFZ