Merge branch 'bug-9731-tbssOpenSource'
7375b0e6c069
Actions

Description

Merge branch 'bug-9731-tbssOpenSource'

Details

Provenance

Authored on Nov 29 2011, 8:36 AM

Parents

rMITKe9950c848356: moved tbss related classes to the open source part
rMITK06e1779db27a: Merge branch 'bug-10017-aurora-tracking-volumes'

Branches

Unknown

Tags

Unknown

Event Timeline

• vanbruggen committed rMITK7375b0e6c069: Merge branch 'bug-9731-tbssOpenSource' (authored by • vanbruggen).Nov 29 2011, 8:36 AM

Merged Changes

e9950c848356 moved tbss related classes to the open source part
Author
• vanbruggen
Browse Repository
No Builds
No Audits
bc2e38699fa1 removed unnecessary dependencies
Author
• vanbruggen
Browse Repository
No Builds
No Audits
30487140c836 reversed order of graph algorithms and diffusion imaging due to dependency order
Author
• vanbruggen
Browse Repository
No Builds
No Audits
98cc7bda79da added graph algorithms module to cmake
Author
• vanbruggen
Browse Repository
No Builds
No Audits
b9fe242a967b moved the tract analyzer to public repository
Author
• vanbruggen
Browse Repository
No Builds
No Audits
0eb57d322976 Created directory for graph algorithms
Author
• vanbruggen
Browse Repository
No Builds
No Audits

Changes (29)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

files.cmake

plugin.xml

src/

QmitkTbssRoiAnalysisWidget.cpp

QmitkTbssRoiAnalysisWidget.h

internal/

QmitkTbssMetaTableModel.cpp

QmitkTbssMetaTableModel.h

QmitkTbssTableModel.cpp

QmitkTbssTableModel.h

QmitkTractbasedSpatialStatisticsView.cpp

QmitkTractbasedSpatialStatisticsView.h

QmitkTractbasedSpatialStatisticsViewControls.ui

mitkPluginActivator.cpp

	org.mitk.gui.qt.diffusionimaging/	resources/
	org.mitk.gui.qt.diffusionimagingapp/	resources/	perspectives/

tbss.png

CMakeLists.txt

DiffusionImaging/

Algorithms/

mitkTractAnalyzer.cpp

itkShortestPathCostFunction.h

itkShortestPathCostFunction.txx

itkShortestPathCostFunctionTbss.h

itkShortestPathCostFunctionTbss.txx

itkShortestPathImageFilter.h

itkShortestPathImageFilter.txx

itkShortestPathNode.cpp

itkShortestPathNode.h

rMITK7375b0e6c069

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tbss.png

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

View Options

Modules/CMakeLists.txt

View Options

Modules/DiffusionImaging/Algorithms/mitkTractAnalyzer.cpp

View Options

Modules/DiffusionImaging/Algorithms/mitkTractAnalyzer.h

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/files.cmake

View Options

Modules/GraphAlgorithms/CMakeLists.txt

View Options

Modules/GraphAlgorithms/files.cmake

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunction.h

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunction.txx

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionTbss.h

View Options

Modules/GraphAlgorithms/itkShortestPathCostFunctionTbss.txx

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.h

View Options

Modules/GraphAlgorithms/itkShortestPathImageFilter.txx

View Options

Modules/GraphAlgorithms/itkShortestPathNode.cpp

View Options

Modules/GraphAlgorithms/itkShortestPathNode.h

Merge branch 'bug-9731-tbssOpenSource'7375b0e6c069Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rMITK7375b0e6c069

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tbss.png

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp

Modules/CMakeLists.txt

Modules/DiffusionImaging/Algorithms/mitkTractAnalyzer.cpp

Modules/DiffusionImaging/Algorithms/mitkTractAnalyzer.h

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/files.cmake

Modules/GraphAlgorithms/CMakeLists.txt

Modules/GraphAlgorithms/files.cmake

Modules/GraphAlgorithms/itkShortestPathCostFunction.h

Modules/GraphAlgorithms/itkShortestPathCostFunction.txx

Modules/GraphAlgorithms/itkShortestPathCostFunctionTbss.h

Modules/GraphAlgorithms/itkShortestPathCostFunctionTbss.txx

Modules/GraphAlgorithms/itkShortestPathImageFilter.h

Modules/GraphAlgorithms/itkShortestPathImageFilter.txx

Modules/GraphAlgorithms/itkShortestPathNode.cpp

Modules/GraphAlgorithms/itkShortestPathNode.h

Merge branch 'bug-9731-tbssOpenSource'
7375b0e6c069
Actions