Merge branch 'master' into T22228-PApluginIntegrationAugust2017
0e0e769c9ffb
Actions

Description

Merge branch 'master' into T22228-PApluginIntegrationAugust2017

Details

Provenance

• kirchnth	Authored on Aug 8 2017, 1:59 PM
• kirchnth	Pushed on Aug 8 2017, 2:01 PM

Parents

rMITK86900f283f09: Merge branch 'T23184-imageStatisticsLineIntegration'
rMITKfd5c331b9f33: added re-sampling after "stupidBmode" and minor stuff

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITK0e0e769c9ffb: Merge branch 'master' into T22228-PApluginIntegrationAugust2017 (authored by • kirchnth).Aug 8 2017, 1:59 PM

Merged Changes

86900f283f09 Merge branch 'T23184-imageStatisticsLineIntegration'
Author
hentsch
Browse Repository
No Builds
No Audits
44d1eba49781 Merge branch 'T23190-__cplusplus'
Author
kislinsk
Browse Repository
No Builds
No Audits
c9aa163bd49a Merge branch 'T23184-imageStatisticsLineChart' into T23184…
Author
hentsch
Browse Repository
No Builds
No Audits
64e2ba8d79d1 Pass CMAKE_CXX_STANDARD to MITK-Configure
Author
kislinsk
Browse Repository
No Builds
No Audits
4751e5ef0883 Resolved T23184, formatted according to MITK Style guide
Author
hentsch
Browse Repository
No Builds
No Audits
84e36e2c10ce Merge branch 'T23098-FiberExtraction2'
Author
neher
Browse Repository
No Builds
No Audits
e19ba5e65278 fixed interactive fiber extraction
Author
neher
Browse Repository
No Builds
No Audits
74dcdca5c3fc Merge branch 'T23098-FiberExtraction'
Author
neher
Browse Repository
No Builds
No Audits
65319754daa8 added interactive fiber extraction
Author
neher
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Packages

CMakeExternals/

Caffe.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

FiberTracking/

Algorithms/

TrackingHandlers/

mitkTrackingHandlerTensor.cpp

mitkTrackingHandlerTensor.h

IODataStructures/

FiberBundle/

mitkFiberBundle.cpp

Testing/

mitkStreamlineTractographyTest.cpp

cmdapps/

Tractography/

StreamlineTractography.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging.fiberprocessing/

src/

internal/

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

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

src/

internal/

QmitkStreamlineTrackingView.cpp

QmitkStreamlineTrackingView.h

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

SuperBuild.cmake

O1: MITK Reviewer Group I

rMITK0e0e769c9ffb

View Options

CMakeExternals/Caffe.cmake

View Options

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

View Options

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

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

View Options

Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.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.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

View Options

Merge branch 'master' into T22228-PApluginIntegrationAugust20170e0e769c9ffbActions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITK0e0e769c9ffb

CMakeExternals/Caffe.cmake

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

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

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.cpp

Modules/DiffusionImaging/FiberTracking/Testing/mitkStreamlineTractographyTest.cpp

Modules/DiffusionImaging/FiberTracking/cmdapps/Tractography/StreamlineTractography.cpp

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

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingView.h

Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkFiberProcessingViewControls.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.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h

SuperBuild.cmake

Merge branch 'master' into T22228-PApluginIntegrationAugust2017
0e0e769c9ffb
Actions