Merge remote-tracking branch 'origin/bug-17732-PlanarFigure-interaction…
4faf77b97f24
Actions

Description

Merge remote-tracking branch 'origin/bug-17732-PlanarFigure-interaction-tests' into bug-18015-AutomatedMeasurementTesting-2

Conflicts:
Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp
Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h
Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.h
Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

Merge remote-tracking branch 'origin/bug-17732-PlanarFigure-interaction…4faf77b97f24Actions

Description

Details

Event Timeline

Merged Changes

Changes (29)

rMITK4faf77b97f24

Core/Code/TestingHelper/mitkInteractionTestHelper.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.h

Modules/PlanarFigure/DataManagement/mitkPlanarArrow.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarArrow.h

Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarBezierCurve.h

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.h

Modules/PlanarFigure/DataManagement/mitkPlanarCross.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarCross.h

Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarDoubleEllipse.h

Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.h

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h

Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFourPointAngle.h

Modules/PlanarFigure/DataManagement/mitkPlanarLine.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarLine.h

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.h

Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarRectangle.h

Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarSubdivisionPolygon.h

Modules/PlanarFigure/Testing/files.cmake

Modules/PlanarFigure/Testing/mitkPlanarFigureInteractionTest.cpp

Merge remote-tracking branch 'origin/bug-17732-PlanarFigure-interaction…
4faf77b97f24
Actions