Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules…
41cb89524ab6
Actions

Description

Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules-2016.11.3-igt

Details

Provenance

• wildes	Authored on Oct 10 2017, 12:12 PM
• wildes	Pushed on Oct 10 2017, 3:01 PM

Parents

rMITK0c5c8b34e088: Exclude Polhemus from Build_Configuration ALL
rMITKea44e46bdfd0: Merge remote-tracking branch 'remotes/origin/T23101-NeedleAxisCalibration' into…

Branches

Tags

Event Timeline

• wildes committed rMITK41cb89524ab6: Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules… (authored by • wildes).Oct 10 2017, 12:12 PM

Merged Changes

0c5c8b34e088 Exclude Polhemus from Build_Configuration ALL
Author
• wildes
Browse Repository
No Builds
No Audits
3c98b1ea3589 Connect signal that tool storage changed to all tracking device widgets.
Author
• wildes
Browse Repository
No Builds
No Audits
0984a312835e Only terminate thread if it is really necessary.
Author
• wildes
Browse Repository
No Builds
No Audits
2e00a4cb1598 Catch TimeOut cases for AutoDetection. Termination and quitting of Qthread…
Author
• wildes
Browse Repository
No Builds
No Audits
3eb3b5b1197d Fix warnings in AutoDetect, when tool count doesn't match.
Author
• wildes
Browse Repository
No Builds
No Audits
221e826df9e7 Make GetFrame for Polhemus private. Causes random crashes when called from…
Author
• wildes
Browse Repository
No Builds
No Audits
b6e9aff187f4 Convenient function to get a frame from the Polhemus device. Must not be used…
Author
• wildes
Browse Repository
No Builds
No Audits
0ceb38ffac92 Add label to display HemisphereTracking status.
Author
• wildes
Browse Repository
No Builds
No Audits
d4a28e1bb55e Remove Get-function calls to Polhemus hardware and replace it by storing setted…
Author
• wildes
Browse Repository
No Builds
No Audits
15455cc7e962 Hide advanced settings in GUI for Polhemus.
Author
• wildes
Browse Repository
No Builds
No Audits
4f41a641d6f3 Reset Polhemus if ToolStorage changed.
Author
• wildes
Browse Repository
No Builds
No Audits
93a6c7f64cb3 Correct handling of changes in ToolStorage.
Author
• wildes
Browse Repository
No Builds
No Audits
02c36486d963 Remove resorting of tools in TrackingToolboxWorker.
Author
• wildes
Browse Repository
No Builds
No Audits
0331a7f78c92 Code format for better reading. White space changes only.
Author
• wildes
Browse Repository
No Builds
No Audits
efaae4d51f32 Remove ConstructTrackingDevice and replace by GetTrackingDevice.
Author
• wildes
Browse Repository
No Builds
No Audits
27c17cb37c9f Code formatting for better reading.
Author
• wildes
Browse Repository
No Builds
No Audits
9f55316c9534 Catch exception and handle it if connection cannot be established for Tracking…
Author
• wildes
Browse Repository
No Builds
No Audits
e8baceb8aacf Bugfix: Get a single frame after restart continuous tracking. First frame after…
Author
• wildes
Browse Repository
No Builds
No Audits
7a01fa94936a Connect Start/StopTrackingFinished Signal with PolhemusWidget. Rotate…
Author
• wildes
Browse Repository
No Builds
No Audits
b55f5f55c319 Added documentation for Polhemus tools.
Author
• wildes
Browse Repository
No Builds
No Audits
3eed76004fb5 Option to adjust hemisphere, if user places tools in defined hemisphere.
Author
• wildes
Browse Repository
No Builds
No Audits
281b8a5fac78 Add check if Polhemus ports (which have tools connected) matches the identifier…
Author
• wildes
Browse Repository
No Builds
No Audits
7310c3533557 Save port of tool as ember variable in PolhemusTool. Use it to select right…
Author
• wildes
Browse Repository
No Builds
No Audits
e49956e91672 Get correct ToolNames. Bugfix for "GetHemiTracing".
Author
• wildes
Browse Repository
No Builds
No Audits
043f95821503 Toggel, Enable/Disable Hemisphere ready.
Author
• wildes
Browse Repository
No Builds
No Audits
d4beff61b0f4 Set correct hemisphere when switching of hemisphere tracking.
Author
• wildes
Browse Repository
No Builds
No Audits
f73c80251ce4 Index for Polhemus Interface is identical with toolname, i.e. starts with 1 not…
Author
• wildes
Browse Repository
No Builds
No Audits
f25755a7a164 Set/Get Hemisphere. * Connect/Disconnected signal connected with widget *…
Author
• wildes
Browse Repository
No Builds
No Audits
74cc6d98e211 Sensor numbers start with one, but internal tool count starts with 0.
Author
• wildes
Browse Repository
No Builds
No Audits
1d9056735bd0 Window handle is not necessary and is not used. Parameter replaced by 0, works…
Author
• wildes
Browse Repository
No Builds
No Audits
1a4cf0a8a188 Toggle Hemisphere. Work in Progress.
Author
• wildes
Browse Repository
No Builds
No Audits
52d086dfb40b Introduce variable for return value to enable additional function calls before…
Author
• wildes
Browse Repository
No Builds
No Audits
f8dd814861cc Replace Get-Macro by Get-function for better debugging.
Author
• wildes
Browse Repository
No Builds
No Audits
cec2efb231af Add nullptr for ToolStorage in AutoDetect to avoid crashes in debug mode.
Author
• wildes
Browse Repository
No Builds
No Audits
a9365be95249 Only construct TrackingDevices if necessary!
Author
• wildes
Browse Repository
No Builds
No Audits
03d376d03288 Convenient Method to ge TrackingDevice name (e.g. for comparison)
Author
• wildes
Browse Repository
No Builds
No Audits
befa8f759b9f Remove NDI code from tracking toolbox.
Author
• wildes
Browse Repository
No Builds
No Audits
8545080436f3 Use correct name for autodetected tool storage.
Author
• wildes
Browse Repository
No Builds
No Audits
44fd46858519 Code cleanup.
Author
• wildes
Browse Repository
No Builds
No Audits
704ee9b24998 Propper disconnection of tracking device.
Author
• wildes
Browse Repository
No Builds
No Audits
b08a6903286b Separated QmitkMITKIGTTrackingToolboxView and…
Author
• wildes
Browse Repository
No Builds
No Audits
9933b058b3dd Correct warning text in PolhemusInterface::GetSingleFrame().
Author
• wildes
Browse Repository
No Builds
No Audits
b9d097a61db8 Avoid dublicate adding of tools.
Author
• wildes
Browse Repository
No Builds
No Audits
47cdaa2106ee Enable change of HemisphereTracking during tracking (buggy!)
Author
• wildes
Browse Repository
No Builds
No Audits
1a2a2b17fc42 Reset m_StopTracking in PolhemusTrackingDevide to false when tracking is…
Author
• wildes
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Packages

