Merge branch 'T25779-StpFiles5' into T25779-StpFiles6
20e70f4dbb61
Actions

Description

Merge branch 'T25779-StpFiles5' into T25779-StpFiles6

Details

Provenance

neher	Authored on Apr 15 2019, 9:39 AM
neher	Pushed on Apr 15 2019, 11:28 AM

Parents

rMITK6d6ff2576c91: Refactoring. Todo: reading and writing
rMITK2460d50651af: Merge branch 'T26274-chartXAxisLabelCovers'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK20e70f4dbb61: Merge branch 'T25779-StpFiles5' into T25779-StpFiles6 (authored by neher).Apr 15 2019, 9:39 AM

Merged Changes

6d6ff2576c91 Refactoring. Todo: reading and writing
Author
neher
Browse Repository
No Builds
No Audits
d07cd498d92b Check units
Author
neher
Browse Repository
No Builds
No Audits
f3895f778a21 Tests passing
Author
neher
Browse Repository
No Builds
No Audits
e643e97a1b0c Merge branch 'T25779-StpFiles4' into T25779-StpFiles5
Author
neher
Browse Repository
No Builds
No Audits
4f7a0699f9b2 Merge branch 'T25779-StpFiles3' into T25779-StpFiles4
Author
neher
Browse Repository
No Builds
No Audits
7444bea9335a Tests
Author
neher
Browse Repository
No Builds
No Audits
4fefe0d753b7 Merge branch 'T25779-StpFiles2' into T25779-StpFiles3
Author
neher
Browse Repository
No Builds
No Audits
a1b81591a0a1 Building. Now double-check everything
Author
neher
Browse Repository
No Builds
No Audits
37420551156c Tracking pic
Author
neher
Browse Repository
No Builds
No Audits
f960441edc75 Merge branch 'T25779-StpFiles' into T25779-StpFiles2
Author
neher
Browse Repository
No Builds
No Audits
af2ba67bb4ff Refactoring
Author
neher
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

Modules/

DiffusionImaging/

DiffusionCmdApps/

Tractography/

StreamlineTractography.cpp

FiberTracking/

Algorithms/

TrackingHandlers/

mitkTrackingDataHandler.cpp

mitkTrackingDataHandler.h

mitkTrackingHandlerOdf.cpp

mitkTrackingHandlerOdf.h

mitkTrackingHandlerPeaks.cpp

mitkTrackingHandlerPeaks.h

mitkTrackingHandlerRandomForest.cpp

mitkTrackingHandlerRandomForest.h

mitkTrackingHandlerTensor.cpp

mitkTrackingHandlerTensor.h

itkStreamlineTrackingFilter.cpp

itkStreamlineTrackingFilter.h

IODataStructures/

mitkStreamlineTractographyParameters.cpp

mitkStreamlineTractographyParameters.h

Testing/

mitkMachineLearningTrackingTest.cpp

mitkStreamlineTractographyTest.cpp

files.cmake

Plugins/

org.mitk.gui.qt.diffusionimaging.tractography/

documentation/

UserManual/

QmitkStreamlineTrackingViewUserManual.dox

files.cmake

src/

QmitkMlbstTrainingDataWidget.cpp

QmitkMlbstTrainingDataWidget.h

QmitkMlbstTrainingDataWidgetControls.ui

internal/

QmitkMLBTView.cpp

QmitkMLBTView.h

QmitkMLBTViewControls.ui

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingView.h

QmitkStreamlineTrackingViewControls.ui

mitkPluginActivator.cpp

org.mitk.gui.qt.diffusionimagingapp/

resources/

welcome/

pics/

3D_4_2.png

rMITK20e70f4dbb61

View Options

Modules/DiffusionImaging/DiffusionCmdApps/Tractography/StreamlineTractography.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerPeaks.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerPeaks.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkStreamlineTractographyParameters.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkStreamlineTractographyParameters.h

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkMachineLearningTrackingTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/files.cmake

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidget.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidget.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/3D_4_2.png

Merge branch 'T25779-StpFiles5' into T25779-StpFiles620e70f4dbb61Actions

Description

Details

Event Timeline

Merged Changes

Changes (31)

rMITK20e70f4dbb61

Modules/DiffusionImaging/DiffusionCmdApps/Tractography/StreamlineTractography.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingDataHandler.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerOdf.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerPeaks.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerPeaks.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerRandomForest.h

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/TrackingHandlers/mitkTrackingHandlerTensor.h

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkStreamlineTrackingFilter.h

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkStreamlineTractographyParameters.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkStreamlineTractographyParameters.h

Modules/DiffusionImaging/FiberTracking/Testing/mitkMachineLearningTrackingTest.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

Modules/DiffusionImaging/FiberTracking/files.cmake

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox

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

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidget.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidget.h

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/QmitkMlbstTrainingDataWidgetControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTView.h

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkMLBTViewControls.ui

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.h

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingViewControls.ui

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

Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/3D_4_2.png

Merge branch 'T25779-StpFiles5' into T25779-StpFiles6
20e70f4dbb61
Actions