Merge branch 'T24058-EchoTrackCompilerErrors' into T22595-Masterintegration…
9d9cf6d165c1
Actions

Description

Merge branch 'T24058-EchoTrackCompilerErrors' into T22595-Masterintegration-2018-01-09

Details

Provenance

eisenman	Authored on Jan 22 2018, 5:30 PM
eisenman	Pushed on Jan 22 2018, 5:48 PM

Parents

rMITK5cc8a5c6dbb9: Fix reorder warnings and initialize missing member variables
rMITKd4bb6ebfcd09: Merge branch 'T23550-ImproveOpenIGTLinkConnection_from_MITK_to_PLUS' into…

Branches

Unknown

Tags

Unknown

Event Timeline

eisenman committed rMITK9d9cf6d165c1: Merge branch 'T24058-EchoTrackCompilerErrors' into T22595-Masterintegration… (authored by eisenman).Jan 22 2018, 5:30 PM

Merged Changes

5cc8a5c6dbb9 Fix reorder warnings and initialize missing member variables
Author
eisenman
Browse Repository
No Builds
No Audits
0bbd4e1cb2fc Remove member variables that were never set
Author
eisenman
Browse Repository
No Builds
No Audits
16892b1017a8 Remove unused member variable
Author
eisenman
Browse Repository
No Builds
No Audits
3d0cc37357db Remove unused constructor
Author
eisenman
Browse Repository
No Builds
No Audits
1385a5bacaba Fix reorder warnings and initialize missing member variables
Author
eisenman
Browse Repository
No Builds
No Audits
b60b2718ecb4 Fix warnings of comparison between signed and unsigned integer expressions by…
Author
eisenman
Browse Repository
No Builds
No Audits
9d70a2a97baf Fix reorder warnings and initialize missing member variables
Author
eisenman
Browse Repository
No Builds
No Audits
f7c4e630b5c8 Remove duplicate member variables
Author
eisenman
Browse Repository
No Builds
No Audits
164aad5c5c50 Fix typo
Author
eisenman
Browse Repository
No Builds
No Audits
f43c34a0c29c Remove duplicate method
Author
eisenman
Browse Repository
No Builds
No Audits

Changes (23)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationToolStorage.cpp

mitkNavigationToolStorage.h

mitkTrackingDeviceSourceConfigurator.cpp

IO/

mitkNavigationToolStorageSerializer.cpp

TrackingDevices/

mitkMicronTrackerTypeInformation.cpp

mitkNDIAuroraTypeInformation.cpp

mitkNDIPolarisTypeInformation.cpp

mitkNPOptitrackTrackingTypeInformation.cpp

mitkOpenIGTLinkTrackingDevice.cpp

mitkOpenIGTLinkTypeInformation.cpp

mitkVirtualTrackerTypeInformation.cpp

IGTUI/

Qmitk/

QmitkIGTConnectionWidget.cpp

QmitkNavigationDataSourceSelectionWidget.cpp

QmitkNavigationToolManagementWidget.cpp

QmitkToolTrackingStatusWidget.cpp

Plugins/

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

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepMarkerIntervention.h

QmitkUSNavigationStepPunctuationIntervention.cpp

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

org_mbi_gui_qt_usnavigation_Activator.cpp

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxViewWorker.cpp

rMITK9d9cf6d165c1

View Options

Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationToolStorage.h

View Options

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

View Options

Modules/IGT/IO/mitkNavigationToolStorageSerializer.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/mitkOpenIGTLinkTrackingDevice.cpp

View Options

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp

View Options

Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T24058-EchoTrackCompilerErrors' into T22595-Masterintegration…9d9cf6d165c1Actions

Description

Details

Event Timeline

Merged Changes

Changes (23)

rMITK9d9cf6d165c1

Modules/IGT/DataManagement/mitkNavigationToolStorage.cpp

Modules/IGT/DataManagement/mitkNavigationToolStorage.h

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

Modules/IGT/IO/mitkNavigationToolStorageSerializer.cpp

Modules/IGT/TrackingDevices/mitkMicronTrackerTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIAuroraTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNDIPolarisTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkNPOptitrackTrackingTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTrackingDevice.cpp

Modules/IGT/TrackingDevices/mitkOpenIGTLinkTypeInformation.cpp

Modules/IGT/TrackingDevices/mitkVirtualTrackerTypeInformation.cpp

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp

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

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

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

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

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

Merge branch 'T24058-EchoTrackCompilerErrors' into T22595-Masterintegration…
9d9cf6d165c1
Actions