Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11
aff00594726e
Actions

Description

Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11

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

Details

Provenance

• house	Authored on Jun 27 2017, 10:26 AM
• house	Pushed on Jun 27 2017, 10:29 AM

Differential Revision

Restricted Differential Revision

Parents

rMITK6fa637216a63: changed return type og setToolAxisMarkerPlacement to null
rMITK48845150fd73: Merge branch 'T19825-PullRequestIntegration' into T22595-NavigationModules-2016…

Branches

Unknown

Tags

Unknown

Event Timeline

• house committed rMITKaff00594726e: Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11 (authored by • house).Jun 27 2017, 10:26 AM

Merged Changes

6fa637216a63 changed return type og setToolAxisMarkerPlacement to null
Author
• house
Browse Repository
No Builds
No Audits
84d967deaa54 Signed-off-by: Rachael House <r.house@dkfz-heidelberg.de> added feature to set…
Author
• house
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Modules/

IGT/

DataManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

IO/

mitkNavigationToolReader.cpp

mitkNavigationToolWriter.cpp

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolCreationWidget.ui

US/

USNavigation/

Filter/

mitkNeedleProjectionFilter.cpp

mitkNeedleProjectionFilter.h

Plugins/

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

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationStepPunctuationIntervention.h

USNavigationMarkerPlacement.cpp

USNavigationMarkerPlacement.h

rMITKaff00594726e

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/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

View Options

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.cpp

View Options

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.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/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.h

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

Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11aff00594726eActions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITKaff00594726e

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/IGT/DataManagement/mitkNavigationTool.h

Modules/IGT/IO/mitkNavigationToolReader.cpp

Modules/IGT/IO/mitkNavigationToolWriter.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.cpp

Modules/US/USNavigation/Filter/mitkNeedleProjectionFilter.h

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

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

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

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

Merge branch 'T22996-NavigationNeedleAxis' into T22595-NavigationModules-2016-11
aff00594726e
Actions