Merge branch 'bug-18354-PersistenceAutoDetectedAndManuallyAddedTools'
6d276066f74a
Actions

Description

Merge branch 'bug-18354-PersistenceAutoDetectedAndManuallyAddedTools'

Conflicts:
Modules/IGT/DataManagement/mitkNavigationDataSource.cpp
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

franza

Authored on Jan 21 2015, 3:10 PM

Parents

rMITK6938094fbbd5: removed message after auto detection which is not needed any more (tools are…
rMITK3e6a78025aa4: Merge branch 'bug-16339-GeometryClass-Warning-Storm'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK6d276066f74a: Merge branch 'bug-18354-PersistenceAutoDetectedAndManuallyAddedTools' (authored by franza).Jan 21 2015, 3:10 PM

Merged Changes

6938094fbbd5 removed message after auto detection which is not needed any more (tools are…
Author
franza
Browse Repository
No Builds
No Audits
c1c1dad48d02 removed forgotten debug output
Author
franza
Browse Repository
No Builds
No Audits
d9b76dba5e29 now an auto save is called always before closing the tracking toolbox. So all…
Author
franza
Browse Repository
No Builds
No Audits
392c6007d22a now using the path of the mitk logging file for auto saving of tools if possible
Author
franza
Browse Repository
No Builds
No Audits
3c6694e56c78 added auto save feature for auto-detected and manually added tools
Author
franza
Browse Repository
No Builds
No Audits
ec346f8ac4a8 Integrated virtual tracker into UI of tracking toolbox: seems to work
Author
franza
Browse Repository
No Builds
No Audits
aa664336a8c4 Integrated virtual tracker into UI of navigation tool management
Author
franza
Browse Repository
No Builds
No Audits
c6e0cd188ae7 added possibility to manually add a reference pose
Author
franza
Browse Repository
No Builds
No Audits
b51779d058b6 added feature to freeze the navigation data source
Author
franza
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationDataSource.cpp

mitkNavigationDataSource.h

mitkTrackingDeviceSource.cpp

mitkTrackingDeviceSourceConfigurator.cpp

mitkTrackingDeviceSourceConfigurator.h

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidgetControls.ui

US/

USNavigation/

Filter/

mitkNodeDisplacementFilter.cpp

mitkNodeDisplacementFilter.h

mitkUSCombinedModality.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

rMITK6d276066f74a

View Options

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationDataSource.h

View Options

Modules/IGT/DataManagement/mitkTrackingDeviceSource.cpp

View Options

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

View Options

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

View Options

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.cpp

View Options

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.h

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

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/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-18354-PersistenceAutoDetectedAndManuallyAddedTools'6d276066f74aActions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITK6d276066f74a

Modules/IGT/DataManagement/mitkNavigationDataSource.cpp

Modules/IGT/DataManagement/mitkNavigationDataSource.h

Modules/IGT/DataManagement/mitkTrackingDeviceSource.cpp

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.cpp

Modules/IGT/DataManagement/mitkTrackingDeviceSourceConfigurator.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.cpp

Modules/US/USNavigation/Filter/mitkNodeDisplacementFilter.h

Modules/US/USNavigation/mitkUSCombinedModality.cpp

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/QmitkMITKIGTTrackingToolboxViewControls.ui

Merge branch 'bug-18354-PersistenceAutoDetectedAndManuallyAddedTools'
6d276066f74a
Actions