mitk
95f6322d4d21
Actions

Description

Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk

Details

Provenance

hentsch	Authored on Nov 15 2017, 1:09 PM
hentsch	Pushed on Nov 15 2017, 1:09 PM

Parents

rMITKb3c24dd4117f: Merge branch 'T23711-deleteLegacyIOModule'
rMITK0e47ab478d3a: Merge branch 'T23706-OdfVis2'

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITK95f6322d4d21: Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk (authored by hentsch).Nov 15 2017, 1:09 PM

Merged Changes

0e47ab478d3a Merge branch 'T23706-OdfVis2'
Author
neher
Browse Repository
No Builds
No Audits
465e943e3a15 Refactor glyph method. Update user manual.
Author
neher
Browse Repository
No Builds
No Audits
6aa58b98c7b8 Merge branch 'T23712-DeleteCaffe'
Author
kislinsk
Browse Repository
No Builds
No Audits
1bf155e67f9b Delete Caffe(2), Gflags, and DeepDiffusions
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (38)

Path

Size

Packages

CMake/

BuildConfigurations/

All.cmake

O1: MITK Reviewer Group I

FindCaffe2.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_Caffe2_Config.cmake

O1: MITK Reviewer Group I

MITK_Caffe_Config.cmake

O1: MITK Reviewer Group I

CMakeExternals/

Caffe.cmake

O1: MITK Reviewer Group I

Caffe2.cmake

O1: MITK Reviewer Group I

Gflags.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

mitkCaffe2PredictionTest.cpp

mitkCaffePredictionTest.cpp

cmdapps

BrainMaskSegmentation.cpp

CMakeLists.txt

Caffe2Test.cpp

CaffeSegmentationTest.cpp

CaffeTest.cpp

files.cmake

include

itkNormalizeImageSlicesFilter.h

src

itkNormalizeImageSlicesFilter.cpp

mitkDeepDiffusionModuleActivator.cpp

DiffusionCore/

include/

Rendering/

mitkOdfVtkMapper2D.txx

vtkOdfSource.h

src/

Rendering/

vtkOdfSource.cxx

FiberTracking/

cmdapps/

Misc/

PythonTest.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

documentation/

UserManual/

Data_CSD.png

Data_Tensors.png

QmitkDiffusionImagingPortalPage.dox

QmitkDiffusionImagingVisualization.dox

tract_visualization.png

visualization3.png

rMITK95f6322d4d21

View Options

CMake/BuildConfigurations/All.cmake

View Options

CMake/FindCaffe2.cmake

View Options

CMake/PackageDepends/MITK_Caffe2_Config.cmake

View Options

CMake/PackageDepends/MITK_Caffe_Config.cmake

View Options

CMakeExternals/Caffe.cmake

View Options

CMakeExternals/Caffe2.cmake

View Options

CMakeExternals/Gflags.cmake

View Options

CMakeLists.txt

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion

View Options

Modules/DiffusionImaging/DeepDiffusion/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/files.cmake

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffe2PredictionTest.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffePredictionTest.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/BrainMaskSegmentation.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/Caffe2Test.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CaffeSegmentationTest.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CaffeTest.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/files.cmake

View Options

Modules/DiffusionImaging/DeepDiffusion/include

View Options

Modules/DiffusionImaging/DeepDiffusion/include/itkNormalizeImageSlicesFilter.h

View Options

Modules/DiffusionImaging/DeepDiffusion/src

View Options

Modules/DiffusionImaging/DeepDiffusion/src/itkNormalizeImageSlicesFilter.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/src/mitkDeepDiffusionModuleActivator.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/include/Rendering/mitkOdfVtkMapper2D.txx

View Options

Modules/DiffusionImaging/DiffusionCore/include/Rendering/vtkOdfSource.h

View Options

Modules/DiffusionImaging/DiffusionCore/src/Rendering/vtkOdfSource.cxx

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Data_CSD.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Data_Tensors.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.dox

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingVisualization.dox

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tract_visualization.png

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png

Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk95f6322d4d21Actions

Description

Details

Event Timeline

Merged Changes

Changes (38)

rMITK95f6322d4d21

CMake/BuildConfigurations/All.cmake

CMake/FindCaffe2.cmake

CMake/PackageDepends/MITK_Caffe2_Config.cmake

CMake/PackageDepends/MITK_Caffe_Config.cmake

CMakeExternals/Caffe.cmake

CMakeExternals/Caffe2.cmake

CMakeExternals/Gflags.cmake

CMakeLists.txt

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion

Modules/DiffusionImaging/DeepDiffusion/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/Testing

Modules/DiffusionImaging/DeepDiffusion/Testing/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/Testing/files.cmake

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffe2PredictionTest.cpp

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffePredictionTest.cpp

Modules/DiffusionImaging/DeepDiffusion/cmdapps

Modules/DiffusionImaging/DeepDiffusion/cmdapps/BrainMaskSegmentation.cpp

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/cmdapps/Caffe2Test.cpp

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CaffeSegmentationTest.cpp

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CaffeTest.cpp

Modules/DiffusionImaging/DeepDiffusion/files.cmake

Modules/DiffusionImaging/DeepDiffusion/include

Modules/DiffusionImaging/DeepDiffusion/include/itkNormalizeImageSlicesFilter.h

Modules/DiffusionImaging/DeepDiffusion/src

Modules/DiffusionImaging/DeepDiffusion/src/itkNormalizeImageSlicesFilter.cpp

Modules/DiffusionImaging/DeepDiffusion/src/mitkDeepDiffusionModuleActivator.cpp

Modules/DiffusionImaging/DiffusionCore/include/Rendering/mitkOdfVtkMapper2D.txx

Modules/DiffusionImaging/DiffusionCore/include/Rendering/vtkOdfSource.h

Modules/DiffusionImaging/DiffusionCore/src/Rendering/vtkOdfSource.cxx

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

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Data_CSD.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Data_Tensors.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingVisualization.dox

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tract_visualization.png

Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png

Merge branch 'master' of https://phabricator.mitk.org/diffusion/MITK/mitk
95f6322d4d21
Actions