Merge branch 'T23077-ProjectShapeComparison' into T23077-ProjectShapeComparison2
2a8c10388793
Actions

Description

Merge branch 'T23077-ProjectShapeComparison' into T23077-ProjectShapeComparison2

Details

Provenance

• hempe	Authored on Jul 31 2017, 2:24 PM
• hempe	Pushed on Jul 31 2017, 2:25 PM

Parents

rMITKcccffa31bc7a: Merge branch 'T23129-LinuxQtPlugins'
rMITK734437eceba4: some refactoring

Branches

Unknown

Tags

Unknown

Event Timeline

• hempe committed rMITK2a8c10388793: Merge branch 'T23077-ProjectShapeComparison' into T23077-ProjectShapeComparison2 (authored by • hempe).Jul 31 2017, 2:24 PM

Merged Changes

734437eceba4 some refactoring
Author
• hempe
Browse Repository
No Builds
No Audits
d4d729735b5a moved icp registration into module ->refactoring
Author
• hempe
Browse Repository
No Builds
No Audits
de1401feb1e5 cleaned up MitkShapeComparisonManager and created empty classes for…
Author
• hempe
Browse Repository
No Builds
No Audits
c140880b309d icp works on preregistered surfaces
Author
• hempe
Browse Repository
No Builds
No Audits
5d6004c68554 performICPRegistration changed into own method
Author
• hempe
Browse Repository
No Builds
No Audits
75b59dcc6584 trying to use icp for surfaceregistration
Author
• hempe
Browse Repository
No Builds
No Audits
8c971c9b1a40 added radioButton for mirroring
Author
• hempe
Browse Repository
No Builds
No Audits
14c8d05d1f53 added QMessageBoxes for "not a surface" and "more than two". Also did some…
Author
• hempe
Browse Repository
No Builds
No Audits
2292f64a63c5 Changes at the AwesomeExamplePlugin
Author
• hempe
Browse Repository
No Builds
No Audits
2b8064f02662 initial commit
Author
• hempe
Browse Repository
No Builds
No Audits

Changes (77)

Path

Size

Examples/

Tutorial/

Step2/

Modules/

AwesomeImageInteractor.h

AwesomeImageFilter.cpp

AwesomeImageInteractor.cpp

MitkShapeComparisonManager.h

mitkShortestDistanceCalculator.h

mitkSurfaceRegistrationICP.h

MitkShortestDistanceCalculator.cpp

mitkSurfaceRegistrationICP.cpp

mitkShapeComparisonManager.cpp

Plugins/

PluginList.cmake

org.mitk.gui.qt.exampleplugin

manifest_headers.cmake

AwesomePluginActivator.cpp

AwesomePluginActivator.h

AwesomeView.cpp

AwesomeView.h

AwesomeViewControls.ui

	org.mitk.gui.qt.exampleplugin/	documentation/	UserManual/
	org.mitk.gui.qt.igt.app.echotrack/	documentation/	UserManual/

icon.xpm

org.mitk.gui.qt.surfaceregistration

manifest_headers.cmake

QmitkSurfaceRegistration.cpp

QmitkSurfaceRegistration.h

SurfaceRegistrationControls.ui

org_mitk_gui_qt_surfaceregistration_Activator.cpp

org_mitk_gui_qt_surfaceregistration_Activator.h

	org.mitk.gui.qt.surfaceregistration/	documentation/	UserManual/
	org.mitk.gui.qt.imagecropper/	documentation/	UserManual/

Advanced_ImageCropperView.png

Basic_ImageCropperView.png

BoundingBox_ImageCropperView.png

QmitkImageCropper.dox

QmitkImageCropper_Icon.png

rMITK2a8c10388793

View Options

Examples/Tutorial/Step2/Step2.cpp

View Options

Modules/ModuleList.cmake

View Options

Modules/MyAwesomeLib/CMakeLists.txt

View Options

Modules/MyAwesomeLib/files.cmake

View Options

Modules/MyAwesomeLib/include/AwesomeImageFilter.h

