Merge branch 'master' into niftk, including MITK aeeeafd7f8, from Wed, 27 Feb…
275e13053854Unpublished
Actions

org.blueberry.core.commands/

documentation/

org.blueberry.core.expressions/

documentation/

org.blueberry.core.jobs/

documentation/

org.blueberry.core.runtime/

documentation/

org.blueberry.osgi/

documentation/

org.blueberry.solstice.common/

documentation/

org.blueberry.test/

documentation/

doxygen/

org.blueberry.ui.qt.log/

documentation/

UserManual/

blueberrylogview.dox

org.blueberry.ui.qt.objectinspector/

documentation/

doxygen/

org.blueberry.ui.qt/

documentation/

org.blueberry.ui/

documentation/

doxygen/

org.blueberry.uitest/

documentation/

doxygen/

Documentation/

mitkMacroCreateModule.cmake

reference/

extension-points/

	index.dox
	index.dox.in

index.dox.in

CMake/

mitkMacroCreateModuleTests.cmake

mitkSetupVariables.cmake

Core/

Code/

CppMicroServices/

CMake/

usCTestScript.cmake

MicroServices_Debugging.dox

documentation/

doxygen/

src/

module/

usModuleAbstractTracked.tpp

usModuleAbstractTracked_p.h

service/

usServiceTracker.tpp

usServiceTrackerPrivate.h

usServiceTrackerPrivate.tpp

usTrackedService.tpp

util/

usUtils_p.h

test/

usDebugOutputTest.cpp

usStaticModuleResourceTest.cpp

usConfig.h.in

Interactions/

mitkBindDispatcherInteractor.cpp

mitkBindDispatcherInteractor.h

mitkDataInteractor.cpp

mitkDataInteractor.h

mitkDispatcher.cpp

mitkDispatcher.h

mitkDisplayInteractor.cpp

mitkDisplayInteractor.h

mitkDisplayPositionEvent.cpp

mitkDisplayPositionEvent.h

mitkEvent.h

mitkEventConfig.cpp

mitkEventConfig.h

mitkEventDescription.h

mitkEventObserver.cpp

mitkEventObserver.h

mitkEventStateMachine.cpp

mitkEventStateMachine.h

mitkGlobalInteraction.h

mitkInformer.cpp

mitkInformer.h

mitkInteractionEvent.cpp

mitkInteractionEvent.h

mitkInteractionEventConst.h

	mitkInteractionEventHandler.cpp
	mitkEventHandler.cpp

	mitkInteractionEventHandler.h
	mitkEventHandler.h

mitkInteractionKeyEvent.cpp

mitkInteractionKeyEvent.h

mitkInteractionPositionEvent.cpp

mitkInteractionPositionEvent.h

mitkInteractor.h

mitkInternalEvent.cpp

mitkInternalEvent.h

mitkKeyEvent.h

mitkMouseModeSwitcher.cpp

mitkMouseModeSwitcher.h

mitkMouseMoveEvent.cpp

mitkMouseMoveEvent.h

mitkMousePressEvent.cpp

mitkMousePressEvent.h

mitkMouseReleaseEvent.cpp

mitkMouseReleaseEvent.h

mitkMouseWheelEvent.cpp

mitkMouseWheelEvent.h

mitkPointSetDataInteractor.cpp

mitkPointSetDataInteractor.h

mitkPointSetInteractor.cpp

mitkStateMachineFactory.h

mitkStateMachineState.cpp

mitkStateMachineState.h

mitkStateMachineTransition.cpp

mitkStateMachineTransition.h

mitkTransition.h

mitkVtkEventAdapter.h

mitkWheelEvent.h

	Interfaces/
	Interactions/

	mitkInteractionEventObserver.cpp
	mitkEventObserver.cpp

	mitkInteractionEventObserver.h
	mitkEventObserver.h

Rendering/

mitkBaseRenderer.cpp

