Merge branch 'master' of mitk.org:MITK
e756e35c3eb5
Actions

Description

Merge branch 'master' of mitk.org:MITK

Details

Provenance

Authored on Feb 27 2013, 3:27 PM

Parents

rMITK375b1811ac9a: Merge branch 'bug-14593-doxygen-groups-for-modules'
rMITK65a9972d57c9: Merge branch 'bug-8150-VtkMapper2D3DarchitectureRefactoring'

Branches

Unknown

Tags

Unknown

Event Timeline

• engelhsa committed rMITKe756e35c3eb5: Merge branch 'master' of mitk.org:MITK (authored by • engelhsa).Feb 27 2013, 3:27 PM

Merged Changes

375b1811ac9a Merge branch 'bug-14593-doxygen-groups-for-modules'
Author
zelzer
Browse Repository
No Builds
No Audits
b4605510fe96 Merge branch 'bug-14591-suppress-micro-services-debug-messages'
Author
zelzer
Browse Repository
No Builds
No Audits
cf8156cb0022 Fixed compile error for static builds.
Author
zelzer
Browse Repository
No Builds
No Audits
4e749cea47a8 Fix unused variable error in release builds.
Author
zelzer
Browse Repository
No Builds
No Audits
fdaa5037a09b Suppress all debug messages by default.
Author
zelzer
Browse Repository
No Builds
No Audits
596c257df568 Merge branch 'bug-11046-more-clang-fixes'
Author
nolden
Browse Repository
No Builds
No Audits
2deb96e8dabf Added/fixed Doxygen ingroup commands for Qmitk module.
Author
zelzer
Browse Repository
No Builds
No Audits
02633f618d8f Removed backup and empty files.
Author
zelzer
Browse Repository
No Builds
No Audits
96e5dcc45a21 Fixed a couple of Doxygen groups.
Author
zelzer
Browse Repository
No Builds
No Audits
c96636b4460d Fixed Doxygen group and removed unnecessary UserManual for example plugin.
Author
zelzer
Browse Repository
No Builds
No Audits
abbcd556b6ee Added the deprecated tab for upcoming 2013.03 release.
Author
zelzer
Browse Repository
No Builds
No Audits
dc0c7c648503 Moved Doxygen group defintions related to the Core into the Core dir.
Author
zelzer
Browse Repository
No Builds
No Audits
736f61dbefa6 Use link flags for C as well
Author
nolden
Browse Repository
No Builds
No Audits
fc67500c09f4 Enabled more warnings on clang
Author
nolden
Browse Repository
No Builds
No Audits
73e0cb42332c Excluded some warnings to be errors
Author
nolden
Browse Repository
No Builds
No Audits

Changes (81)

Path

Size

Packages

CMake/

mitkMacroCreateModule.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Core/

Code/

CppMicroServices/

CMakeLists.txt

documentation/

doxygen/

MicroServices_Debugging.dox

src/

util/

usUtils_p.h

test/

usDebugOutputTest.cpp

usStaticModuleResourceTest.cpp

usConfig.h.in

Documentation/

Doxygen/

Groups

	Core/	Documentation/	Doxygen/		Groups/
		Documentation/	Doxygen/	API/	Groups/

ModuleAdaptors.dox

ModuleGeometry.dox

ModuleGeometryFig1.png

ModuleMicroServices.dox

ModuleVisualization.dox

ModuleVisualizationMapper.dox

ModuleVisualizationNavigationControl.dox

ModuleVisualizationRenderer.dox

Modules.dox

Documentation/

Doxygen/

API/

Groups/

CMakeLists.txt

ModuleAdaptors.dox

ModuleGeometry.dox

ModuleGeometryFig1.png

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

ModuleDataManagementClasses.dox.template

MITKDoxygenLayout.xml

Examples/

Plugins/

org.mitk.example.gui.regiongrowing/

documentation/

doxygen/

Modules/

Qmitk/

Documentation

Doxygen

Modules.dox

QmitkApplicationCursor.h

QmitkDataStorageComboBox.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

RigidRegistration/

Documentation/

Doxygen

Modules.dox

ToFProcessing/

Documentation/

CMakeLists.txt

mitkToFProcessingCommon.h

Plugins/

org.mitk.gui.qt.application/

resources/

StateMachine.xml.orig

O1: MITK Reviewer Group I

rMITKe756e35c3eb5

View Options

CMake/mitkMacroCreateModule.cmake

View Options

CMakeLists.txt

View Options

Core/Code/CppMicroServices/CMakeLists.txt

View Options

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

View Options

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

View Options

Core/Code/CppMicroServices/test/usDebugOutputTest.cpp

View Options

Core/Code/CppMicroServices/test/usStaticModuleResourceTest.cpp

