Diffusion MITK 315593f3c570

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11'…
315593f3c570
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11' into T22595-MasterIntegration-2017-07-07

Conflicts:
Modules/IGT/IO/mitkNavigationDataRecorder.cpp
Modules/IGTBase/include/mitkNavigationData.h
Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp
Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp
Modules/IGTUI/Qmitk/QmitkNDIConfigurationWidget.cpp
Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp
Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp
Modules/OpenIGTLink/mitkIGTLMessageProvider.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Details

Provenance

franza	Authored on Jul 7 2017, 9:54 AM
franza	Pushed on Jul 7 2017, 9:55 AM

Differential Revision

Restricted Differential Revision

Parents

rMITKa6932dfb2571: Merge remote-tracking branch 'remotes/origin/T22595-MasterIntegration-2017-06…
rMITKc7568788dfe8: Merge branch 'T23009-ProblemBuffering' into T22595-NavigationModules-2016-11

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK315593f3c570: Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016-11'… (authored by franza).Jul 7 2017, 9:54 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

c7568788dfe8 Merge branch 'T23009-ProblemBuffering' into T22595-NavigationModules-2016-11
Author
franza
Browse Repository
No Builds
No Audits
0a790c072000 fixed a problem with the "InfiniteBufferingMode"
Author
franza
Browse Repository
No Builds
No Audits
f80b8546e6ad Changed tracking to invald when position 0.0,0.0,0.0 is present for Polhemus…
Author
• house
Browse Repository
No Builds
No Audits
69f2e0272251 Fixed crash when using autodetect on Polhemus when no tools are present in…
Author
• house
Browse Repository
No Builds
No Audits
2a9537589519 Intialized continous tracking to false to allow for auto detection in debug mode
Author
• house
Browse Repository
No Builds
No Audits
c3cc22e50930 possible fix for tool naming
Author
• groehl
Browse Repository
No Builds
No Audits
ec60a264f3fa added time to wait for OpenIGTLink stream to start
Author
franza
Browse Repository
No Builds
No Audits
e3bb3fdff2a0 fixed naming of OpenIGTLink messages
Author
franza
Browse Repository
No Builds
No Audits
29704d5a917e Merge remote-tracking branch 'remotes/origin/T23009-OpenIGTLinkOneToolBuggy'…
Author
franza
Browse Repository
No Builds
No Audits
8dd9bfff1525 Removed CreateOutputsForAllInputs because it caused a buggy behavior
Author
franza
Browse Repository
No Builds
No Audits
88129af784f9 automagically retrieve tool name from igtl message.
Author
• groehl
Browse Repository
No Builds
No Audits
b8092c70d9c3 fix timestamp issue
Author
• groehl
Browse Repository
No Builds
No Audits
f1b7743c12e9 Merge branch 'T23018-TimestampIsBuggy' into T22595-NavigationModules-2016-11
Author
franza
Browse Repository
No Builds
No Audits
94cbf89ef257 Merge remote-tracking branch 'remotes/origin/T23018-TimestampIsBuggy' into…
Author
franza
Browse Repository
No Builds
No Audits
6d5e71509ecb Fixed timestamp for images (was not set before)
Author
franza
Browse Repository
No Builds
No Audits
b2eefc888c10 Fixed timestamp at least for tracking OpenIGTLink messages
Author
franza
Browse Repository
No Builds
No Audits
f8a6563cd529 Merge remote-tracking branch 'remotes/origin/T23014-FixMicronTracker' into…
Author
franza
Browse Repository
No Builds
No Audits
277a23ae30f8 fixed MT by using the temp directory from IOUtil
Author
franza
Browse Repository
No Builds
No Audits
eabe52394190 trackers are only loaded if SDK is available
Author
franza
Browse Repository
No Builds
No Audits
6ff78f03d94e Merge remote-tracking branch 'remotes/origin/T22998-TrackersEnabledCmake' into…
Author
franza
Browse Repository
No Builds
No Audits
64dec0144c3a fix merge compile issue. Tested this with images.
Author
• groehl
Browse Repository
No Builds
No Audits
2c883922fdc5 Merge branch 'T22595-NavigationModules-oigtl-groehl' into T22595…
Author
• groehl
Browse Repository
No Builds
No Audits
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
ba1a024732fd Merge branch 'T22999-AutoDetectionOpenIGTLink' into T22595-NavigationModules…
Author
franza
Browse Repository
No Builds
No Audits
bb8d5856d05d Made output mode selectable for the user
Author
franza
Browse Repository
No Builds
No Audits
d18f728a61a5 adapted AutoDetection to the current methods for handling TDATA and QTDATA…
Author
franza
Browse Repository
No Builds
No Audits
138719374c0c cleaned up ... AutoDetection seems to work at least for TRANSFORM messages now
Author
franza
Browse Repository
No Builds
No Audits
5868801e94ab Cleaned up. AutoDetection works at least for TRANSFORM messages now.
Author
franza
Browse Repository
No Builds
No Audits
133367148f66 now connecting to 2 tools is possible ... code clean up required!
Author
franza
Browse Repository
No Builds
No Audits
c36087a8cb2b first implementation of autodetection: works for one tool with PLUS server...
Author
franza
Browse Repository
No Builds
No Audits
f5ac0390c54f added method for auto detection
Author
franza
Browse Repository
No Builds
No Audits
02263b0dd565 first tab is shown by default again
Author
franza
Browse Repository
No Builds
No Audits
b99bfd9eb483 removed a warning message (see T17713, was outdated...)
Author
franza
Browse Repository
No Builds
No Audits
aff00594726e Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11
Author
• house
Browse Repository
No Builds
No Audits
6fa637216a63 changed return type og setToolAxisMarkerPlacement to null
Author
• house
Browse Repository
No Builds
No Audits
84d967deaa54 Signed-off-by: Rachael House <r.house@dkfz-heidelberg.de> added feature to set…
Author
• house
Browse Repository
No Builds
No Audits
48845150fd73 Merge branch 'T19825-PullRequestIntegration' into T22595-NavigationModules-2016…
Author
eisenman
Browse Repository
No Builds
No Audits
705334cf20b7 clean-up
Author
eisenman
Browse Repository
No Builds
No Audits
5a56d2c20877 Merge remote-tracking branch 'maleike/T19825-trackingvolumegenerator…
Author
eisenman
Browse Repository
No Builds
No Audits
f23a5ef337e2 small fix: moved tracking tab to the front
Author
franza
Browse Repository
No Builds
No Audits
9ad1b9969d13 fixed a bug which caused doubled file extensions when saving IGT navigation…
Author
franza
Browse Repository
No Builds
No Audits
f3f27ea9d655 Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11
Author
franza
Browse Repository
No Builds
No Audits
6f6712b29a81 COMP: added code which was lost at some place and caused a compiler error
Author
franza
Browse Repository
No Builds
No Audits
93e37a323fcc Merge branch 'T19559-PullRequestIntegration' into T22595-NavigationModules-2016…
Author
eisenman
Browse Repository
No Builds
No Audits
833f9e8e502a add check box for skipping invalid data during logging
Author
eisenman
Browse Repository
No Builds
No Audits
285f0ebbf133 fix compiler error under Linux
Author
eisenman
Browse Repository
No Builds
No Audits
61f1f33383ae Merge remote-tracking branch 'remotes/origin/bug-18971-saveIGTFiledialogPath'…
Author
franza
Browse Repository
No Builds
No Audits
b64b2066ea76 Merge remote-tracking branch 'm4271n/bug-19559…
Author
eisenman
Browse Repository
No Builds
No Audits