mitkBaseRenderer.h

	mitkGLMapper.cpp
	mitkGLMapper2D.cpp

mitkGLMapper.h

mitkGLMapper2D.cpp

	mitkGLMapper2D.h
	mitkMapper3D.h

mitkGeometry2DDataMapper2D.cpp

mitkGeometry2DDataMapper2D.h

mitkGeometry2DDataVtkMapper3D.cpp

mitkGeometry2DDataVtkMapper3D.h

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

mitkPointSetGLMapper2D.cpp

mitkPointSetGLMapper2D.h

mitkPointSetVtkMapper3D.cpp

mitkPointSetVtkMapper3D.h

mitkPolyDataGLMapper2D.cpp

mitkPolyDataGLMapper2D.h

mitkSurfaceGLMapper2D.cpp

mitkSurfaceGLMapper2D.h

mitkSurfaceVtkMapper3D.cpp

mitkSurfaceVtkMapper3D.h

mitkVolumeDataVtkMapper3D.cpp

mitkVolumeDataVtkMapper3D.h

mitkVtkMapper.cpp

mitkVtkMapper.h

mitkVtkMapper2D.cpp

	mitkVtkMapper2D.h
	mitkVtkMapper2D.cpp

mitkVtkMapper3D.cpp

	mitkVtkMapper3D.h
	mitkMapper3D.cpp

mitkVtkPropRenderer.cpp

vtkMitkLevelWindowFilter.cpp

vtkMitkRenderProp.cpp

vtkMitkRenderProp.h

	Rendering/
	Testing/

mitkRenderingTestHelper.cpp

mitkRenderingTestHelper.h

Resources/

Interactions/

DisplayConfig.xml

DisplayConfigMITK.xml

DisplayConfigPACS.xml

DisplayConfigPACSLevelWindow.xml

DisplayConfigPACSPan.xml

DisplayConfigPACSScroll.xml

DisplayConfigPACSZoom.xml

PointSetConfig.xml

Tests/

StatemachineConfigTest.xml

	Tests/

Testing/

mitkDispatcherTest.cpp

mitkRenderingTestHelper.cpp

mitkRenderingTestHelper.h

files.cmake

Documentation/

Doxygen/

Concepts/

images/

introduction/

MitkOverview.png

Groups

extension-points

mitkExtPointsIndex.dox

	Core/	Documentation/	Doxygen/	Groups/
		Documentation/	Doxygen/	Modules/

ModuleAdaptors.dox

ModuleGeometry.dox

ModuleGeometryFig1.png

ModuleMicroServices.dox

ModuleVisualization.dox

ModuleVisualizationMapper.dox

ModuleVisualizationNavigationControl.dox

ModuleVisualizationRenderer.dox

Documentation/

Doxygen/

BlueBerryExampleLauncherDialog.png

BlueBerryExamples.dox

BlueBerryExtensionPointsIntro.dox

BlueBerryIntro.dox

BlueBerrySelectionServiceIntro.dox

ExtensionPointEx.png

ExtensionPoints.png

MitkSelectionService.png

SelectionServiceDiagram.png

SelectionServiceDiagram.xcf

application-window.jpg

workbench-class-diagram.jpg

workbench-page.jpg

workbench-window-editor-area.png

workbench-window-editor-area.xcf

workbench-window-perspective.png

workbench-window-perspective.xcf

workbench-window-views.png

workbench-window-views.xcf

DeveloperManual/

DevelopmentApplication.dox

	Application/

Deployment.dox

BuildInstructions.dox

BuildToolkits.dox

CMakeFAQ.dox

Deployment.dox

DeveloperManualPortal.dox

Development.dox

DirectoryStructure.dox

DocumentationExample.dox

DocumentationGuide.dox

HowToNewProject-MyProjectLayout.png

HowToNewProject.dox

KnownProblems.dox

NewPlugin.dox

ShortIntroductionToMITK.dox

