Merge branch 'T25779-StpFiles2' into T25779-StpFiles3
4fefe0d753b7
Actions

Description

Merge branch 'T25779-StpFiles2' into T25779-StpFiles3

Details

Provenance

neher	Authored on Apr 8 2019, 1:05 PM
neher	Pushed on Apr 8 2019, 2:22 PM

Parents

rMITKd923b82127e9: Skip test -e command
rMITKa1b81591a0a1: Building. Now double-check everything

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK4fefe0d753b7: Merge branch 'T25779-StpFiles2' into T25779-StpFiles3 (authored by neher).Apr 8 2019, 1:05 PM

Merged Changes

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 (28)

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

files.cmake

Plugins/

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

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

rMITK4fefe0d753b7

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/files.cmake

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-StpFiles2' into T25779-StpFiles34fefe0d753b7Actions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rMITK4fefe0d753b7

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/files.cmake

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-StpFiles2' into T25779-StpFiles3
4fefe0d753b7
Actions