Merge remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254…
07cc440db371
Actions

Description

Merge remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254-GeometryFixesAsProposed

Conflicts:
Modules/Core/src/Interactions/mitkDisplayInteractor.cpp
Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp

Details

Provenance

kislinsk	Authored on Dec 19 2016, 12:04 PM
kislinsk	Pushed on Dec 19 2016, 12:51 PM

Parents

rMITK8fcd82ec6327: Correct handedness of coronal renderer geometries
rMITKc79b404a5945: Merge branch 'T22282-Revert-to-Tarball'

Branches

Tags

Event Timeline

kislinsk committed rMITK07cc440db371: Merge remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254… (authored by kislinsk).Dec 19 2016, 12:04 PM

Merged Changes

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 (9)

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

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

rMITK07cc440db371

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/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 remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254…07cc440db371Actions

Description

Details

Event Timeline

Merged Changes

Changes (9)

rMITK07cc440db371

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/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 remote-tracking branch 'NifTK/T22254-all-geometry-fixes' into T22254…
07cc440db371
Actions