Changes (60)

Path

Size

Modules/

IGT/

Algorithms/

mitkIGTLMessageToNavigationDataFilter.cpp

mitkNavigationDataToIGTLMessageFilter.cpp

mitkNavigationDataToIGTLMessageFilter.h

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

IO/

mitkNavigationDataRecorder.cpp

mitkNavigationDataRecorder.h

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

MITKIGTHardware.cmake

TrackingDevices/

mitkClaronTrackingDevice.cpp

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTrackingDevice.h

mitkPolhemusInterface.cpp

mitkTrackingVolumeGenerator.cpp

autoload/

DeviceRegistry/

src/

mitkIGTActivator.cpp

mitkIGTConfig.h.in

IGTBase/

include/

mitkNavigationData.h

src/

mitkNavigationData.cpp

IGTUI/

Qmitk/

QmitkIGTCommonHelper.cpp

QmitkIGTCommonHelper.h

QmitkIGTConnectionWidget.cpp

QmitkIGTPlayerWidget.cpp

QmitkMicronTrackerWidget.cpp

QmitkNDIConfigurationWidget.cpp

QmitkNPOptitrackWidget.cpp

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

OpenIGTLink/

DeviceSources/

mitkIGTL2DImageDeviceSource.cpp

mitkIGTLTransformDeviceSource.cpp