View Options

Modules/MyAwesomeLib/include/AwesomeImageInteractor.h

View Options

Modules/MyAwesomeLib/resource/Interactions/Paint.xml

View Options

Modules/MyAwesomeLib/resource/Interactions/PaintConfig.xml

View Options

Modules/MyAwesomeLib/src/AwesomeImageFilter.cpp

View Options

Modules/MyAwesomeLib/src/AwesomeImageInteractor.cpp

View Options

Modules/SurfaceRegistration/CMakeLists.txt

View Options

Modules/SurfaceRegistration/files.cmake

View Options

Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h

View Options

Modules/SurfaceRegistration/include/mitkShortestDistanceCalculator.h

View Options

Modules/SurfaceRegistration/include/mitkSurfaceRegistrationICP.h

View Options

Modules/SurfaceRegistration/resource/Interactions/Paint.xml

View Options

Modules/SurfaceRegistration/resource/Interactions/PaintConfig.xml

View Options

Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp

View Options

Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp

View Options

Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp

View Options

Plugins/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.exampleplugin/resources/AwesomeIcon.png

View Options

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomePluginActivator.cpp

View Options

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomePluginActivator.h

View Options

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeView.cpp

View Options

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeView.h

View Options

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeViewControls.ui

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/AwesomeView.cpp

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/AwesomeView.h

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.h

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/SurfaceRegistrationControls.ui

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/org_mitk_gui_qt_surfaceregistration_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/org_mitk_gui_qt_surfaceregistration_Activator.h

Merge branch 'T23077-ProjectShapeComparison' into T23077-ProjectShapeComparison22a8c10388793Actions

Description

Details

Event Timeline

Merged Changes

Changes (77)

rMITK2a8c10388793

Examples/Tutorial/Step2/Step2.cpp

Modules/ModuleList.cmake

Modules/MyAwesomeLib/CMakeLists.txt

Modules/MyAwesomeLib/files.cmake

Modules/MyAwesomeLib/include/AwesomeImageFilter.h

Modules/MyAwesomeLib/include/AwesomeImageInteractor.h

Modules/MyAwesomeLib/resource/Interactions/Paint.xml

Modules/MyAwesomeLib/resource/Interactions/PaintConfig.xml

Modules/MyAwesomeLib/src/AwesomeImageFilter.cpp

Modules/MyAwesomeLib/src/AwesomeImageInteractor.cpp

Modules/SurfaceRegistration/CMakeLists.txt

Modules/SurfaceRegistration/files.cmake

Modules/SurfaceRegistration/include/MitkShapeComparisonManager.h

Modules/SurfaceRegistration/include/mitkShortestDistanceCalculator.h

Modules/SurfaceRegistration/include/mitkSurfaceRegistrationICP.h

Modules/SurfaceRegistration/resource/Interactions/Paint.xml

Modules/SurfaceRegistration/resource/Interactions/PaintConfig.xml

Modules/SurfaceRegistration/src/DataManagement/MitkShortestDistanceCalculator.cpp

Modules/SurfaceRegistration/src/DataManagement/mitkSurfaceRegistrationICP.cpp

Modules/SurfaceRegistration/src/mitkShapeComparisonManager.cpp

Plugins/PluginList.cmake

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.exampleplugin/resources/AwesomeIcon.png

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomePluginActivator.cpp

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomePluginActivator.h

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeView.cpp

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeView.h

Plugins/org.mitk.gui.qt.exampleplugin/src/internal/AwesomeViewControls.ui

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

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

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

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

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/AwesomeView.cpp

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/AwesomeView.h

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.cpp

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/QmitkSurfaceRegistration.h

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/SurfaceRegistrationControls.ui

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/org_mitk_gui_qt_surfaceregistration_Activator.cpp

Plugins/org.mitk.gui.qt.surfaceregistration/src/internal/org_mitk_gui_qt_surfaceregistration_Activator.h

Merge branch 'T23077-ProjectShapeComparison' into T23077-ProjectShapeComparison2
2a8c10388793
Actions