Merge branch 'T23633-ToolCalibration_2016_11_06' into T22595-NavigationModules…
4c8d038ba0a4
Actions

Description

Merge branch 'T23633-ToolCalibration_2016_11_06' into T22595-NavigationModules-2016.11.3-igt

Details

Provenance

• wildes	Authored on Nov 17 2017, 1:41 PM
• wildes	Pushed on Nov 17 2017, 1:48 PM

Parents

rMITK5d4ae2f3af0a: Avoid crash by setting default data storage.
rMITKbee44073cfd0: Merge branch 'T18923-FixSyncOfSliderAndSpinBox' into T22595-NavigationModules…

Branches

Tags

Event Timeline

• wildes committed rMITK4c8d038ba0a4: Merge branch 'T23633-ToolCalibration_2016_11_06' into T22595-NavigationModules… (authored by • wildes).Nov 17 2017, 1:41 PM

Merged Changes

5d4ae2f3af0a Avoid crash by setting default data storage.
Author
• wildes
Browse Repository
No Builds
No Audits
e7098fc03374 Remove preview on Cancel
Author
• wildes
Browse Repository
No Builds
No Audits
73888eb509f3 Add tool preview during edit/creation of new navigation tool.
Author
• wildes
Browse Repository
No Builds
No Audits
7235b6b603d2 Move ToolInformation label. Now it is also visible during EditTool.
Author
• wildes
Browse Repository
No Builds
No Audits
82737ed93222 Set correct name in clone function of NavigationTool.
Author
• wildes
Browse Repository
No Builds
No Audits
eb1c26cc01cf Correct usage of blockSignal in ToolEdit-widgets.
Author
• wildes
Browse Repository
No Builds
No Audits
31258407ac4d Avoid double nodes in the data manager when editing tool tip.
Author
• wildes
Browse Repository
No Builds
No Audits
ba2588f26016 Manual toolTip Widget now uses copy of Navigation Tool.
Author
• wildes
Browse Repository
No Builds
No Audits
01d047e850fd Manual toolTip Widget now uses copy of Navigation Tool.
Author
• wildes
Browse Repository
No Builds
No Audits
37c115a0fea7 Change Spinboxes to double. Use deep copy of geometries for resetting.
Author
• wildes
Browse Repository
No Builds
No Audits
0cca9f8a1616 Change slider-spinbox-synchronization.
Author
• wildes
Browse Repository
No Builds
No Audits
47e335cb5b20 Implement Clone() function for Navigation tool Fix connections for ToolTipEdit…
Author
• wildes
Browse Repository
No Builds
No Audits
9e8a22045f73 New class structure compiling and workbench starting.
Author
• wildes
Browse Repository
No Builds
No Audits
2c73fc6f7c39 Delete ToolCreationAdvancedWidget class. Started to revise…
Author
• wildes
Browse Repository
No Builds
No Audits
2e7b805676fa Merge branch 'T23633-ToolCalibration' into T23633-ToolCalibration_2016_11_06
Author
• wildes
Browse Repository
No Builds
No Audits
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 (20)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

IGTUI/

Qmitk/

QmitkInteractiveTransformationWidget.cpp

QmitkInteractiveTransformationWidget.h

QmitkInteractiveTransformationWidgetControls.ui

QmitkNavigationToolCreationAdvancedWidget.cpp

QmitkNavigationToolCreationAdvancedWidget.h

QmitkNavigationToolCreationAdvancedWidgetControls.ui

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.h

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolManagementWidget.cpp

QmitkNavigationToolManagementWidget.h

QmitkNavigationToolManagementWidgetControls.ui

files.cmake

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

rMITK4c8d038ba0a4

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.h

View Options

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidgetControls.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.h

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidgetControls.ui

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

Modules/IGTUI/files.cmake

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_2016_11_06' into T22595-NavigationModules…4c8d038ba0a4Actions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITK4c8d038ba0a4

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkNavigationTool.h

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.cpp

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.h

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidgetControls.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.h

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidgetControls.ui

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

Modules/IGTUI/files.cmake

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_2016_11_06' into T22595-NavigationModules…
4c8d038ba0a4
Actions