Merge branch 'T19984-ImageCropperIntegration'
2d5391172315
Actions

Description

Merge branch 'T19984-ImageCropperIntegration'

Conflicts:
Modules/ModuleList.cmake

Details

Provenance

kislinsk	Authored on Oct 24 2016, 12:17 PM
kislinsk	Pushed on Oct 24 2016, 12:17 PM

Parents

rMITKfd9b80afe526: Merge branch 'T20091-Plane-visibility-in-StdMultiWidgetEditor'
rMITKea05f5d39497: Mainly rename bounding shape related properties and more refactoring.

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK2d5391172315: Merge branch 'T19984-ImageCropperIntegration' (authored by kislinsk).Oct 24 2016, 12:17 PM

Merged Changes

ea05f5d39497 Mainly rename bounding shape related properties and more refactoring.
Author
kislinsk
Browse Repository
No Builds
No Audits
fc102249350e Simplify call to CutImage template method.
Author
kislinsk
Browse Repository
No Builds
No Audits
4cc28445fa4e Fix gcc compiler errors in BoundingShape module.
Author
kislinsk
Browse Repository
No Builds
No Audits
ca223c1f0db8 Minor documentation changes
Author
• thomass
Browse Repository
No Builds
No Audits
f8eff9bf14b1 Add new image cropper plugin to branch
Author
• thomass
Browse Repository
No Builds
No Audits

Changes (46)

Path

Size

Packages

Modules/

mitkBoundingShapeCropper.h

mitkBoundingShapeInteractor.h

mitkBoundingShapeObjectFactory.h

mitkBoundingShapeVtkMapper2D.h

mitkBoundingShapeVtkMapper3D.h

resource

Interactions

BoundingShapeInteraction.xml

BoundingShapeMouseConfig.xml

src

DataManagement

mitkBoundingShapeCropper.cpp

mitkBoundingShapeObjectFactory.cpp

mitkBoundingShapeUtil.cpp

mitkBoundingShapeUtil.h

Interactions

mitkBoundingShapeInteractor.cpp

Rendering

mitkBoundingShapeVtkMapper2D.cpp

mitkBoundingShapeVtkMapper3D.cpp

	BoundingShape/	resource/	Interactions/
	DataTypesExt/	resource/	Interactions/

	BoundingShapeKeyConfig.xml
	AffineKeyConfig.xml

ModuleList.cmake

Plugins/

org.mitk.gui.qt.imagecropper/

CMakeLists.txt

O3: MITK Reviewer Group II

documentation/

UserManual/

Advanced_ImageCropperView.png

O3: MITK Reviewer Group II

Basic_ImageCropperView.png

O3: MITK Reviewer Group II

BoundingBox_ImageCropperView.png

O3: MITK Reviewer Group II

QmitkImageCropper.dox

O3: MITK Reviewer Group II

QmitkImageCropper_Icon.png

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

plugin.xml

O3: MITK Reviewer Group II

resources/

icon.png

O3: MITK Reviewer Group II

icon29.png

O3: MITK Reviewer Group II

src/

internal/

ImageCropperControls.ui

O3: MITK Reviewer Group II

QmitkImageCropper.cpp

O3: MITK Reviewer Group II

QmitkImageCropper.h

O3: MITK Reviewer Group II

QmitkImageCropperControls.ui

O3: MITK Reviewer Group II

mitkImageCropperEventInterface.cpp

O3: MITK Reviewer Group II

mitkImageCropperEventInterface.h

O3: MITK Reviewer Group II

mitkImageCropperPluginActivator.cpp

O3: MITK Reviewer Group II

mitkImageCropperPluginActivator.h

O3: MITK Reviewer Group II

org_mitk_gui_qt_imagecropper_Activator.cpp

O3: MITK Reviewer Group II

	org_mitk_gui_qt_imagecropper_Activator.h
	mitkImageCropperPluginActivator.h

O3: MITK Reviewer Group II

rMITK2d5391172315

View Options

Modules/BoundingShape/CMakeLists.txt

View Options

Modules/BoundingShape/files.cmake

View Options

Modules/BoundingShape/include/mitkBoundingShapeCropper.h

View Options

Modules/BoundingShape/include/mitkBoundingShapeInteractor.h

View Options

Modules/BoundingShape/include/mitkBoundingShapeObjectFactory.h

View Options

Modules/BoundingShape/include/mitkBoundingShapeVtkMapper2D.h

View Options

Modules/BoundingShape/include/mitkBoundingShapeVtkMapper3D.h

View Options

Modules/BoundingShape/resource/Interactions/BoundingShapeInteraction.xml

View Options

Modules/BoundingShape/resource/Interactions/BoundingShapeKeyConfig.xml

View Options

Modules/BoundingShape/resource/Interactions/BoundingShapeMouseConfig.xml

View Options

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeCropper.cpp

View Options

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeObjectFactory.cpp

View Options

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeUtil.cpp

View Options

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeUtil.h

View Options

Modules/BoundingShape/src/Interactions/mitkBoundingShapeInteractor.cpp

View Options

Modules/BoundingShape/src/Rendering/mitkBoundingShapeVtkMapper2D.cpp

View Options

Modules/BoundingShape/src/Rendering/mitkBoundingShapeVtkMapper3D.cpp

View Options

Modules/ModuleList.cmake

View Options

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

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Advanced_ImageCropperView.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Basic_ImageCropperView.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/BoundingBox_ImageCropperView.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper.dox

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper_Icon.png

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.imagecropper/resources/icon.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/resources/icon29.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/ImageCropperControls.ui

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h

Merge branch 'T19984-ImageCropperIntegration'2d5391172315Actions

Description

Details

Event Timeline

Merged Changes

Changes (46)

rMITK2d5391172315

Modules/BoundingShape/CMakeLists.txt

Modules/BoundingShape/files.cmake

Modules/BoundingShape/include/mitkBoundingShapeCropper.h

Modules/BoundingShape/include/mitkBoundingShapeInteractor.h

Modules/BoundingShape/include/mitkBoundingShapeObjectFactory.h

Modules/BoundingShape/include/mitkBoundingShapeVtkMapper2D.h

Modules/BoundingShape/include/mitkBoundingShapeVtkMapper3D.h

Modules/BoundingShape/resource/Interactions/BoundingShapeInteraction.xml

Modules/BoundingShape/resource/Interactions/BoundingShapeKeyConfig.xml

Modules/BoundingShape/resource/Interactions/BoundingShapeMouseConfig.xml

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeCropper.cpp

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeObjectFactory.cpp

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeUtil.cpp

Modules/BoundingShape/src/DataManagement/mitkBoundingShapeUtil.h

Modules/BoundingShape/src/Interactions/mitkBoundingShapeInteractor.cpp

Modules/BoundingShape/src/Rendering/mitkBoundingShapeVtkMapper2D.cpp

Modules/BoundingShape/src/Rendering/mitkBoundingShapeVtkMapper3D.cpp

Modules/ModuleList.cmake

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

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Advanced_ImageCropperView.png

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Basic_ImageCropperView.png

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/BoundingBox_ImageCropperView.png

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper.dox

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper_Icon.png

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

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

Plugins/org.mitk.gui.qt.imagecropper/resources/icon.png

Plugins/org.mitk.gui.qt.imagecropper/resources/icon29.png

Plugins/org.mitk.gui.qt.imagecropper/src/internal/ImageCropperControls.ui

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h

Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp

Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h

Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.cpp

Plugins/org.mitk.gui.qt.imagecropper/src/internal/org_mitk_gui_qt_imagecropper_Activator.h

Merge branch 'T19984-ImageCropperIntegration'
2d5391172315
Actions