GettingToKnowMITK.dox

	Starting/

	FirstSteps/

NewPlugin.dox

	GettingToKnow/

CMakeFAQ.dox

DirectoryStructure.dox

DocumentationExample.dox

DocumentationGuide.dox

KnownProblems.dox

StyleGuideAndNotes.dox

	SettingUpMITK/

BuildInstructions.dox

BuildToolkits.dox

HowToNewProject-MyProjectLayout.png

HowToNewProject.dox

SupportedPlatforms.md

ThirdPartyLibs.dox

StyleGuideAndNotes.dox

SupportedPlatforms.md

ThirdPartyLibs.dox

Toolkit

DevelopmentToolkit.dox

ModuleManuals

	DeveloperManual/

	Application/	BlueBerry/
		BlueBerry/

BlueBerryExampleLauncherDialog.png

BlueBerryExamples.dox

BlueBerryExtensionPointsIntro.dox

BlueBerryIntro.dox

BlueBerrySelectionServiceIntro.dox

ExtensionPointEx.png

ExtensionPoints.png

MitkSelectionService.png

SelectionServiceDiagram.png

SelectionServiceDiagram.xcf

application-window.jpg

workbench-class-diagram.jpg

workbench-page.jpg

workbench-window-editor-area.png

workbench-window-editor-area.xcf

workbench-window-perspective.png

workbench-window-perspective.xcf

workbench-window-views.png

workbench-window-views.xcf

workbench-window.jpg

workbench.jpg

	Starting/

	FirstSteps/	StatemachineEditor/
		StatemachineEditor/

StatemachineEditor.dox

images

BuildPath.PNG

CreateJavaProject.PNG

openPropertiesView.PNG

openstatemachinexml.png

specifycontainer.png

specifycontainer2.png

specifycontainer3.png

	GettingToKnow/

	Tutorial/
	Modules/

Tutorial/

configureVisualStudioProperties.png

	Toolkit/	ModuleManuals/
		UserManual/

MITKModuleManualsList.dox

ExampleCode

DocumentationExample.h

MainPage.dox.in

ModuleDataManagementClasses.dox.template

ModuleGeometryFig1.png

ModuleGeometryFigures.zip

ModuleMicroServices.dox

ModuleVisualization.dox

ModuleVisualizationMapper.dox

ModuleVisualizationNavigationControl.dox

ModuleVisualizationRenderer.dox

Modules.dox

RenderingSequence.png

RenderingSequence.vsd

dialogbarSlicer.png

dialogbarStandardViews.png

dialogbarStereoOptions.png

dialogbarbuttons.png

functionalityButtons.png

renderwindowOptions.png

renderwindows.png

undoredobutton.png

Overview

	Overview/
	DeveloperManual/

	Overview.dox
	ShortIntroductionToMITK.dox

StatemachineEditor

StatemachineEditor.dox

images

BuildPath.PNG

CreateJavaProject.PNG

openPropertiesView.PNG

openstatemachinexml.png

specifycontainer.png

specifycontainer2.png

specifycontainer3.png

configureVisualStudioProperties.png

UserManual/

MITKModuleManualsList.dox

MITKPluginManualsList.dox

UserManualPortal.dox

MITKDoxygenLayout.xml

doxygen.conf.in

		Documentation/	Doxygen/
	Core/	Documentation/	Doxygen/

	DeveloperManual/

	Application/
	extension-points/

	ExtensionPointReference.dox
	mitkExtPointsIndex.dox

	Starting/
	Concepts/

	Architecture.dox
	Overview.dox

	Starting/	GettingToKnow/
		Concepts/

	Coding.dox
	CodingGeneral.dox

	DeveloperManual/	images/
	Concepts/	images/	introduction/

MitkOverview.png

	Examples/
	Documentation/	Doxygen/	ExampleCode/

DocumentationExample.h

Examples/

Plugins/

PluginList.cmake

