Merge branch 'T22254-GeometryFixesAsProposed'
68e3fc8eb166
Actions

Description

Merge branch 'T22254-GeometryFixesAsProposed'

Details

Provenance

kislinsk	Authored on Jan 11 2017, 9:50 AM
kislinsk	Pushed on Jan 11 2017, 9:50 AM

Parents

rMITKec3d474f5d32: Adapted test to geometry changes of Miklos Espak
rMITKd10db97bc7b8: Merge branch 'T22337-remove-msvs-batch-files'

Branches

Tags

Event Timeline

kislinsk committed rMITK68e3fc8eb166: Merge branch 'T22254-GeometryFixesAsProposed' (authored by kislinsk).Jan 11 2017, 9:50 AM

Merged Changes

ec3d474f5d32 Adapted test to geometry changes of Miklos Espak
Author
kislinsk
Browse Repository
No Builds
No Audits
4261ef7a44c7 Adapted test to the changes of Miklos Espak.
Author
kislinsk
Browse Repository
No Builds
No Audits
12e3628ca432 Adapted call signatures of SlicedGeometry3D::InitializeEvenlySpaced().
Author
kislinsk
Browse Repository
No Builds
No Audits
f433812d4dc4 Disable inverted controls for now. This should be a preference later.
Author
kislinsk
Browse Repository
No Builds
No Audits
8468a4e947b2 Fix wrong signature.
Author
kislinsk
Browse Repository
No Builds
No Audits
3ffe1606e87c Merge remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254…
Author
kislinsk
Browse Repository
No Builds
No Audits
8cb185bf9019 Correct handedness of coronal renderer geometries
Author
espak
Browse Repository
No Builds
No Audits
7fcff1313aec Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits
07cc440db371 Merge remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254…
Author
kislinsk
Browse Repository
No Builds
No Audits
8fcd82ec6327 Correct handedness of coronal renderer geometries
Author
espak
Browse Repository
No Builds
No Audits
1ca1a7b0574e Compose sliced geometries of planes with matching normal
Author
espak
Browse Repository
No Builds
No Audits
b72ab904c95e Invert slider control directions in image navigator
Author
espak
Browse Repository
No Builds
No Audits
113870ce6283 Invert directions in image navigator according to reference geometry
Author
espak
Browse Repository
No Builds
No Audits
1b9d9bc730c8 Translate input geometry to world space for calculating sliced geometry planes
Author
espak
Browse Repository
No Builds
No Audits
1e8992d9dd91 Equality checks when setting data storage for renderers
Author
espak
Browse Repository
No Builds
No Audits
07c480bf27a9 Turn spacing vector to world coordinate order for bounding box geometry…
Author
espak
Browse Repository
No Builds
No Audits
23fa66f513d7 Correcting origin and bounds for geometry calculated from data storage
Author
espak
Browse Repository
No Builds
No Audits
3caebdcb3d5e Current world position re-calculated before updating status bar
Author
espak
Browse Repository
No Builds
No Audits
6f6d9bf6ddfb SlicedGeometry3D::GetReferenceGeometry() function for API consistency
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

rMITK68e3fc8eb166

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-GeometryFixesAsProposed'68e3fc8eb166Actions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK68e3fc8eb166

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-GeometryFixesAsProposed'
68e3fc8eb166
Actions