HomePhabricator
Diffusion MITK ca745d87032a

Merge branch 'bug-18018-PlanarFigureComposite'
ca745d87032a
Actions

Description

Merge branch 'bug-18018-PlanarFigureComposite'

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

Details

Provenance
neherAuthored on Aug 19 2014, 5:26 PM
Parents
rMITK8c4aa2860845: using polydata bounds instead of manual bounding box calculation
rMITKb1b89dcc7ce3: Merge branch 'bug-16775-live-wire-with-3d-interpolation-integration'
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (9)

PathSize
Modules/
DiffusionImaging/
FiberTracking/
IODataStructures/
FiberBundleX/
PlanarFigureComposite/
Testing/
MiniApps/
Plugins/
org.mitk.gui.qt.diffusionimaging/
src/
internal/

rMITKca745d87032a

View Options

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

Loading...
View Options

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

Loading...
View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.cpp

Loading...
View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/PlanarFigureComposite/mitkPlanarFigureComposite.h

Loading...
View Options

Modules/DiffusionImaging/FiberTracking/Testing/mitkFiberExtractionTest.cpp

Loading...
View Options

Modules/DiffusionImaging/MiniApps/FiberExtraction.cpp

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
MITK · MIC · IMSY · DKFZ