View Options

Core/Code/CppMicroServices/usConfig.h.in

View Options

Core/Documentation/Doxygen/Groups/ModuleAdaptors.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleGeometry.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleGeometryFig1.png

View Options

Core/Documentation/Doxygen/Groups/ModuleMicroServices.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleVisualization.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleVisualizationMapper.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleVisualizationNavigationControl.dox

View Options

Core/Documentation/Doxygen/Groups/ModuleVisualizationRenderer.dox

View Options

Core/Documentation/Doxygen/Groups/Modules.dox

View Options

Documentation/Doxygen/API/Groups/CMakeLists.txt

View Options

Documentation/Doxygen/API/Groups/ModuleAdaptors.dox

View Options

Documentation/Doxygen/API/Groups/ModuleGeometry.dox

View Options

Documentation/Doxygen/API/Groups/ModuleGeometryFig1.png

View Options

Documentation/Doxygen/API/Groups/ModuleMicroServices.dox

View Options

Documentation/Doxygen/API/Groups/ModuleVisualization.dox

View Options

Documentation/Doxygen/API/Groups/ModuleVisualizationMapper.dox

View Options

Documentation/Doxygen/API/Groups/ModuleVisualizationNavigationControl.dox

View Options

Documentation/Doxygen/API/Groups/ModuleVisualizationRenderer.dox

View Options

Documentation/Doxygen/API/Groups/Modules.dox

View Options

Documentation/Doxygen/API/Groups/RenderingSequence.png

View Options

Documentation/Doxygen/API/Groups/RenderingSequence.vsd

View Options

Documentation/Doxygen/API/Groups/dialogbarSlicer.png

View Options

Documentation/Doxygen/API/Groups/dialogbarStandardViews.png

View Options

Documentation/Doxygen/API/Groups/dialogbarStereoOptions.png

View Options

Documentation/Doxygen/API/Groups/dialogbarbuttons.png

View Options

Documentation/Doxygen/API/Groups/functionalityButtons.png

View Options

Documentation/Doxygen/API/Groups/renderwindowOptions.png

View Options

Documentation/Doxygen/API/Groups/renderwindows.png

View Options

Documentation/Doxygen/API/Groups/undoredobutton.png

View Options

Documentation/Doxygen/ModuleDataManagementClasses.dox.template

View Options

Documentation/MITKDoxygenLayout.xml

View Options

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

View Options

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/UserManual/Manual.dox

View Options

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/UserManual/icon.xpm

View Options

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/doxygen/modules.dox

View Options

Modules/Qmitk/Documentation/Doxygen/Modules.dox

View Options

Modules/Qmitk/QmitkApplicationCursor.h

View Options

Modules/Qmitk/QmitkDataStorageComboBox.h

View Options

Modules/Qmitk/QmitkDataStorageListModel.h

View Options

Modules/Qmitk/QmitkDataStorageTableModel.h

View Options

Modules/Qmitk/QmitkDataStorageTreeModel.h

View Options

Modules/Qmitk/QmitkEnums.h

View Options

Modules/Qmitk/QmitkEventAdapter.h

View Options

Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h

View Options

Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.h

View Options

Modules/Qmitk/QmitkLevelWindowWidget.h

View Options

Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.h

View Options

Modules/Qmitk/QmitkLineEditLevelWindowWidget.h

View Options

Modules/Qmitk/QmitkMemoryUsageIndicatorView.h

View Options

Modules/Qmitk/QmitkMouseModeSwitcher.h

View Options

Modules/Qmitk/QmitkNodeDescriptor.h

View Options

Modules/Qmitk/QmitkNodeDescriptorManager.h

View Options

Modules/Qmitk/QmitkProgressBar.h

View Options

Modules/Qmitk/QmitkPropertiesTableEditor.h

View Options

Modules/Qmitk/QmitkPropertiesTableModel.h

View Options

Modules/Qmitk/QmitkPropertyDelegate.h

View Options

Modules/Qmitk/QmitkRegisterClasses.h

View Options

Modules/Qmitk/QmitkRenderWindow.h

View Options

Modules/Qmitk/QmitkRenderWindowMenu.h

View Options

Modules/Qmitk/QmitkRenderingManager.h

View Options

Modules/Qmitk/QmitkRenderingManagerFactory.h

View Options

Modules/Qmitk/QmitkServiceListWidget.h

View Options

Modules/Qmitk/QmitkSliderLevelWindowWidget.h

View Options

Modules/Qmitk/QmitkStdMultiWidget.h

View Options

Modules/RigidRegistration/Documentation/Doxygen/Modules.dox

View Options

Modules/ToFProcessing/Documentation/CMakeLists.txt

View Options

Modules/ToFProcessing/mitkToFProcessingCommon.h