org.mitk.example.gui.regiongrowing

QmitkRegionGrowingView.cpp

QmitkRegionGrowingView.h

QtFreeRender/

QtFreeRender.cpp

	Examples/	Plugins/	org.mitk.example.gui.regiongrowing/
		Plugins/	org.mitk.gui.InteractionTests/

mitkConnectomicsNetworkMapper3D.cpp

files.cmake

manifest_headers.cmake

plugin.xml

resources

src/

internal/

	QmitkRegionGrowingViewControls.ui
	InteractionTestsControls.ui

	org_mitk_example_gui_regiongrowing_Activator.cpp
	org_mitk_gui_InteractionTests_Activator.cpp

	org_mitk_example_gui_regiongrowing_Activator.h
	org_mitk_gui_InteractionTests_Activator.h

	Examples/	Plugins/	org.mitk.example.gui.regiongrowing/	resources/
	Plugins/	org.mitk.gui.InteractionTests/	documentation/	UserManual/

icon.xpm

Modules/

DiffusionImaging/

Connectomics/

Rendering/

mitkConnectomicsNetworkMapper3D.h

DiffusionCore/

Rendering/

mitkCompositeMapper.h

mitkOdfVtkMapper2D.h

mitkOdfVtkMapper2D.txx

mitkPlanarFigureMapper3D.cpp

mitkPlanarFigureMapper3D.h

mitkVectorImageVtkGlyphMapper3D.cpp

mitkVectorImageVtkGlyphMapper3D.h

FiberTracking/

Algorithms/

itkTractsToDWIImageFilter.cpp

itkTractsToDWIImageFilter.h

Rendering/

mitkFiberBundleXMapper2D.cpp

mitkFiberBundleXMapper2D.h

mitkFiberBundleXMapper3D.cpp

mitkFiberBundleXMapper3D.h

mitkFiberBundleXThreadMonitorMapper3D.cpp

mitkFiberBundleXThreadMonitorMapper3D.h

SignalModels/

mitkDiffusionSignalModel.h

mitkKspaceArtifact.h

mitkT2SmearingArtifact.cpp

mitkT2SmearingArtifact.h

MitkExt/

Rendering/

mitkEnhancedPointSetVtkMapper3D.cpp

mitkEnhancedPointSetVtkMapper3D.h

mitkGPUVolumeMapper3D.cpp

mitkGPUVolumeMapper3D.h

mitkLineMapper2D.cpp

mitkMeshMapper2D.cpp

mitkMeshMapper2D.h

mitkMeshVtkMapper3D.cpp

mitkMeshVtkMapper3D.h

mitkSplineMapper2D.cpp

mitkSplineMapper2D.h

mitkSplineVtkMapper3D.cpp

mitkSplineVtkMapper3D.h

mitkUnstructuredGridMapper2D.cpp

mitkUnstructuredGridMapper2D.h

mitkUnstructuredGridVtkMapper3D.cpp

mitkUnstructuredGridVtkMapper3D.h

mitkVectorImageMapper2D.cpp

mitkVectorImageMapper2D.h

Testing/

mitkDataNodeExtTest.cpp

PlanarFigure/

Rendering/

mitkPlanarFigureMapper2D.cpp

mitkPlanarFigureMapper2D.h

QmitkDataStorageComboBox.h

Qmitk/

Documentation

Doxygen

Modules.dox

QmitkApplicationCursor.h

QmitkDataStorageListModel.h

QmitkDataStorageTableModel.h

QmitkDataStorageTreeModel.h

QmitkEnums.h

QmitkEventAdapter.h

QmitkLevelWindowPresetDefinitionDialog.h

QmitkLevelWindowRangeChangeDialog.h

QmitkLevelWindowWidget.h

QmitkLevelWindowWidgetContextMenu.h

QmitkLineEditLevelWindowWidget.h

QmitkMemoryUsageIndicatorView.h

