Merge branch 'T23699-RemoveNeedleAxisFromNavigationTool'
4a2deaa93dbb
Actions

Description

Merge branch 'T23699-RemoveNeedleAxisFromNavigationTool'

Conflicts:
Modules/IGT/DataManagement/mitkNavigationTool.cpp

Details

Provenance

seitela	Authored on Feb 20 2018, 5:23 PM
seitela	Pushed on Feb 20 2018, 5:37 PM

Parents

rMITKef5d591313c7: Modified test to test for ToolTip and Axis
rMITKa7df63aaa18a: Merge branch 'T23728-integration-2018-02-20'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK4a2deaa93dbb: Merge branch 'T23699-RemoveNeedleAxisFromNavigationTool' (authored by seitela).Feb 20 2018, 5:23 PM

Merged Changes

ef5d591313c7 Modified test to test for ToolTip and Axis
Author
seitela
Browse Repository
No Builds
No Audits
08cbf48b70d2 Fixed type mismatch
Author
seitela
Browse Repository
No Builds
No Audits
bf4a84e25480 Renamed ToolTip->ToolTipPosition and ToolTipOrientation->ToolAxisOrientation
Author
seitela
Browse Repository
No Builds
No Audits
c86c0580f962 correctly output tool information
Author
seitela
Browse Repository
No Builds
No Audits
09c825b699db Remove commented code
Author
seitela
Browse Repository
No Builds
No Audits
85ff074235ae Update tracking tool with calculated ToolAxisOrientation
Author
seitela
Browse Repository
No Builds
No Audits
34c4dc3bf3de Added documentation to explain the coordinate transforms associated with the…
Author
seitela
Browse Repository
No Builds
No Audits
25efb13e21b7 Renamed ToolAxisTransform -> ToolAxisOrientation
Author
seitela
Browse Repository
No Builds
No Audits
7939507a3732 Renamed ToolTipRotation -> ToolAxisTransform
Author
seitela
Browse Repository
No Builds
No Audits
1941d3a5a13e Renamed ToolTip -> ToolTipPosition
Author
seitela
Browse Repository
No Builds
No Audits
a95a1c1f3718 Removed member m_ToolAxis from mitk::NavigationTool and replaced it with a more…
Author
seitela
Browse Repository
No Builds
No Audits
7a0c6d5c65e4 Use correct type in for loop
Author
seitela
Browse Repository
No Builds
No Audits

Changes (22)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

Documentation/

doxygen/

TrackingTool.png

IO/

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

Testing/

mitkNavigationToolStorageSerializerAndDeserializerIntegrationTest.cpp

mitkNavigationToolTest.cpp

mitkPolhemusTrackingDeviceHardwareTest.cpp

mitkTrackingToolTest.cpp

TestingHelper/

mitkNavigationToolStorageTestHelper.cpp

TrackingDevices/

mitkMicronTrackerTypeInformation.cpp

mitkNDIAuroraTypeInformation.cpp

mitkNDIPolarisTypeInformation.cpp

mitkNPOptitrackTrackingTypeInformation.cpp

mitkPolhemusInterface.cpp

mitkPolhemusTrackerTypeInformation.cpp

mitkPolhemusTrackingDevice.cpp

mitkTrackingTool.cpp

mitkTrackingTool.h

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkPolhemusTrackerWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkIGTNavigationToolCalibration.cpp

rMITK4a2deaa93dbb

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.h

View Options

Modules/IGT/Documentation/doxygen/TrackingTool.png

View Options

Modules/IGT/IO/mitkNavigationToolReader.cpp

View Options

Modules/IGT/IO/mitkNavigationToolWriter.cpp

View Options

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerIntegrationTest.cpp

View Options

Modules/IGT/Testing/mitkNavigationToolTest.cpp

View Options

Modules/IGT/Testing/mitkPolhemusTrackingDeviceHardwareTest.cpp

View Options

Modules/IGT/Testing/mitkTrackingToolTest.cpp

View Options

Modules/IGT/TestingHelper/mitkNavigationToolStorageTestHelper.cpp

View Options

Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkTrackingTool.cpp

View Options

Modules/IGT/TrackingDevices/mitkTrackingTool.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

View Options

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

Merge branch 'T23699-RemoveNeedleAxisFromNavigationTool'4a2deaa93dbbActions

Description

Details

Event Timeline

Merged Changes

Changes (22)

rMITK4a2deaa93dbb

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkNavigationTool.h

Modules/IGT/Documentation/doxygen/TrackingTool.png

Modules/IGT/IO/mitkNavigationToolReader.cpp

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerIntegrationTest.cpp

Modules/IGT/Testing/mitkNavigationToolTest.cpp

Modules/IGT/Testing/mitkPolhemusTrackingDeviceHardwareTest.cpp

Modules/IGT/Testing/mitkTrackingToolTest.cpp

Modules/IGT/TestingHelper/mitkNavigationToolStorageTestHelper.cpp

Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkTrackingTool.cpp

Modules/IGT/TrackingDevices/mitkTrackingTool.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

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

Merge branch 'T23699-RemoveNeedleAxisFromNavigationTool'
4a2deaa93dbb
Actions