Diffusion MITK 1c0af0e58431

Merge branch 'bug-18998-NewNavigationModuleFeatures' into bug-18998…
1c0af0e58431
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-18998-NewNavigationModuleFeatures' into bug-18998-NewNavigationModuleFeaturesV2

Conflicts:
Modules/OpenIGTLink/mitkIGTLDevice.cpp

Details

Provenance

Authored on May 19 2015, 3:25 PM

Parents

rMITKdfa396f975e9: Merge branch 'bug-19065-NavigationToolCalibrationView' into bug-18998…
rMITK404aadc75fcd: Merge branch 'bug-19081-mac-osx-installer-crash'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK1c0af0e58431: Merge branch 'bug-18998-NewNavigationModuleFeatures' into bug-18998… (authored by franza).May 19 2015, 3:25 PM

Merged Changes

dfa396f975e9 Merge branch 'bug-19065-NavigationToolCalibrationView' into bug-18998…
Author
franza
Browse Repository
No Builds
No Audits
a8650fb5dcb6 moved navigation tool calibration to open source
Author
franza
Browse Repository
No Builds
No Audits
fa37ac056115 some fixes ... added chrono sleep_for for Linux/cross-platform support
Author
• kirchnth
Browse Repository
No Builds
No Audits
fb5521eac00a Merge branch 'bug-18903-USPluginSpeedUp' into bug-18998…
Author
franza
Browse Repository
No Builds
No Audits
0943298b2d18 fixed some UI merge problems...
Author
franza
Browse Repository
No Builds
No Audits
6025e76b2af8 fixed header includes, export macros and some compiler errors
Author
franza
Browse Repository
No Builds
No Audits
491a3f3fa31e Merge branch 'bug-14434-OrderOfNavigationTools' into bug-18998…
Author
franza
Browse Repository
No Builds
No Audits
c29c979adcc9 Merge branch 'bug-18293-IGTHelperClass' into bug-18998…
Author
franza
Browse Repository
No Builds
No Audits
5e06eb29e979 Merge branch 'bug-18713-Integration2015-03-12' into bug-18998…
Author
franza
Browse Repository
No Builds
No Audits
7fd986836ae7 Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevicesFixesFromMartin'…
Author
franza
Browse Repository
No Builds
No Audits
4269ce4f191a removed trailing whitespaces
Author
franza
Browse Repository
No Builds
No Audits
a4b02c5f34e9 Implemented the moving the tools up and down in the tool storage.
Author
franza
Browse Repository
No Builds
No Audits
3d9cf3a61552 added persistence for new UI settings
Author
franza
Browse Repository
No Builds
No Audits
d15c67aac329 UI implementation of new timers is finished now
Author
franza
Browse Repository
No Builds
No Audits
43899b14652e started UI integration of new timers
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
493cf257cf84 Split timers for 3D and 2D rendering, so the 2D rendering is not slowed down by…
Author
franza
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
dc5dc1925eb3 adapted export macros
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
ee061860c0ce Merge branch 'bug-18713-UIsupportForOpenIGTLinkTrackingDevices'
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
c5cd9db6d703 added class for static IGT helper methods
Author
franza
Browse Repository
No Builds
No Audits

Changes (58)

Path

Size

Modules/

IGT/

Algorithms/

mitkNavigationDataToIGTLMessageFilter.cpp

Common/

mitkTrackingTypes.h

DataManagement/

mitkTrackingDeviceSourceConfigurator.cpp

mitkTrackingDeviceSourceConfigurator.h

Testing/

mitkOpenIGTLinkTrackingDeviceTest.cpp

TrackingDevices/

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTrackingDevice.h

mitkOpenIGTLinkTrackingTool.cpp

mitkOpenIGTLinkTrackingTool.h

IGTBase/

mitkQuaternionAveraging.cpp

mitkQuaternionAveraging.h

mitkStaticIGTHelperFunctions.cpp

mitkStaticIGTHelperFunctions.h

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkNavigationToolManagementWidget.h

QmitkNavigationToolManagementWidgetControls.ui

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/

resources/

Description.jpg

Description.svg

IGTNavigationToolCalibration.qrc

iconNavigationToolCalibration.xpm

src/

internal/

IGTNavigationToolCalibration.cpp

IGTNavigationToolCalibration.h

IGTNavigationToolCalibrationControls.ui

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

mitkPluginActivator.cpp

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

rMITK1c0af0e58431

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/IGTBase/files.cmake

Loading...

Modules/IGTBase/mitkQuaternionAveraging.cpp

Loading...

Modules/IGTBase/mitkQuaternionAveraging.h

Loading...

Modules/IGTBase/mitkStaticIGTHelperFunctions.cpp

Loading...

Modules/IGTBase/mitkStaticIGTHelperFunctions.h

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidgetControls.ui

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/files.cmake

Loading...

Plugins/org.mitk.gui.qt.igttracking/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.igttracking/resources/Description.jpg

Loading...

Plugins/org.mitk.gui.qt.igttracking/resources/Description.svg

Loading...

Plugins/org.mitk.gui.qt.igttracking/resources/IGTNavigationToolCalibration.qrc

Loading...

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

Loading...

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

Loading...

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

Loading...

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

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

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

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

Loading...