Merge branch 'T23728-integration-2018-02-20'
608a7aea018d
Actions

Description

Merge branch 'T23728-integration-2018-02-20'

Details

Provenance

franza	Authored on Feb 20 2018, 3:26 PM
franza	Pushed on Feb 20 2018, 3:27 PM

Parents

rMITK002400c47156: changed name of control points and tool landmarks in source code, adapted…
rMITK0f31f37c8d8f: Merge branch 'T24293-locale-switch-in-CEST-2'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK608a7aea018d: Merge branch 'T23728-integration-2018-02-20' (authored by franza).Feb 20 2018, 3:26 PM

Merged Changes

002400c47156 changed name of control points and tool landmarks in source code, adapted…
Author
franza
Browse Repository
No Builds
No Audits
a90fab565023 more documentation
Author
franza
Browse Repository
No Builds
No Audits
4ff9403f31b1 Updated documentation
Author
franza
Browse Repository
No Builds
No Audits
3919f17a8946 Merge remote-tracking branch 'origin/T23728-CleanUpToolCalibration' into T23728…
Author
franza
Browse Repository
No Builds
No Audits
ec552b02745d to task T23731 : renamed tool landmarks in UI. Still todo: renaming in code
Author
franza
Browse Repository
No Builds
No Audits
2e4700fc66a6 removed method which was not implemented
Author
franza
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

IO/

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

TestingHelper/

mitkNavigationToolStorageTestHelper.cpp

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

Plugins/

org.mitk.gui.qt.igttracking/

documentation/

UserManual/

QmitkMITKIGTNavigationToolCalibration.dox

src/

internal/

QmitkIGTNavigationToolCalibration.cpp

QmitkIGTNavigationToolCalibrationControls.ui

rMITK608a7aea018d

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.h

View Options

Modules/IGT/IO/mitkNavigationToolReader.cpp

View Options

Modules/IGT/IO/mitkNavigationToolWriter.cpp

View Options

Modules/IGT/TestingHelper/mitkNavigationToolStorageTestHelper.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

View Options

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolCalibration.dox

View Options

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

View Options

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

Merge branch 'T23728-integration-2018-02-20'608a7aea018dActions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITK608a7aea018d

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkNavigationTool.h

Modules/IGT/IO/mitkNavigationToolReader.cpp

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Modules/IGT/TestingHelper/mitkNavigationToolStorageTestHelper.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolCalibration.dox

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

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

Merge branch 'T23728-integration-2018-02-20'
608a7aea018d
Actions