Merge branch 'master' into T2662-darkStyle2017Integration
8733afc4db63
Actions

Description

Merge branch 'master' into T2662-darkStyle2017Integration

Details

Provenance

• kirchnth	Authored on Aug 3 2017, 1:36 PM
• kirchnth	Pushed on Aug 3 2017, 1:43 PM

Parents

rMITK3b4dae6d577a: Merge branch 'T23145-DiffusionTractographyWarning'
rMITK5b0b045b9cb5: added black svgs for the stdmultiwidget

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITK8733afc4db63: Merge branch 'master' into T2662-darkStyle2017Integration (authored by • kirchnth).Aug 3 2017, 1:36 PM

Merged Changes

3b4dae6d577a Merge branch 'T23145-DiffusionTractographyWarning'
Author
kislinsk
Browse Repository
No Builds
No Audits
11b467e6bbac Disable external Vigra warning C4244 in QmitkMLBTView.cpp
Author
kislinsk
Browse Repository
No Builds
No Audits
8e90d1eb17fc Merge branch 'T23138-InteractiveTracking'
Author
neher
Browse Repository
No Builds
No Audits
4edd4f446360 using slice change listener. fixed some threading issues
Author
neher
Browse Repository
No Builds
No Audits
d993ade5821d Merge branch 'T23108-MlTrackingUpdates'
Author
neher
Browse Repository
No Builds
No Audits
b1785980976f cleanup
Author
neher
Browse Repository
No Builds
No Audits
efc56b349866 adapted sampling. fixed ODF threshold here to 0.1
Author
neher
Browse Repository
No Builds
No Audits
fe1fae3174ee added serializer
Author
neher
Browse Repository
No Builds
No Audits
17974b19852f Merge branch 'T23129-LinuxQtPlugins'
Author
kislinsk
Browse Repository
No Builds
No Audits
f953aa16b545 Fix copy & paste error
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Packages

CMake/

mitkInstallRules.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

DiffusionIO/

files.cmake

mitkPlanarFigureCompositeSerializer.h

	mitkTractographyForestSerializer.cpp
	mitkPlanarFigureCompositeSerializer.cpp

	mitkTractographyForestSerializer.h
	mitkFiberBundleSerializer.h

FiberTracking/

Algorithms/

TrackingHandlers/

mitkTrackingHandlerOdf.cpp

mitkTrackingHandlerRandomForest.cpp

IODataStructures/

mitkTractographyForest.cpp

Plugins/

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

src/

internal/

QmitkMLBTView.cpp

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingView.h

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkControlVisualizationPropertiesView.cpp

rMITK8733afc4db63

View Options

CMake/mitkInstallRules.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/files.cmake

View Options

Modules/DiffusionImaging/DiffusionIO/mitkPlanarFigureCompositeSerializer.h

View Options

Modules/DiffusionImaging/DiffusionIO/mitkTractographyForestSerializer.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkTractographyForestSerializer.h

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkTractographyForest.cpp

View Options

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

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/src/internal/QmitkControlVisualizationPropertiesView.cpp

Merge branch 'master' into T2662-darkStyle2017Integration8733afc4db63Actions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK8733afc4db63

CMake/mitkInstallRules.cmake

Modules/DiffusionImaging/DiffusionIO/files.cmake

Modules/DiffusionImaging/DiffusionIO/mitkPlanarFigureCompositeSerializer.h

Modules/DiffusionImaging/DiffusionIO/mitkTractographyForestSerializer.cpp

Modules/DiffusionImaging/DiffusionIO/mitkTractographyForestSerializer.h

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

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

Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkTractographyForest.cpp

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

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/src/internal/QmitkControlVisualizationPropertiesView.cpp

Merge branch 'master' into T2662-darkStyle2017Integration
8733afc4db63
Actions