Diffusion MITK ce41ca490a76

Merge branch 'T22595-NavigationModules-2016.11.3-igt' into T22595…
ce41ca490a76
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T22595-NavigationModules-2016.11.3-igt' into T22595-MasterIntegration-2017-10-12

Conflicts:
CMake/BuildConfigurations/All.cmake
Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.cpp
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

• wildes	Authored on Oct 12 2017, 5:38 PM
• wildes	Pushed on Oct 12 2017, 5:39 PM

Parents

rMITKeae477692c5b: Merge branch 'T23492-gcc_fix'
rMITK41cb89524ab6: Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules…

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITKce41ca490a76: Merge branch 'T22595-NavigationModules-2016.11.3-igt' into T22595… (authored by • wildes).Oct 12 2017, 5:38 PM

Merged Changes

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

41cb89524ab6 Merge branch 'T23350-PolhemusHemisphereTracking' into T22595-NavigationModules…
Author
• wildes
Browse Repository
No Builds
No Audits
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
ea44e46bdfd0 Merge remote-tracking branch 'remotes/origin/T23101-NeedleAxisCalibration' into…
Author
franza
Browse Repository
No Builds
No Audits
26611a9dfadc now the tool axis visualization can be activated through the UI
Author
franza
Browse Repository
No Builds
No Audits
881af485b5b9 cleaned up projection filter: needle axis visualization is now optional and can…
Author
franza
Browse Repository
No Builds
No Audits
6d92a8c53dd9 cleaned up console output
Author
franza
Browse Repository
No Builds
No Audits

Changes (55)

Path

Size

Modules/

IGT/

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

US/

USNavigation/

Filter/

mitkNeedleProjectionFilter.cpp

mitkNeedleProjectionFilter.h

Plugins/

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

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepMarkerIntervention.h

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.h

QmitkUSNavigationStepPunctuationIntervention.ui

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

Widgets/

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.h

org.mitk.gui.qt.igttracking/

src/

internal/

IGTNavigationToolCalibration.cpp

IGTNavigationToolCalibration.h

IGTNavigationToolCalibrationControls.ui

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewWorker.cpp

QmitkMITKIGTTrackingToolboxViewWorker.h

rMITKce41ca490a76

Modules/IGT/Common/mitkTrackingTypes.h

Loading...

Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp

Loading...

Modules/IGT/DataManagement/mitkNavigationToolStorage.h

Loading...

Modules/IGT/DataManagement/mitkTrackingDeviceSource.cpp

Loading...

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

Loading...

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkNDITrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusInterface.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusInterface.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTool.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTool.h

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackerTypeInformation.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkPolhemusTrackingDevice.h

Loading...

Modules/IGT/TrackingDevices/mitkTrackingDevice.cpp

Loading...

Modules/IGT/TrackingDevices/mitkTrackingDevice.h

Loading...

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkAbstractTrackingDeviceWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkPolhemusTrackerWidget.ui

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h

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/QmitkUSNavigationStepMarkerIntervention.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepMarkerIntervention.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/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.ui

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.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.cpp

Loading...

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

Loading...

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

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/QmitkMITKIGTTrackingToolboxViewWorker.cpp

Loading...

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

Loading...