Diffusion MITK 49e2ba20ec13

Merge branch 'bug-12649-EnableMicroserviceSupportForIGT'
49e2ba20ec13
Actions

Description

Merge branch 'bug-12649-EnableMicroserviceSupportForIGT'

Conflicts:
Modules/US/USModel/mitkUSDevice.cpp

Details

Provenance

maerz

Authored on Jul 26 2012, 3:20 PM

Parents

rMITK32250fd26f7a: Removed Trailing Whitespaces
rMITK0cd8c15f0080: Merge branch 'bug-12719-ProgressdialogAndIcons'

Branches

Unknown

Tags

Unknown

Event Timeline

maerz committed rMITK49e2ba20ec13: Merge branch 'bug-12649-EnableMicroserviceSupportForIGT' (authored by maerz).Jul 26 2012, 3:20 PM

Merged Changes

32250fd26f7a Removed Trailing Whitespaces
Author
maerz
Browse Repository
No Builds
No Audits
bffab39a46be Changed the ServiceListWidget to keep copies of the ServiceReferences, Removing…
Author
maerz
Browse Repository
No Builds
No Audits
93b73254372d ServcieListWidget now handles events way better than before, but removing…
Author
maerz
Browse Repository
No Builds
No Audits
b3e38b705225 ServiceListWidget now correctly emits events
Author
maerz
Browse Repository
No Builds
No Audits
27167314aec0 Fixed Constants for the ToolStorage
Author
maerz
Browse Repository
No Builds
No Audits
599d7a090410 Fixed constant declaration for NavDataSource
Author
maerz
Browse Repository
No Builds
No Audits
cca8c3130e05 Documentation
Author
maerz
Browse Repository
No Builds
No Audits
6b69c3ccbfea Interface name is now used if not string was supplied for NamingProperty
Author
maerz
Browse Repository
No Builds
No Audits
6cd8cc146f8a ServiceListWidget now has a member variable to allow use of serviceProperties…
Author
maerz
Browse Repository
No Builds
No Audits
099b0742cab4 Reintroduce header file deleted before. Made use of QMITK context to make…
Author
maerz
Browse Repository
No Builds
No Audits
4245b93be82e Remove wrongly capitalized header file
Author
maerz
Browse Repository
No Builds
No Audits
dafea7bd8cda Introducing the ServiceListenerWidget, that allows everyone to easily listen…
Author
maerz
Browse Repository
No Builds
No Audits
9ada971ed767 separated Connect() and StartTracking() for integration of microservices…
Author
franza
Browse Repository
No Builds
No Audits
74b0296743e8 removed StartTracking() from factory method, because it is not needed there
Author
franza
Browse Repository
No Builds
No Audits
a07f50a47a6e Fixed Missing Function call when registering ToolBoxes
Author
maerz
Browse Repository
No Builds
No Audits
944729d6fb5b * Introduced Microservices to IGT
Author
maerz
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Modules/

IGT/

IGTFilters/

mitkNavigationDataSource.cpp

mitkNavigationDataSource.h

mitkTrackingDeviceSourceConfigurator.cpp

IGTToolManagement/

mitkNavigationToolStorage.cpp

mitkNavigationToolStorage.h

Qmitk/

QmitkServiceListWidget.cpp

QmitkServiceListWidget.h

files.cmake

		Qmitk/
	USUI/	Qmitk/

	QmitkServiceListWidgetControls.ui
	QmitkUSDeviceListWidgetControls.ui

US/

USModel/

mitkUSDevice.cpp

USUI/

CMakeLists.txt

Qmitk/

QmitkUSDeviceManagerWidget.h

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITK49e2ba20ec13

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSource.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataSource.h

View Options

Modules/IGT/IGTFilters/mitkTrackingDeviceSourceConfigurator.cpp

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorage.cpp

View Options

Modules/IGT/IGTToolManagement/mitkNavigationToolStorage.h

View Options

Modules/Qmitk/QmitkServiceListWidget.cpp

View Options

Modules/Qmitk/QmitkServiceListWidget.h

View Options

Modules/Qmitk/QmitkServiceListWidgetControls.ui

View Options

Modules/Qmitk/files.cmake

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/USUI/CMakeLists.txt

View Options

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-12649-EnableMicroserviceSupportForIGT'49e2ba20ec13Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK49e2ba20ec13

Modules/IGT/IGTFilters/mitkNavigationDataSource.cpp

Modules/IGT/IGTFilters/mitkNavigationDataSource.h

Modules/IGT/IGTFilters/mitkTrackingDeviceSourceConfigurator.cpp

Modules/IGT/IGTToolManagement/mitkNavigationToolStorage.cpp

Modules/IGT/IGTToolManagement/mitkNavigationToolStorage.h

Modules/Qmitk/QmitkServiceListWidget.cpp

Modules/Qmitk/QmitkServiceListWidget.h

Modules/Qmitk/QmitkServiceListWidgetControls.ui

Modules/Qmitk/files.cmake

Modules/US/USModel/mitkUSDevice.cpp

Modules/USUI/CMakeLists.txt

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-12649-EnableMicroserviceSupportForIGT'
49e2ba20ec13
Actions