HomePhabricator
Diffusion MITK 64dbdc620402

Merge branch 'bug-14892-GeometryRedesign' into bug-14892-ITK4_GeometryRedesign

Description

Merge branch 'bug-14892-GeometryRedesign' into bug-14892-ITK4_GeometryRedesign

Conflicts:
Core/Code/Algorithms/mitkExtractSliceFilter.cpp
Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp
Core/Code/DataManagement/mitkAbstractTransformGeometry.h
Core/Code/DataManagement/mitkDisplayGeometry.cpp
Core/Code/DataManagement/mitkDisplayGeometry.h
Core/Code/DataManagement/mitkGeometry2D.cpp
Core/Code/DataManagement/mitkGeometry2D.h
Core/Code/DataManagement/mitkGeometry3D.cpp
Core/Code/DataManagement/mitkGeometry3D.h
Core/Code/DataManagement/mitkLandmarkBasedCurvedGeometry.h
Core/Code/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
Core/Code/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.h
Core/Code/DataManagement/mitkPlaneGeometry.cpp
Core/Code/DataManagement/mitkPlaneGeometry.h
Core/Code/DataManagement/mitkSlicedGeometry3D.cpp
Core/Code/DataManagement/mitkSlicedGeometry3D.h
Core/Code/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
Core/Code/DataManagement/mitkThinPlateSplineCurvedGeometry.h
Core/Code/DataManagement/mitkTimeSlicedGeometry.cpp
Core/Code/DataManagement/mitkTimeSlicedGeometry.h
Core/Code/Testing/mitkTimeSlicedGeometryTest.cpp
Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp
Modules/MitkExt/DataManagement/mitkBoundingObjectGroup.cpp
Modules/MitkExt/DataManagement/mitkExternAbstractTransformGeometry.cpp
Modules/MitkExt/DataManagement/mitkExternAbstractTransformGeometry.h
Modules/MitkExt/Interactions/mitkTool.cpp
Modules/QmitkExt/QmitkFunctionalityComponents/QmitkThresholdComponent.cpp
Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.cpp
Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp
Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp
Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp
Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Merged Changes