Diffusion MITK ee061860c0ce

Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevices'
ee061860c0ce
Actions

Description

Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevices'

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

Details

Provenance

franza

Authored on Mar 12 2015, 3:24 PM

Parents

rMITK20bc1ceffda6: implemented Open IGT Link server for Tracking Toolbox
rMITK4118f23da75d: Merge branch 'bug-18835-secondDeactivation'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKee061860c0ce: Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevices' (authored by franza).Mar 12 2015, 3:24 PM

Merged Changes

20bc1ceffda6 implemented Open IGT Link server for Tracking Toolbox
Author
franza
Browse Repository
No Builds
No Audits
21c7edf44760 finished implementation of OpenIGTLinkTrackingDevice, seems to work
Author
franza
Browse Repository
No Builds
No Audits
8c6e5ec4a941 implementation nearly finished
Author
franza
Browse Repository
No Builds
No Audits
38776758d0a1 implemented tracking device update
Author
franza
Browse Repository
No Builds
No Audits
5f914d7e9ea1 DiscoverTools methods is working now
Author
franza
Browse Repository
No Builds
No Audits
c42c57c33a4d implemented DiscoverTools() method and extended test
Author
franza
Browse Repository
No Builds
No Audits
f921ce91cc44 further implementation...
Author
franza
Browse Repository
No Builds
No Audits
01827cc6f022 further implementation, not finished yet
Author
franza
Browse Repository
No Builds
No Audits
4f49b2fd72a5 added test for OpenIGTLink tracking device
Author
franza
Browse Repository
No Builds
No Audits
6025758498c2 further implementation of OpenIGTLink tracking device
Author
franza
Browse Repository
No Builds
No Audits
f1d7d12790fe Created empty classes for OpenIGTLink tracking devices as wrapper for a open…
Author
franza
Browse Repository
No Builds
No Audits
a474c41f5adb Merge branch 'bug-18716-NavigationBuildConfigration' into bug-18713…
Author
franza
Browse Repository
No Builds
No Audits
0282c6bcbed5 Merge branch 'bug-18696-SeperatelySetRenderAndLoggingUpdateRate' into bug-18713…
Author
franza
Browse Repository
No Builds
No Audits
bd687d0d0b65 separated timers
Author
• kirchnth
Browse Repository
No Builds
No Audits
c4d163208277 added option to set Polaris Update Frame Rate in GUI…
Author
• kirchnth
Browse Repository
No Builds
No Audits
9bd7f7264313 added gui for seperate update rate ... also modified icons again
Author
• kirchnth
Browse Repository
No Builds
No Audits
ff8eda3b37ac improved (imho) icons
Author
• kirchnth
Browse Repository
No Builds
No Audits

Changes (18)

Path

Size

Modules/

IGT/

Common/

mitkTrackingTypes.h

DataManagement/

mitkNavigationDataSet.cpp

Testing/

files.cmake

mitkOpenIGTLinkTrackingDeviceTest.cpp

TrackingDevices/

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTrackingDevice.h

mitkOpenIGTLinkTrackingTool.h

files.cmake

	IGT/	TrackingDevices/	mitkOpenIGTLinkTrackingTool.cpp/
	Core/	src/	IO/


	mitkOperation.cpp

IGTUI/

Qmitk/

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidget.h

QmitkTrackingDeviceConfigurationWidgetControls.ui

OpenIGTLink/

mitkIGTLDevice.cpp

Plugins/

org.mitk.gui.qt.igttracking/

resources/

iconNavigationToolManager.xpm

iconTrackingToolBox.xpm

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITKee061860c0ce

View Options

Modules/IGT/Common/mitkTrackingTypes.h

View Options

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

View Options

Modules/IGT/Testing/files.cmake

View Options

Modules/IGT/Testing/mitkOpenIGTLinkTrackingDeviceTest.cpp

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.h

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.cpp

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.h

View Options

Modules/IGT/files.cmake

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

View Options

Modules/OpenIGTLink/mitkIGTLDevice.cpp

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm

View Options

Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm

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-18713-UIsupportForOpenIGTLinkTrackingDevices'ee061860c0ceActions

Description

Details

Event Timeline

Merged Changes

Changes (18)

rMITKee061860c0ce

Modules/IGT/Common/mitkTrackingTypes.h

Modules/IGT/DataManagement/mitkNavigationDataSet.cpp

Modules/IGT/Testing/files.cmake

Modules/IGT/Testing/mitkOpenIGTLinkTrackingDeviceTest.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.h

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.h

Modules/IGT/files.cmake

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm

Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm

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-18713-UIsupportForOpenIGTLinkTrackingDevices'
ee061860c0ce
Actions