View Options

Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml.orig

Merge branch 'master' of mitk.org:MITKe756e35c3eb5Actions

Description

Details

Event Timeline

Merged Changes

Changes (81)

rMITKe756e35c3eb5

CMake/mitkMacroCreateModule.cmake

CMakeLists.txt

Core/Code/CppMicroServices/CMakeLists.txt

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

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/Documentation/Doxygen/Groups/ModuleAdaptors.dox

Core/Documentation/Doxygen/Groups/ModuleGeometry.dox

Core/Documentation/Doxygen/Groups/ModuleGeometryFig1.png

Core/Documentation/Doxygen/Groups/ModuleMicroServices.dox

Core/Documentation/Doxygen/Groups/ModuleVisualization.dox

Core/Documentation/Doxygen/Groups/ModuleVisualizationMapper.dox

Core/Documentation/Doxygen/Groups/ModuleVisualizationNavigationControl.dox

Core/Documentation/Doxygen/Groups/ModuleVisualizationRenderer.dox

Core/Documentation/Doxygen/Groups/Modules.dox

Documentation/Doxygen/API/Groups/CMakeLists.txt

Documentation/Doxygen/API/Groups/ModuleAdaptors.dox

Documentation/Doxygen/API/Groups/ModuleGeometry.dox

Documentation/Doxygen/API/Groups/ModuleGeometryFig1.png

Documentation/Doxygen/API/Groups/ModuleMicroServices.dox

Documentation/Doxygen/API/Groups/ModuleVisualization.dox

Documentation/Doxygen/API/Groups/ModuleVisualizationMapper.dox

Documentation/Doxygen/API/Groups/ModuleVisualizationNavigationControl.dox

Documentation/Doxygen/API/Groups/ModuleVisualizationRenderer.dox

Documentation/Doxygen/API/Groups/Modules.dox

Documentation/Doxygen/API/Groups/RenderingSequence.png

Documentation/Doxygen/API/Groups/RenderingSequence.vsd

Documentation/Doxygen/API/Groups/dialogbarSlicer.png

Documentation/Doxygen/API/Groups/dialogbarStandardViews.png

Documentation/Doxygen/API/Groups/dialogbarStereoOptions.png

Documentation/Doxygen/API/Groups/dialogbarbuttons.png

Documentation/Doxygen/API/Groups/functionalityButtons.png

Documentation/Doxygen/API/Groups/renderwindowOptions.png

Documentation/Doxygen/API/Groups/renderwindows.png

Documentation/Doxygen/API/Groups/undoredobutton.png

Documentation/Doxygen/ModuleDataManagementClasses.dox.template

Documentation/MITKDoxygenLayout.xml

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

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/UserManual/Manual.dox

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/UserManual/icon.xpm

Examples/Plugins/org.mitk.example.gui.regiongrowing/documentation/doxygen/modules.dox

Modules/Qmitk/Documentation/Doxygen/Modules.dox

Modules/Qmitk/QmitkApplicationCursor.h

Modules/Qmitk/QmitkDataStorageComboBox.h

Modules/Qmitk/QmitkDataStorageListModel.h

Modules/Qmitk/QmitkDataStorageTableModel.h

Modules/Qmitk/QmitkDataStorageTreeModel.h

Modules/Qmitk/QmitkEnums.h

Modules/Qmitk/QmitkEventAdapter.h

Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h

Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.h

Modules/Qmitk/QmitkLevelWindowWidget.h

Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.h

Modules/Qmitk/QmitkLineEditLevelWindowWidget.h

Modules/Qmitk/QmitkMemoryUsageIndicatorView.h

Modules/Qmitk/QmitkMouseModeSwitcher.h

Modules/Qmitk/QmitkNodeDescriptor.h

Modules/Qmitk/QmitkNodeDescriptorManager.h

Modules/Qmitk/QmitkProgressBar.h

Modules/Qmitk/QmitkPropertiesTableEditor.h

Modules/Qmitk/QmitkPropertiesTableModel.h

Modules/Qmitk/QmitkPropertyDelegate.h

Modules/Qmitk/QmitkRegisterClasses.h

Modules/Qmitk/QmitkRenderWindow.h

Modules/Qmitk/QmitkRenderWindowMenu.h

Modules/Qmitk/QmitkRenderingManager.h

Modules/Qmitk/QmitkRenderingManagerFactory.h

Modules/Qmitk/QmitkServiceListWidget.h

Modules/Qmitk/QmitkSliderLevelWindowWidget.h

Modules/Qmitk/QmitkStdMultiWidget.h

Modules/RigidRegistration/Documentation/Doxygen/Modules.dox

Merge branch 'master' of mitk.org:MITK
e756e35c3eb5
Actions