Merge branch 'bug-15380-FiberTrackingNoQt' into bug-15380…
1c1fc8f3fa81
Actions

Description

Merge branch 'bug-15380-FiberTrackingNoQt' into bug-15380-FiberfoxFixAndNoQtIntegration

Details

Provenance

Authored on Jun 16 2013, 3:36 PM

Parents

rMITK7941ee75bbae: added possibility to rmeove fibers inside mask image
rMITK36fbb99a8345: Merge branch 'bug-15266-oclProgramReferenceCounter'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK1c1fc8f3fa81: Merge branch 'bug-15380-FiberTrackingNoQt' into bug-15380… (authored by neher).Jun 16 2013, 3:36 PM

Merged Changes

7941ee75bbae added possibility to rmeove fibers inside mask image
Author
neher
Browse Repository
No Builds
No Audits
de402ce27067 always rearranging slice
Author
neher
Browse Repository
No Builds
No Audits
ae71b24b6ef1 all signal models use scalar type internally
Author
neher
Browse Repository
No Builds
No Audits
e4ddf365cd94 tracking and core are independent of qt
Author
neher
Browse Repository
No Builds
No Audits
d36f8cefdee8 added peak extraction
Author
neher
Browse Repository
No Builds
No Audits
95e65879c302 added fiber processing miniapp
Author
neher
Browse Repository
No Builds
No Audits
b92fc1ef7f49 removed all qt dependencies
Author
neher
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Modules/

DiffusionImaging/

Connectomics/

CMakeLists.txt

Rendering/

mitkConnectomicsNetworkMapper3D.cpp

DiffusionCore/

Algorithms/

itkAdcImageFilter.txx

CMakeLists.txt

FiberTracking/

Algorithms/

itkFibersFromPlanarFiguresFilter.cpp

itkFibersFromPlanarFiguresFilter.h

itkGibbsTrackingFilter.cpp

itkKspaceImageFilter.cpp

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleX.h

mitkFiberTrackingObjectFactory.cpp

mitkFiberTrackingObjectFactory.h

Interactions/

mitkFiberBundleInteractor.cpp

MiniApps/

CMakeLists.txt

GibbsTracking.cpp

PeakExtraction.cpp

TractometerAngularErrorTool.cpp

	MiniApps/
	Testing/

	FiberProcessing.cpp
	mitkFiberProcessing.cpp

Rendering/

mitkFiberBundleXMapper3D.cpp

SignalModels/

mitkAstroStickModel.cpp

mitkAstroStickModel.h

Testing/

mitkFiberProcessing.cpp

files.cmake

Quantification/

CMakeLists.txt

Plugins/

org.mitk.gui.qt.diffusionimaging/

files.cmake

src/

internal/

QmitkFiberExtractionView.cpp

QmitkFiberExtractionView.h

QmitkFiberExtractionViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingViewControls.ui

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

QmitkFiberfoxViewControls.ui

mitkPluginActivator.cpp

rMITK1c1fc8f3fa81

View Options

Modules/DiffusionImaging/Connectomics/CMakeLists.txt

View Options

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkAdcImageFilter.txx

View Options

Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFibersFromPlanarFiguresFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFibersFromPlanarFiguresFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.h

View Options

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberProcessing.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/GibbsTracking.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/TractometerAngularErrorTool.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.h

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.cpp

View Options

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/files.cmake

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberProcessing.cpp

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Modules/DiffusionImaging/Quantification/CMakeLists.txt

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-15380-FiberTrackingNoQt' into bug-15380…1c1fc8f3fa81Actions

Description

Details

Event Timeline

Merged Changes

Changes (41)

rMITK1c1fc8f3fa81

Modules/DiffusionImaging/Connectomics/CMakeLists.txt

Modules/DiffusionImaging/Connectomics/Rendering/mitkConnectomicsNetworkMapper3D.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkAdcImageFilter.txx

Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFibersFromPlanarFiguresFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFibersFromPlanarFiguresFilter.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkKspaceImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberTrackingObjectFactory.h

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberProcessing.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/GibbsTracking.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/TractometerAngularErrorTool.cpp

Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleXMapper3D.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkAstroStickModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkBallModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkStickModel.h

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.cpp

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkTensorModel.h

Modules/DiffusionImaging/FiberTracking/Testing/files.cmake

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberProcessing.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Modules/DiffusionImaging/Quantification/CMakeLists.txt

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

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

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

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

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

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

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

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

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

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

Merge branch 'bug-15380-FiberTrackingNoQt' into bug-15380…
1c1fc8f3fa81
Actions