CMake/

BuildConfigurations/

All.cmake

O1: MITK Reviewer Group I

Modules/

IGT/

Algorithms/

mitkPivotCalibration.cpp

Common/

mitkTrackingTypes.h

DataManagement/

mitkNavigationToolStorage.cpp

mitkNavigationToolStorage.h

mitkTrackingDeviceSource.cpp

TrackingDevices/

mitkNDIAuroraTypeInformation.cpp

mitkNDITrackingDevice.cpp

mitkNDITrackingDevice.h

mitkPolhemusInterface.cpp

mitkPolhemusInterface.h

mitkPolhemusTool.cpp

mitkPolhemusTool.h

mitkPolhemusTrackerTypeInformation.cpp

mitkPolhemusTrackingDevice.cpp

mitkPolhemusTrackingDevice.h

mitkTrackingDevice.cpp

mitkTrackingDevice.h

IGTUI/

Qmitk/

QmitkAbstractTrackingDeviceWidget.cpp

QmitkAbstractTrackingDeviceWidget.h

QmitkMicronTrackerWidget.cpp

QmitkMicronTrackerWidget.h

QmitkNDIAuroraWidget.cpp

QmitkNDIAuroraWidget.h

QmitkNDIPolarisWidget.cpp

QmitkNDIPolarisWidget.h

QmitkNPOptitrackWidget.cpp

QmitkNPOptitrackWidget.h

QmitkNavigationToolManagementWidget.cpp

QmitkOpenIGTLinkWidget.cpp

QmitkOpenIGTLinkWidget.h

QmitkPolhemusTrackerWidget.cpp

QmitkPolhemusTrackerWidget.h

QmitkPolhemusTrackerWidget.ui

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidget.h

QmitkVirtualTrackerWidget.cpp

QmitkVirtualTrackerWidget.h

Plugins/

org.mitk.gui.qt.igttracking/

files.cmake

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewWorker.cpp

QmitkMITKIGTTrackingToolboxViewWorker.h

rMITK41cb89524ab6

View Options

CMake/BuildConfigurations/All.cmake

View Options

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

View Options

Modules/IGT/Common/mitkTrackingTypes.h

View Options

Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationToolStorage.h

View Options

Modules/IGT/DataManagement/mitkTrackingDeviceSource.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

View Options

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusInterface.h

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTool.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTool.h

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.h

View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

View Options

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.ui

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h

View Options

Plugins/org.mitk.gui.qt.igttracking/files.cmake

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules…41cb89524ab6Actions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITK41cb89524ab6

CMake/BuildConfigurations/All.cmake

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

Modules/IGT/Common/mitkTrackingTypes.h

Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp

Modules/IGT/DataManagement/mitkNavigationToolStorage.h

Modules/IGT/DataManagement/mitkTrackingDeviceSource.cpp

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Modules/IGT/TrackingDevices/mitkPolhemusInterface.h

Modules/IGT/TrackingDevices/mitkPolhemusTool.cpp

Modules/IGT/TrackingDevices/mitkPolhemusTool.h

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.h

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.cpp

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.h

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.cpp

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.h

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.ui

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h

Plugins/org.mitk.gui.qt.igttracking/files.cmake

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

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

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

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

Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules…
41cb89524ab6
Actions