Merge branch 'bug-18508-GeoToolsIntegration'
def5d4c008fd
Actions

Description

Merge branch 'bug-18508-GeoToolsIntegration'

Details

Provenance

Authored on Jan 5 2015, 11:53 AM

Parents

rMITK9ac42e8c39bc: Cleaning up for first master merge.
rMITK8eecd2571c03: Merge branch 'bug-18528-CalculateCorrectBoxLineIntersection'

Branches

Unknown

Tags

Unknown

Event Timeline

• kilgus committed rMITKdef5d4c008fd: Merge branch 'bug-18508-GeoToolsIntegration' (authored by • kilgus).Jan 5 2015, 11:53 AM

Merged Changes

9ac42e8c39bc Cleaning up for first master merge.
Author
• kilgus
Browse Repository
No Builds
No Audits
191387d5c916 Merge branch 'bug-18508-AffineInteractor' into bug-18508-GeoToolsIntegration
Author
• kilgus
Browse Repository
No Builds
No Audits
9db3c131abab New affine interactor.
Author
• kilgus
Browse Repository
No Builds
No Audits
f2949a178c18 Renamed AffineDataInteractor3D to ClippingPlaneInteractor3D.
Author
• kilgus
Browse Repository
No Builds
No Audits
bd080f085048 Rotation and translation works with base data, scaling not with images. Added…
Author
• kilgus
Browse Repository
No Builds
No Audits
2a75687bca59 First version of the Interactor and Plugin.
Author
• kilgus
Browse Repository
No Builds
No Audits
351a797b79b4 Color properties for the affine interactor.
Author
• kilgus
Browse Repository
No Builds
No Audits

Changes (46)

Path

Size

Packages

Core/

Code/

files.cmake

Modules/

DataTypesExt/

Resources/

Interactions/

AffineConfig.xml

AffineDeformationConfig.xml

AffineInteraction3D.xml

AffineRotationConfig.xml

AffineTranslationConfig.xml

	ClippingPlaneDeformationConfig.xml
	AffineDeformationConfig.xml

	ClippingPlaneInteraction3D.xml
	AffineInteraction3D.xml

	ClippingPlaneRotationConfig.xml
	AffineRotationConfig.xml

	ClippingPlaneTranslationConfig.xml
	AffineTranslationConfig.xml

files.cmake

mitkAffineDataInteractor3D.cpp

mitkAffineDataInteractor3D.h

	mitkClippingPlaneInteractor3D.cpp
	mitkAffineDataInteractor3D.cpp

	mitkClippingPlaneInteractor3D.h
	mitkAffineDataInteractor3D.h

Plugins/

PluginList.cmake

org.mitk.gui.qt.geometrytools

manifest_headers.cmake

QmitkGeometryToolsView.cpp

QmitkGeometryToolsView.h

QmitkGeometryToolsViewControls.ui

org_mitk_gui_qt_geometrytools_Activator.cpp

org_mitk_gui_qt_geometrytools_Activator.h

org.mitk.gui.qt.segmentation/

src/

internal/

QmitkDeformableClippingPlaneView.cpp

O1: MITK Reviewer Group I

	Plugins/	org.mitk.gui.qt.geometrytools/		documentation/	UserManual/
	Applications/	PluginGenerator/	PluginTemplate/	documentation/	UserManual/

icon.xpm

rMITKdef5d4c008fd

View Options

Core/Code/files.cmake

View Options

Modules/DataTypesExt/Resources/Interactions/AffineConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/AffineDeformationConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/AffineInteraction3D.xml

View Options

Modules/DataTypesExt/Resources/Interactions/AffineRotationConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/AffineTranslationConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneDeformationConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneInteraction3D.xml

View Options

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneRotationConfig.xml

View Options

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneTranslationConfig.xml

View Options

Modules/DataTypesExt/files.cmake

View Options

Modules/DataTypesExt/mitkAffineDataInteractor3D.cpp

View Options

Modules/DataTypesExt/mitkAffineDataInteractor3D.h

View Options

Modules/DataTypesExt/mitkClippingPlaneInteractor3D.cpp

View Options

Modules/DataTypesExt/mitkClippingPlaneInteractor3D.h

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.geometrytools/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.geometrytools/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.geometrytools/documentation/UserManual/icon.xpm

View Options

Plugins/org.mitk.gui.qt.geometrytools/documentation/doxygen/modules.dox

View Options

Plugins/org.mitk.gui.qt.geometrytools/files.cmake

View Options

Plugins/org.mitk.gui.qt.geometrytools/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.geometrytools/plugin.xml

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/icon.xpm

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_alt.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_ctrl.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_dash.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_down.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_left.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_plus.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_right.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_shift.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/resources/key_up.png

View Options

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsView.cpp

View Options

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsView.h

View Options

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsViewControls.ui

View Options

Plugins/org.mitk.gui.qt.geometrytools/src/internal/org_mitk_gui_qt_geometrytools_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.geometrytools/src/internal/org_mitk_gui_qt_geometrytools_Activator.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp

Merge branch 'bug-18508-GeoToolsIntegration'def5d4c008fdActions

Description

Details

Event Timeline

Merged Changes

Changes (46)

rMITKdef5d4c008fd

Core/Code/files.cmake

Modules/DataTypesExt/Resources/Interactions/AffineConfig.xml

Modules/DataTypesExt/Resources/Interactions/AffineDeformationConfig.xml

Modules/DataTypesExt/Resources/Interactions/AffineInteraction3D.xml

Modules/DataTypesExt/Resources/Interactions/AffineRotationConfig.xml

Modules/DataTypesExt/Resources/Interactions/AffineTranslationConfig.xml

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneDeformationConfig.xml

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneInteraction3D.xml

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneRotationConfig.xml

Modules/DataTypesExt/Resources/Interactions/ClippingPlaneTranslationConfig.xml

Modules/DataTypesExt/files.cmake

Modules/DataTypesExt/mitkAffineDataInteractor3D.cpp

Modules/DataTypesExt/mitkAffineDataInteractor3D.h

Modules/DataTypesExt/mitkClippingPlaneInteractor3D.cpp

Modules/DataTypesExt/mitkClippingPlaneInteractor3D.h

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.geometrytools/CMakeLists.txt

Plugins/org.mitk.gui.qt.geometrytools/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.geometrytools/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.geometrytools/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.geometrytools/files.cmake

Plugins/org.mitk.gui.qt.geometrytools/manifest_headers.cmake

Plugins/org.mitk.gui.qt.geometrytools/plugin.xml

Plugins/org.mitk.gui.qt.geometrytools/resources/icon.xpm

Plugins/org.mitk.gui.qt.geometrytools/resources/key_alt.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_ctrl.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_dash.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_down.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_left.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_plus.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_right.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_shift.png

Plugins/org.mitk.gui.qt.geometrytools/resources/key_up.png

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsView.cpp

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsView.h

Plugins/org.mitk.gui.qt.geometrytools/src/internal/QmitkGeometryToolsViewControls.ui

Plugins/org.mitk.gui.qt.geometrytools/src/internal/org_mitk_gui_qt_geometrytools_Activator.cpp

Plugins/org.mitk.gui.qt.geometrytools/src/internal/org_mitk_gui_qt_geometrytools_Activator.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp

Merge branch 'bug-18508-GeoToolsIntegration'
def5d4c008fd
Actions