Merge branch 'T24059-IGTRelease-2018.03'
e659a303a9c5
Actions

Description

Merge branch 'T24059-IGTRelease-2018.03'

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

Details

Provenance

seitela	Authored on Apr 6 2018, 5:28 PM
seitela	Pushed on Apr 6 2018, 5:36 PM

Parents

rMITKa657b600c08b: Merge branch 'T24578-CloneMITKData'
rMITKf129167953ae: Merge branch 'T24212-VTKDebugLeaksInUltrasoundSupport-Integration' into T24059…

Branches

Tags

Event Timeline

seitela committed rMITKe659a303a9c5: Merge branch 'T24059-IGTRelease-2018.03' (authored by seitela).Apr 6 2018, 5:28 PM

Merged Changes

f129167953ae Merge branch 'T24212-VTKDebugLeaksInUltrasoundSupport-Integration' into T24059…
Author
eisenman
Browse Repository
No Builds
No Audits
ebd2c7fb28a5 Break reference loop
Author
eisenman
Browse Repository
No Builds
No Audits
a2094989ccf2 Clean-up usage of vtkSmartPointer
Author
eisenman
Browse Repository
No Builds
No Audits
9e5cac7651ae Fix encoding issue with degree symbol
Author
eisenman
Browse Repository
No Builds
No Audits
d596c1e52a70 Merge remote-tracking branch 'origin/T24212-VTKDebugLeaksInUltrasoundSupport'…
Author
eisenman
Browse Repository
No Builds
No Audits
dd756ecc09b6 reduced some VTK debug leaks
Author
• aguilera
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

DataTypesExt/

src/

mitkEllipsoid.cpp

IGT/

DataManagement/

mitkNavigationTool.cpp

MapperExt/

src/

mitkMeshVtkMapper3D.cpp

US/

USControlInterfaces/

mitkUSAbstractControlInterface.h

Plugins/

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

src/

internal/

Filter/

mitkUSNavigationTargetOcclusionFilter.cpp

mitkUSNavigationTargetUpdateFilter.cpp

Interactors/

mitkUSZonesInteractor.cpp

NavigationStepWidgets/

QmitkUSNavigationStepMarkerIntervention.cpp

QmitkUSNavigationStepPlacementPlanning.cpp

QmitkUSNavigationMarkerPlacement.cpp

org.mitk.gui.qt.igtexamples/

src/

internal/

OpenIGTLinkExample.cpp

OpenIGTLinkPlugin.cpp

OpenIGTLinkProviderExample.cpp

rMITKe659a303a9c5

View Options

Modules/DataTypesExt/src/mitkEllipsoid.cpp

View Options

Modules/IGT/DataManagement/mitkNavigationTool.cpp

View Options

Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp

View Options

Modules/US/USControlInterfaces/mitkUSAbstractControlInterface.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkExample.cpp

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkPlugin.cpp

View Options

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkProviderExample.cpp

Merge branch 'T24059-IGTRelease-2018.03'e659a303a9c5Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITKe659a303a9c5

Modules/DataTypesExt/src/mitkEllipsoid.cpp

Modules/IGT/DataManagement/mitkNavigationTool.cpp

Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp

Modules/US/USControlInterfaces/mitkUSAbstractControlInterface.h

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkExample.cpp

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkPlugin.cpp

Plugins/org.mitk.gui.qt.igtexamples/src/internal/OpenIGTLinkProviderExample.cpp

Merge branch 'T24059-IGTRelease-2018.03'
e659a303a9c5
Actions