Filters/

mitkImageToIGTLMessageFilter.cpp

Testing/

mitkOpenIGTLinkClientServerTest.cpp

mitkIGTLClient.cpp

mitkIGTLDevice.cpp

mitkIGTLDevice.h

mitkIGTLMessage.cpp

mitkIGTLMessage.h

mitkIGTLMessageProvider.cpp

mitkIGTLMessageProvider.h

mitkIGTLMessageQueue.cpp

mitkIGTLMessageQueue.h

mitkIGTLServer.cpp

OpenIGTLinkUI/

Qmitk/

QmitkIGTLDeviceCommandWidget.cpp

QmitkIGTLDeviceSetupConnectionWidget.cpp

QmitkIGTLDeviceSourceManagementWidget.cpp

US/

USNavigation/

Filter/

mitkNeedleProjectionFilter.cpp

mitkNeedleProjectionFilter.h

Plugins/

org.mitk.gui.qt.igt.app.echotrack/

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.h

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

org.mitk.gui.qt.igtexamples/

src/

internal/

OpenIGTLinkExample.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

IGTNavigationToolCalibration.cpp

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxViewControls.ui

org.mitk.gui.qt.openigtlink/

src/

internal/

OpenIGTLinkManager.cpp

OpenIGTLinkManager.h

OpenIGTLinkManagerControls.ui

rMITK315593f3c570

Modules/IGT/Algorithms/mitkIGTLMessageToNavigationDataFilter.cpp

Loading...

Modules/IGT/Algorithms/mitkNavigationDataToIGTLMessageFilter.cpp

Loading...

Modules/IGT/Algorithms/mitkNavigationDataToIGTLMessageFilter.h

Loading...

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Loading...

Modules/IGT/DataManagement/mitkNavigationTool.h

Loading...

Modules/IGT/IO/mitkNavigationDataRecorder.cpp

Loading...

Modules/IGT/IO/mitkNavigationDataRecorder.h

Loading...

Modules/IGT/IO/mitkNavigationToolReader.cpp

Loading...

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Loading...

Modules/IGT/MITKIGTHardware.cmake

Loading...

Modules/IGT/TrackingDevices/mitkClaronTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Loading...

Modules/IGT/TrackingDevices/mitkTrackingVolumeGenerator.cpp

Loading...

Modules/IGT/autoload/DeviceRegistry/src/mitkIGTActivator.cpp

Loading...

Modules/IGT/mitkIGTConfig.h.in

Loading...

Modules/IGTBase/include/mitkNavigationData.h

Loading...

Modules/IGTBase/src/mitkNavigationData.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.h

Loading...

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNDIConfigurationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Loading...

Modules/IGTUI/files.cmake

Loading...

Modules/OpenIGTLink/DeviceSources/mitkIGTL2DImageDeviceSource.cpp

Loading...

Modules/OpenIGTLink/DeviceSources/mitkIGTLTransformDeviceSource.cpp

Loading...

Modules/OpenIGTLink/Filters/mitkImageToIGTLMessageFilter.cpp

Loading...

Modules/OpenIGTLink/Testing/mitkOpenIGTLinkClientServerTest.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLClient.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLDevice.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLDevice.h

Loading...

Modules/OpenIGTLink/mitkIGTLMessage.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLMessage.h

Loading...

Modules/OpenIGTLink/mitkIGTLMessageProvider.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLMessageProvider.h

Loading...

Modules/OpenIGTLink/mitkIGTLMessageQueue.cpp

Loading...

Modules/OpenIGTLink/mitkIGTLMessageQueue.h

Loading...

Modules/OpenIGTLink/mitkIGTLServer.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceCommandWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSetupConnectionWidget.cpp

Loading...

Modules/OpenIGTLinkUI/Qmitk/QmitkIGTLDeviceSourceManagementWidget.cpp

Loading...

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.cpp

Loading...

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.h

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.h

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...