QmitkMouseModeSwitcher.h

QmitkNodeDescriptor.h

QmitkNodeDescriptorManager.h

QmitkProgressBar.h

QmitkPropertiesTableEditor.h

QmitkPropertiesTableModel.h

QmitkPropertyDelegate.h

QmitkRegisterClasses.h

QmitkRenderWindow.h

QmitkRenderWindowMenu.h

QmitkRenderingManager.h

QmitkRenderingManagerFactory.h

QmitkServiceListWidget.h

QmitkSliderLevelWindowWidget.h

QmitkStdMultiWidget.h

QmitkExt/

QmitkPointListView.cpp

QmitkPointListView.h

QmitkPointListWidget.cpp

QmitkPointListWidget.h

RigidRegistration/

Documentation/

Doxygen

Modules.dox

Segmentation/

Rendering/

mitkContourMapper2D.cpp

mitkContourMapper2D.h

mitkContourModelGLMapper2D.cpp

mitkContourModelGLMapper2D.h

mitkContourModelMapper2D.cpp

mitkContourModelMapper2D.h

mitkContourModelMapper3D.cpp

mitkContourModelMapper3D.h

mitkContourSetMapper2D.cpp

mitkContourSetMapper2D.h

mitkContourSetVtkMapper3D.cpp

mitkContourSetVtkMapper3D.h

mitkContourVtkMapper3D.cpp

mitkContourVtkMapper3D.h

mitkDataNodeSegmentationTest.cpp

Testing/

mitkSimulationDrawTool.cpp

Simulation/

ToFProcessing/

Documentation/

mitkToFDistanceImageToSurfaceFilter.cpp

mitkToFDistanceImageToSurfaceFilter.h

mitkToFProcessingCommon.h

mitkToFSurfaceVtkMapper3D.cpp

mitkToFSurfaceVtkMapper3D.h

Plugins/

PluginList.cmake

org.mitk.core.services/

documentation/

doxygen/

org.mitk.gui.InteractionTests

PointsConfigRightClick.xml

Resources

manifest_headers.cmake

InteractionTestsControls.ui

org_mitk_gui_InteractionTests_Activator.cpp

org_mitk_gui_InteractionTests_Activator.h

org.mitk.gui.common/

src/

mitkIRenderWindowPart.h

org.mitk.gui.qt.application/

documentation/

doxygen/

resources/

StateMachine.xml.orig

org.mitk.gui.qt.common/

documentation/

doxygen/

org.mitk.gui.qt.coreapplication/

documentation/

doxygen/

QmitkFiberfoxViewControls.ui

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberfoxView.cpp

QmitkFiberfoxView.h

Utilities/

tinyxml/

tinyxml.h

rMITK275e13053854

.gitattributes

Applications/PluginGenerator/LICENSE.txt

Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox

Applications/PluginGenerator/PluginTemplate/documentation/doxygen/modules.dox

Applications/PluginGenerator/PluginTemplate/files.cmake

Applications/PluginGenerator/PluginTemplate/plugin.xml

Applications/PluginGenerator/PluginTemplate/src/internal/QmitkTemplateView.h

BlueBerry/Bundles/org.blueberry.compat/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.core.commands/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.core.expressions/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.core.jobs/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.core.runtime/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.osgi/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.solstice.common/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.test/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.ui.qt.log/documentation/UserManual/blueberrylogview.dox

BlueBerry/Bundles/org.blueberry.ui.qt.log/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.ui.qt/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.ui/documentation/doxygen/modules.dox

BlueBerry/Bundles/org.blueberry.uitest/documentation/doxygen/modules.dox

BlueBerry/Documentation/CMakeLists.txt

BlueBerry/Documentation/reference/extension-points/index.dox

BlueBerry/Documentation/reference/extension-points/index.dox.in

CMake/mitkMacroCreateModule.cmake

CMake/mitkMacroCreateModuleTests.cmake

