Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_06
2e7b805676fa
Actions

Description

Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_06

Details

Provenance

• wildes	Authored on Nov 6 2017, 4:43 PM
• wildes	Pushed on Nov 10 2017, 4:01 PM

Parents

rMITKfeb538a469a6: Check for tools to avoid crashes.
rMITKbee44073cfd0: Merge branch 'T18923-FixSyncOfSliderAndSpinBox' into T22595-NavigationModules…

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITK2e7b805676fa: Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_06 (authored by • wildes).Nov 6 2017, 4:43 PM

Merged Changes

feb538a469a6 Check for tools to avoid crashes.
Author
• wildes
Browse Repository
No Builds
No Audits
643a7c3970d2 Manual edition of tool axis calibration possible. Fix crash when no tool is…
Author
• wildes
Browse Repository
No Builds
No Audits
8dcf7e7f3c62 Simplify code for tool axis calibration and add documentation.
Author
• wildes
Browse Repository
No Builds
No Audits
812a3a6fc4e5 Set default values for tool tip editing in toolManagementView
Author
• wildes
Browse Repository
No Builds
No Audits
2e7654372c49 Remove mitkTrackingTool member from mitkNavigationTool class. It's not…
Author
• wildes
Browse Repository
No Builds
No Audits
7a6325c7b8c5 Clean up output
Author
• wildes
Browse Repository
No Builds
No Audits
d6a6b4d67e4b Display ToolTip in ToolManagerView ToolEdit widget.
Author
• wildes
Browse Repository
No Builds
No Audits
b6b1e03de2e1 Rename functions and variables to better description.
Author
• wildes
Browse Repository
No Builds
No Audits
0e8a0ffc9dc5 Code style: spaces etc.
Author
• wildes
Browse Repository
No Builds
No Audits
55a2a126e453 Add Label with tool information in tracking toolbox
Author
• wildes
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

IGTUI/

Qmitk/

QmitkNavigationToolCreationAdvancedWidget.cpp

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.h

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkNavigationToolManagementWidget.h

QmitkNavigationToolManagementWidgetControls.ui

Plugins/

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

src/

internal/

UltrasoundCalibrationControls.ui

org.mitk.gui.qt.igttracking/

src/

internal/

IGTNavigationToolCalibration.cpp

IGTNavigationToolCalibration.h

IGTNavigationToolCalibrationControls.ui

QmitkNavigationDataPlayerView.cpp

rMITK2e7b805676fa

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/UltrasoundCalibrationControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui

View Options

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

Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_062e7b805676faActions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITK2e7b805676fa

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkNavigationTool.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidgetControls.ui

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/UltrasoundCalibrationControls.ui

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

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

Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui

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

Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_06
2e7b805676fa
Actions