Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947…
fd36ce7d9004
Actions

Description

Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947-CreatePluginForManagmentOfUltrasoundDevices

Details

Provenance

Authored on Jun 11 2012, 9:35 AM

Parents

rMITK818d740c0e75: Refine service property locking to avoid possible deadlocks.
rMITKf75c9567eb50: Merge branch 'bug-11075-micro-services-unregistration' into bug-11947…

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITKfd36ce7d9004: Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947… (authored by maerz).Jun 11 2012, 9:35 AM

Merged Changes

818d740c0e75 Refine service property locking to avoid possible deadlocks.
Author
zelzer
Browse Repository
No Builds
No Audits
c2fc79458512 Test only for a specific service interface count.
Author
zelzer
Browse Repository
No Builds
No Audits
113fdfbcac44 Return the highest ranking service. Added unit tests.
Author
zelzer
Browse Repository
No Builds
No Audits
63ddfff6e842 Default comparison operator is already operator<.
Author
zelzer
Browse Repository
No Builds
No Audits
dfb81b5dd3a5 Copy the classes list, since we need it after the original is destroyed.
Author
zelzer
Browse Repository
No Builds
No Audits
fc757b60985b Do not assume that a service ranking property exists.
Author
zelzer
Browse Repository
No Builds
No Audits
c0552fd3ba8a Merge branch 'bug-11075-micro-services-unregistration'
Author
zelzer
Browse Repository
No Builds
No Audits
fba1f3dac0bc Merge branch 'bug-12134-rendering-errors-from-painttool'
Author
• fetzer
Browse Repository
No Builds
No Audits
c620d2bc5864 Fixed an issue where the paintbrush contour remains in the renderwindows even…
Author
• fetzer
Browse Repository
No Builds
No Audits
1d2cd4f7b965 Fixed rendering issue of paint tool
Author
• fetzer
Browse Repository
No Builds
No Audits
a82f59b1872b Merge branch 'bug-11317-3DAdaptiveRegionGrowing-Interaction'
Author
• hering
Browse Repository
No Builds
No Audits
bd396fa85339 Fixed several interaction bugs for AdaptiveRG
Author
• hering
Browse Repository
No Builds
No Audits
e4380edee652 Merge branch 'bug-11978-Crash-on-negative-index-access'
Author
• hering
Browse Repository
No Builds
No Audits
c856f60400f6 Merge branch 'bug-12105-unify-events-in-statemachinexml'
Author
engelm
Browse Repository
No Builds
No Audits
993cb37f985a adapting the 'resource-version' of StateMachinexml as well
Author
engelm
Browse Repository
No Builds
No Audits
91c1de80f49d Negative index value checking in mitkImageTest
Author
• hering
Browse Repository
No Builds
No Audits
19e69a0e399d Code simplification
Author
• hering
Browse Repository
No Builds
No Audits
b358777cafd8 Added negative index value checking
Author
• hering
Browse Repository
No Builds
No Audits
db2f383b66e1 Merge branch 'bug-12035-allow-overriding-of-build-all-apps'
Author
zelzer
Browse Repository
No Builds
No Audits
d017cdfa23f6 Allow CDash clients to configure more MITK options.
Author
zelzer
Browse Repository
No Builds
No Audits
c2dbe15a5a7c Make BlueBerry testing more configurable.
Author
zelzer
Browse Repository
No Builds
No Audits
f63d87a4152a Merge branch 'bug-12122-adaptDocumentation'
Author
gergel
Browse Repository
No Builds
No Audits
71c5b9142e66 adapted supported platforms for Linux and Windows
Author
gergel
Browse Repository
No Builds
No Audits
99877298d814 Merge branch 'bug-12105-unify-events-in-statemachinexml'
Author
engelm
Browse Repository
No Builds
No Audits
013736c42390 renamed statemachines, added ContextmenuInteractor
Author
engelm
Browse Repository
No Builds
No Audits
05cee5086ae6 unified events naming in Statemachine.xml
Author
engelm
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

Packages

BlueBerry/

CMakeLists.txt

CMake/

MITKDashboardSetup.cmake

O1: MITK Reviewer Group I

Core/

Code/

CppMicroServices/

src/

service/

usServiceRegistration.cpp

usServiceRegistry.cpp

test/

usServiceRegistryTest.cpp

DataManagement/

mitkImage.cpp

Interactions/

StateMachine.xml

mitkMouseModeSwitcher.cpp

Testing/

mitkImageTest.cpp

Documentation/

Doxygen/

DeveloperManual/

SupportedPlatforms.md

Modules/

QmitkExt/

QmitkAdaptiveRegionGrowingWidget.cpp

QmitkAdaptiveRegionGrowingWidget.h

Segmentation/

Interactions/

mitkPaintbrushTool.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.application/

resources/

StateMachine.xml

O1: MITK Reviewer Group I

org.mitk.gui.qt.segmentation/

src/

internal/

regiongrowing/

QmitkRegionGrowingView.cpp

O1: MITK Reviewer Group I

QmitkRegionGrowingView.h

O1: MITK Reviewer Group I

rMITKfd36ce7d9004

View Options

BlueBerry/CMakeLists.txt

View Options

CMake/MITKDashboardSetup.cmake

View Options

Core/Code/CppMicroServices/src/service/usServiceRegistration.cpp

View Options

Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp

View Options

Core/Code/CppMicroServices/test/usServiceRegistryTest.cpp

View Options

Core/Code/DataManagement/mitkImage.cpp

View Options

Core/Code/Interactions/StateMachine.xml

View Options

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

View Options

Core/Code/Testing/mitkImageTest.cpp

View Options

Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md

View Options

Modules/QmitkExt/QmitkAdaptiveRegionGrowingWidget.cpp

View Options

Modules/QmitkExt/QmitkAdaptiveRegionGrowingWidget.h

View Options

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h

Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947…fd36ce7d9004Actions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITKfd36ce7d9004

BlueBerry/CMakeLists.txt

CMake/MITKDashboardSetup.cmake

Core/Code/CppMicroServices/src/service/usServiceRegistration.cpp

Core/Code/CppMicroServices/src/service/usServiceRegistry.cpp

Core/Code/CppMicroServices/test/usServiceRegistryTest.cpp

Core/Code/DataManagement/mitkImage.cpp

Core/Code/Interactions/StateMachine.xml

Core/Code/Interactions/mitkMouseModeSwitcher.cpp

Core/Code/Testing/mitkImageTest.cpp

Documentation/Doxygen/DeveloperManual/SupportedPlatforms.md

Modules/QmitkExt/QmitkAdaptiveRegionGrowingWidget.cpp

Modules/QmitkExt/QmitkAdaptiveRegionGrowingWidget.h

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

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

Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h

Merge branch 'bug-11075-micro-services-bug-fixes' into bug-11947…
fd36ce7d9004
Actions