Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11…
5798d2546e52
Actions

Description

Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11-beta

Details

Provenance

kislinsk	Authored on Jan 11 2017, 11:08 AM
kislinsk	Pushed on Jan 11 2017, 11:08 AM

Parents

rMITK64e7c5d1adc0: Adapted test to geometry changes of Miklos Espak
rMITK4f2fdad204d0: Merge branch 'T22280-OpenCV-2.4.13.1' into releases/2016-11-beta

Branches

Tags

Event Timeline

kislinsk committed rMITK5798d2546e52: Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11… (authored by kislinsk).Jan 11 2017, 11:08 AM

Merged Changes

64e7c5d1adc0 Adapted test to geometry changes of Miklos Espak
Author
kislinsk
Browse Repository
No Builds
No Audits
72a3a097395e Adapted test to the changes of Miklos Espak.
Author
kislinsk
Browse Repository
No Builds
No Audits
4abed65f8823 Adapted call signatures of SlicedGeometry3D::InitializeEvenlySpaced().
Author
kislinsk
Browse Repository
No Builds
No Audits
b478f2a9d241 Disable inverted controls for now. This should be a preference later.
Author
kislinsk
Browse Repository
No Builds
No Audits
57d0ef421da7 Fix wrong signature.
Author
kislinsk
Browse Repository
No Builds
No Audits
9e4e5ba6fcf1 Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits
8648b1dfe702 Correct handedness of coronal renderer geometries
Author
espak
Browse Repository
No Builds
No Audits
c452be58e66c Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits
77aaf9bdc1df Invert slider control directions in image navigator
Author
espak
Browse Repository
No Builds
No Audits
8be2b2db3f8f Invert directions in image navigator according to reference geometry
Author
espak
Browse Repository
No Builds
No Audits
dda398cf3375 Translate input geometry to world space for calculating sliced geometry planes
Author
espak
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Packages

Modules/

Core/

include/

mitkPlaneGeometry.h

O1: MITK Reviewer Group I

mitkSlicedGeometry3D.h

O1: MITK Reviewer Group I

src/

Controllers/

mitkSliceNavigationController.cpp

O1: MITK Reviewer Group I

DataManagement/

mitkPlaneGeometry.cpp

O1: MITK Reviewer Group I

mitkSlicedGeometry3D.cpp

O1: MITK Reviewer Group I

test/

mitkPlaneGeometryTest.cpp

O1: MITK Reviewer Group I

mitkSliceNavigationControllerTest.cpp

O1: MITK Reviewer Group I

mitkSlicedGeometry3DTest.cpp

O1: MITK Reviewer Group I

QtWidgetsExt/

include/

QmitkSliderNavigatorWidget.h

O3: MITK Reviewer Group II

src/

QmitkSliderNavigator.ui

O3: MITK Reviewer Group II

QmitkSliderNavigatorWidget.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.imagenavigator/

src/

internal/

QmitkImageNavigatorView.cpp

O1: MITK Reviewer Group I

rMITK5798d2546e52

View Options

Modules/Core/include/mitkPlaneGeometry.h

View Options

Modules/Core/include/mitkSlicedGeometry3D.h

View Options

Modules/Core/src/Controllers/mitkSliceNavigationController.cpp

View Options

Modules/Core/src/DataManagement/mitkPlaneGeometry.cpp

View Options

Modules/Core/src/DataManagement/mitkSlicedGeometry3D.cpp

View Options

Modules/Core/test/mitkPlaneGeometryTest.cpp

View Options

Modules/Core/test/mitkSliceNavigationControllerTest.cpp

View Options

Modules/Core/test/mitkSlicedGeometry3DTest.cpp

View Options

Modules/QtWidgetsExt/include/QmitkSliderNavigatorWidget.h

View Options

Modules/QtWidgetsExt/src/QmitkSliderNavigator.ui

View Options

Modules/QtWidgetsExt/src/QmitkSliderNavigatorWidget.cpp

View Options

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp

Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11…5798d2546e52Actions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK5798d2546e52

Modules/Core/include/mitkPlaneGeometry.h

Modules/Core/include/mitkSlicedGeometry3D.h

Modules/Core/src/Controllers/mitkSliceNavigationController.cpp

Modules/Core/src/DataManagement/mitkPlaneGeometry.cpp

Modules/Core/src/DataManagement/mitkSlicedGeometry3D.cpp

Modules/Core/test/mitkPlaneGeometryTest.cpp

Modules/Core/test/mitkSliceNavigationControllerTest.cpp

Modules/Core/test/mitkSlicedGeometry3DTest.cpp

Modules/QtWidgetsExt/include/QmitkSliderNavigatorWidget.h

Modules/QtWidgetsExt/src/QmitkSliderNavigator.ui

Modules/QtWidgetsExt/src/QmitkSliderNavigatorWidget.cpp

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp

Merge branch 'T22254-GeometryFixesBasedOnReleaseBranch' into releases/2016-11…
5798d2546e52
Actions