CMake/mitkSetupVariables.cmake

CMakeLists.txt

Core/Code/CppMicroServices/CMake/usCTestScript.cmake

Core/Code/CppMicroServices/CMakeLists.txt

Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Debugging.dox

Core/Code/CppMicroServices/src/module/usModuleAbstractTracked.tpp

Core/Code/CppMicroServices/src/module/usModuleAbstractTracked_p.h

Core/Code/CppMicroServices/src/service/usServiceTracker.tpp

Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.h

Core/Code/CppMicroServices/src/service/usServiceTrackerPrivate.tpp

Core/Code/CppMicroServices/src/service/usTrackedService.tpp

Core/Code/CppMicroServices/src/util/usUtils_p.h

Core/Code/CppMicroServices/test/usDebugOutputTest.cpp

Core/Code/CppMicroServices/test/usStaticModuleResourceTest.cpp

Core/Code/CppMicroServices/usConfig.h.in

Core/Code/Interactions/mitkBindDispatcherInteractor.cpp

Core/Code/Interactions/mitkBindDispatcherInteractor.h

Core/Code/Interactions/mitkDataInteractor.cpp

Core/Code/Interactions/mitkDataInteractor.h

Core/Code/Interactions/mitkDispatcher.cpp

Core/Code/Interactions/mitkDispatcher.h

Core/Code/Interactions/mitkDisplayInteractor.cpp

Core/Code/Interactions/mitkDisplayInteractor.h

Core/Code/Interactions/mitkDisplayPositionEvent.cpp

Core/Code/Interactions/mitkDisplayPositionEvent.h

Core/Code/Interactions/mitkEvent.h

Core/Code/Interactions/mitkEventConfig.cpp

Core/Code/Interactions/mitkEventConfig.h

Core/Code/Interactions/mitkEventDescription.h

Core/Code/Interactions/mitkEventFactory.cpp

Core/Code/Interactions/mitkEventFactory.h

Core/Code/Interactions/mitkEventHandler.cpp

Core/Code/Interactions/mitkEventHandler.h

Core/Code/Interactions/mitkEventInformer.h

Core/Code/Interactions/mitkEventMapper.cpp

Core/Code/Interactions/mitkEventMapper.h

Core/Code/Interactions/mitkEventObserver.cpp

Core/Code/Interactions/mitkEventObserver.h

Core/Code/Interactions/mitkEventStateMachine.cpp

Core/Code/Interactions/mitkEventStateMachine.h

Core/Code/Interactions/mitkGlobalInteraction.h

Core/Code/Interactions/mitkInformer.cpp

Core/Code/Interactions/mitkInformer.h

Core/Code/Interactions/mitkInteractionEvent.cpp

Core/Code/Interactions/mitkInteractionEvent.h

Core/Code/Interactions/mitkInteractionEventConst.h

Core/Code/Interactions/mitkInteractionEventHandler.cpp

Core/Code/Interactions/mitkInteractionEventHandler.h

Core/Code/Interactions/mitkInteractionKeyEvent.cpp

Core/Code/Interactions/mitkInteractionKeyEvent.h

Core/Code/Interactions/mitkInteractionPositionEvent.cpp

Core/Code/Interactions/mitkInteractionPositionEvent.h

Core/Code/Interactions/mitkInteractor.h

Core/Code/Interactions/mitkInternalEvent.cpp

Core/Code/Interactions/mitkInternalEvent.h

Core/Code/Interactions/mitkKeyEvent.h

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

Core/Code/Interactions/mitkMouseModeSwitcher.h

Core/Code/Interactions/mitkMouseMoveEvent.cpp

Core/Code/Interactions/mitkMouseMoveEvent.h

Core/Code/Interactions/mitkMousePressEvent.cpp

Core/Code/Interactions/mitkMousePressEvent.h

Core/Code/Interactions/mitkMouseReleaseEvent.cpp