Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595…
2c883922fdc5
Actions

Description

Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595-NavigationModules-2016-11

Conflicts:
Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Details

Provenance

• groehl	Authored on Jun 28 2017, 4:49 PM
• groehl	Pushed on Jun 28 2017, 4:49 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK795b52b44abe: implemented logging of IGTL messages
rMITKba1a024732fd: Merge branch 'T22999-AutoDetectionOpenIGTLink' into T22595-NavigationModules…

Branches

Tags

Event Timeline

• groehl committed rMITK2c883922fdc5: Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595… (authored by • groehl).Jun 28 2017, 4:49 PM

Merged Changes

795b52b44abe implemented logging of IGTL messages
Author
• groehl
Browse Repository
No Builds
No Audits
2f997099915a wrapped message bases in mitk IGTL message
Author
• groehl
Browse Repository
No Builds
No Audits
820f177e8803 included button to log messages
Author
• groehl
Browse Repository
No Builds
No Audits

Changes (21)

Path

Size

Modules/

IGT/

TrackingDevices/

mitkOpenIGTLinkTrackingDevice.cpp

OpenIGTLink/

DeviceSources/

mitkIGTL2DImageDeviceSource.cpp

mitkIGTLTransformDeviceSource.cpp

Filters/

mitkImageToIGTLMessageFilter.cpp

Testing/

mitkOpenIGTLinkClientServerTest.cpp

mitkIGTLMessageProvider.cpp

mitkIGTLMessageProvider.h

mitkIGTLMessageQueue.cpp

mitkIGTLMessageQueue.h

mitkIGTLServer.cpp

OpenIGTLinkUI/

Qmitk/

QmitkIGTLDeviceCommandWidget.cpp

QmitkIGTLDeviceSourceManagementWidget.cpp

Plugins/

org.mitk.gui.qt.igtexamples/

src/

internal/

OpenIGTLinkExample.cpp

org.mitk.gui.qt.openigtlink/

src/

internal/

OpenIGTLinkManager.cpp

OpenIGTLinkManager.h

OpenIGTLinkManagerControls.ui

rMITK2c883922fdc5

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

View Options

Modules/OpenIGTLink/DeviceSources/mitkIGTL2DImageDeviceSource.cpp

View Options

Modules/OpenIGTLink/DeviceSources/mitkIGTLTransformDeviceSource.cpp

View Options

Modules/OpenIGTLink/Filters/mitkImageToIGTLMessageFilter.cpp

View Options

Modules/OpenIGTLink/Testing/mitkOpenIGTLinkClientServerTest.cpp

View Options

Modules/OpenIGTLink/mitkIGTLClient.cpp

View Options

Modules/OpenIGTLink/mitkIGTLDevice.cpp

View Options

Modules/OpenIGTLink/mitkIGTLDevice.h

View Options

Modules/OpenIGTLink/mitkIGTLMessage.cpp

View Options

Modules/OpenIGTLink/mitkIGTLMessage.h

View Options

Modules/OpenIGTLink/mitkIGTLMessageProvider.cpp

View Options

Modules/OpenIGTLink/mitkIGTLMessageProvider.h

View Options

Modules/OpenIGTLink/mitkIGTLMessageQueue.cpp

View Options

Modules/OpenIGTLink/mitkIGTLMessageQueue.h

View Options

Modules/OpenIGTLink/mitkIGTLServer.cpp

View Options

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceCommandWidget.cpp

View Options

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSourceManagementWidget.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.cpp

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.h

View Options

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManagerControls.ui

Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595…2c883922fdc5Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rMITK2c883922fdc5

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Modules/OpenIGTLink/DeviceSources/mitkIGTL2DImageDeviceSource.cpp

Modules/OpenIGTLink/DeviceSources/mitkIGTLTransformDeviceSource.cpp

Modules/OpenIGTLink/Filters/mitkImageToIGTLMessageFilter.cpp

Modules/OpenIGTLink/Testing/mitkOpenIGTLinkClientServerTest.cpp

Modules/OpenIGTLink/mitkIGTLClient.cpp

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Modules/OpenIGTLink/mitkIGTLDevice.h

Modules/OpenIGTLink/mitkIGTLMessage.cpp

Modules/OpenIGTLink/mitkIGTLMessage.h

Modules/OpenIGTLink/mitkIGTLMessageProvider.cpp

Modules/OpenIGTLink/mitkIGTLMessageProvider.h

Modules/OpenIGTLink/mitkIGTLMessageQueue.cpp

Modules/OpenIGTLink/mitkIGTLMessageQueue.h

Modules/OpenIGTLink/mitkIGTLServer.cpp

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceCommandWidget.cpp

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSourceManagementWidget.cpp

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

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.cpp

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManager.h

Plugins/org.mitk.gui.qt.openigtlink/src/internal/OpenIGTLinkManagerControls.ui

Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595…
2c883922fdc5
Actions