Diffusion MITK 7fd986836ae7

Merge branch 'bug-18713…
7fd986836ae7
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevicesFixesFromMartin' into bug-18998-NewNavigationModuleFeatures

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

Details

Provenance

Authored on Apr 16 2015, 10:39 AM

Parents

rMITK4269ce4f191a: removed trailing whitespaces
rMITKaaf6b52dca55: Merge branch 'bug-18830-DocumentationUpdate'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK7fd986836ae7: Merge branch 'bug-18713… (authored by franza).Apr 16 2015, 10:39 AM

Merged Changes

4269ce4f191a removed trailing whitespaces
Author
franza
Browse Repository
No Builds
No Audits
d48ec3c2ea4b Added a spinbox to the igt example to change the visualization update rate
Author
klemmma
Browse Repository
No Builds
No Audits
3ac653412089 Added two new checkboxes to turn on/off: outgoing message buffering, incoming…
Author
klemmma
Browse Repository
No Builds
No Audits
6afaee042dee Bugfix: WB crashed when you closed the OIGTLManager, added a check for null and…
Author
klemmma
Browse Repository
No Builds
No Audits
74999afa7ff4 Increased discover time to 10second because 2 was not enough Set the framerate…
Author
klemmma
Browse Repository
No Builds
No Audits
357d6abe82e6 The navigation data player stops playing when the plugin is closed
Author
klemmma
Browse Repository
No Builds
No Audits
d352b4820313 MITK Observer Callback methods are not calling GUI elements directly, instead…
Author
franza
Browse Repository
No Builds
No Audits
426497098c3e Finished UI integration of OpenIGTLinkTrackingDevice
Author
franza
Browse Repository
No Builds
No Audits
5ae72442981e Adapted tool management to Open IGT Link devices
Author
franza
Browse Repository
No Builds
No Audits
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

Changes (38)

Path

Size

Modules/

IGT/

Algorithms/

mitkNavigationDataToIGTLMessageFilter.cpp

Common/

mitkTrackingTypes.h

DataManagement/

mitkTrackingDeviceSourceConfigurator.cpp

mitkTrackingDeviceSourceConfigurator.h

Testing/

mitkOpenIGTLinkTrackingDeviceTest.cpp

TrackingDevices/

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTrackingDevice.h

mitkOpenIGTLinkTrackingTool.h

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


	mitkOperation.cpp

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidgetControls.ui

OpenIGTLink/

mitkIGTLDevice.cpp

mitkIGTLDevice.h

mitkIGTLMessageProvider.cpp

mitkIGTLMessageSource.cpp

mitkIGTLServer.cpp

OpenIGTLinkUI/

Qmitk/

QmitkIGTLDeviceCommandWidget.cpp

QmitkIGTLDeviceCommandWidget.h

QmitkIGTLDeviceSetupConnectionWidget.cpp

QmitkIGTLDeviceSetupConnectionWidget.h

QmitkIGTLDeviceSetupConnectionWidgetControls.ui

QmitkIGTLDeviceSourceManagementWidget.cpp

QmitkIGTLDeviceSourceManagementWidget.h

QmitkIGTLStreamingManagementWidget.cpp

QmitkIGTLStreamingManagementWidget.h

Plugins/

org.mitk.gui.qt.igtlplugin/

src/

internal/

OpenIGTLinkExample.cpp

OpenIGTLinkExample.h

OpenIGTLinkExampleControls.ui

OpenIGTLinkProviderExample.cpp

OpenIGTLinkProviderExample.h

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITK7fd986836ae7

Modules/IGT/Algorithms/mitkNavigationDataToIGTLMessageFilter.cpp

Loading...

Modules/IGT/Common/mitkTrackingTypes.h

Loading...

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

Loading...

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.h

Loading...

Modules/IGT/Testing/files.cmake

Loading...

Modules/IGT/Testing/mitkOpenIGTLinkTrackingDeviceTest.cpp

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.cpp

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingTool.h

Loading...

Modules/IGT/files.cmake

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Loading...

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLDevice.h

Loading...

Modules/OpenIGTLink/mitkIGTLMessageProvider.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLMessageSource.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLServer.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceCommandWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceCommandWidget.h

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.h

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidgetControls.ui

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSourceManagementWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSourceManagementWidget.h

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLStreamingManagementWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLStreamingManagementWidget.h

Loading...

Plugins/org.mitk.gui.qt.igtlplugin/src/internal/OpenIGTLinkExample.cpp

Loading...

Plugins/org.mitk.gui.qt.igtlplugin/src/internal/OpenIGTLinkExample.h

Loading...

Plugins/org.mitk.gui.qt.igtlplugin/src/internal/OpenIGTLinkExampleControls.ui

Loading...

Plugins/org.mitk.gui.qt.igtlplugin/src/internal/OpenIGTLinkProviderExample.cpp

Loading...

Plugins/org.mitk.gui.qt.igtlplugin/src/internal/OpenIGTLinkProviderExample.h

Loading...

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

Loading...

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

Loading...

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

Loading...