Diffusion MITK 96864d8e28cd

Merge branch 'bug-14646-RefactorFiberProcessingView'
96864d8e28cd
Actions

Description

Merge branch 'bug-14646-RefactorFiberProcessingView'

Conflicts:
Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake

Details

Provenance

neher

Authored on Mar 12 2013, 5:26 PM

Parents

rMITK15ae880e0209: split views
rMITK9e0775fddd88: Merge branch 'bug-14594-ImplementFurtherDiffusionModels'

Branches

Tags

Event Timeline

neher committed rMITK96864d8e28cd: Merge branch 'bug-14646-RefactorFiberProcessingView' (authored by neher).Mar 12 2013, 5:26 PM

Merged Changes

15ae880e0209 split views
Author
neher
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Plugins/

org.mitk.gui.qt.diffusionimaging/

files.cmake

plugin.xml

src/

internal/

	QmitkFiberExtractionView.cpp
	QmitkFiberProcessingView.cpp

	QmitkFiberExtractionView.h
	QmitkFiberProcessingView.h

	QmitkFiberExtractionViewControls.ui
	QmitkFiberProcessingViewControls.ui

QmitkFiberProcessingView.cpp

QmitkFiberProcessingView.h

QmitkFiberProcessingViewControls.ui

mitkPluginActivator.cpp

org.mitk.gui.qt.diffusionimagingapp/

src/

internal/

Perspectives/

QmitkDIAppFiberTractographyPerspective.cpp

QmitkDIAppSyntheticDataGenerationPerspective.cpp

rMITK96864d8e28cd

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp

Merge branch 'bug-14646-RefactorFiberProcessingView'96864d8e28cdActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rMITK96864d8e28cd

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

Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.cpp

Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp

Merge branch 'bug-14646-RefactorFiberProcessingView'
96864d8e28cd
Actions