Diffusion MITK 4cdb7d2390d6

Merge branch 'bug-17810-contourmodel-to-image-integration'
4cdb7d2390d6
Actions

Description

Merge branch 'bug-17810-contourmodel-to-image-integration'

Details

Provenance

• fetzer

Authored on Jan 15 2015, 10:18 AM

Parents

rMITKbd3d260fc6f4: Added improved icon
rMITKa678db47f492: Merge branch 'bug-18611-EnhanceAccessorDocumentation'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK4cdb7d2390d6: Merge branch 'bug-17810-contourmodel-to-image-integration' (authored by • fetzer).Jan 15 2015, 10:18 AM

Merged Changes

bd3d260fc6f4 Added improved icon
Author
• fetzer
Browse Repository
No Builds
No Audits
44c395269e87 Added test for ContourModelSetToImageFilter
Author
• fetzer
Browse Repository
No Builds
No Audits
3ccdc87f3ee4 The SurfaceInterpolation module does not need to depend on the ImageExtraction…
Author
• fetzer
Browse Repository
No Builds
No Audits
b42ef0b0df15 Fixed crash during writing contours into a slice. Reason was a wrong…
Author
• fetzer
Browse Repository
No Builds
No Audits
f19b093b1612 Merge remote-tracking branch 'origin/bug-17810-contourmodel-to-image-2014-03'…
Author
• fetzer
Browse Repository
No Builds
No Audits
5549ef4ed999 Merge branch 'bug-18505-registration-customization' into releases/2014-10
Author
zelzer
Browse Repository
No Builds
No Audits
42d746334422 Removed deformable and advanced rigit registration.
Author
zelzer
Browse Repository
No Builds
No Audits
0ec5bed39af9 Merge branch 'bug-18250-AddTimeSliceFeatureToRelease' into releases/2014-10
Author
kislinsk
Browse Repository
No Builds
No Audits
30297b38d808 Wrote documentation for Time animation
Author
kislinsk
Browse Repository
No Builds
No Audits
a86c6b4880a9 Fixed minor bugs in QmitkTimeSliceAnimationWidget.
Author
kislinsk
Browse Repository
No Builds
No Audits
cd4742dfe9b3 Add new AnimationItem and Widget for time slicing
Author
• kolbch
Browse Repository
No Builds
No Audits
1005d0b83190 Merge branch 'bug-18250-AddDownloadHintsForFFmpegAndLibav' into releases/2014-10
Author
kislinsk
Browse Repository
No Builds
No Audits
fae7c227eb45 Added download hints for FFmpeg and Libav.
Author
kislinsk
Browse Repository
No Builds
No Audits
14c58e4f5abc Merge branch 'bug-18470-update-segmentation-docu' into releases/2014-10
Author
• fetzer
Browse Repository
No Builds
No Audits
24766df30660 Merge branch 'bug-14866-reader-writer-documentation' into releases/2014-10
Author
zelzer
Browse Repository
No Builds
No Audits
a1e8fbf5bf4e Added icon for ContourToImageWidget
Author
• fetzer
Browse Repository
No Builds
No Audits
76e30e2a240c Moved logic to ContourModelSetToImageFilter. Still WIP since rotated contours…
Author
• fetzer
Browse Repository
No Builds
No Audits
a8d0cdb79c2e Writing contours back into the image is working if the contours lies either on…
Author
• fetzer
Browse Repository
No Builds
No Audits
17a0db28cee4 Enhanced utilities for ContourToImageWidget
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

Modules/

Segmentation/

Algorithms/

mitkContourModelSetToImageFilter.cpp

O1: MITK Reviewer Group I

mitkContourModelSetToImageFilter.h

O1: MITK Reviewer Group I

Testing/

files.cmake

O1: MITK Reviewer Group I

mitkContourModelSetToImageFilterTest.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

SurfaceInterpolation/

CMakeLists.txt

Plugins/

org.mitk.gui.qt.registration/

plugin.xml

src/

internal/

QmitkRigidRegistrationView.cpp

org.mitk.gui.qt.segmentation/

files.cmake

O1: MITK Reviewer Group I

resources/

ContourModelSetToImage_48x48.png

O1: MITK Reviewer Group I

SegmentationUtilities.qrc

O1: MITK Reviewer Group I

src/

internal/

Common/

QmitkDataSelectionWidget.cpp

O1: MITK Reviewer Group I

QmitkDataSelectionWidget.h

O1: MITK Reviewer Group I

SegmentationUtilities/

ContourModelToImage

O1: MITK Reviewer Group I

QmitkContourModelToImageWidget.cpp

O1: MITK Reviewer Group I

	ContourModelToImage/
	ImageMasking/

	QmitkContourModelToImageWidget.h
	QmitkImageMaskingWidget.h

O1: MITK Reviewer Group I

	ContourModelToImage/
	SurfaceToImage/

	QmitkContourModelToImageWidgetControls.ui
	QmitkSurfaceToImageWidgetControls.ui

O1: MITK Reviewer Group I

QmitkSegmentationUtilitiesView.cpp

O1: MITK Reviewer Group I

QmitkSegmentationUtilitiesView.h

O1: MITK Reviewer Group I

rMITK4cdb7d2390d6

View Options

Modules/Segmentation/Algorithms/mitkContourModelSetToImageFilter.cpp

View Options

Modules/Segmentation/Algorithms/mitkContourModelSetToImageFilter.h

View Options

Modules/Segmentation/Testing/files.cmake

View Options

Modules/Segmentation/Testing/mitkContourModelSetToImageFilterTest.cpp

View Options

Modules/Segmentation/files.cmake

View Options

Modules/SurfaceInterpolation/CMakeLists.txt

View Options

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

View Options

Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/resources/ContourModelSetToImage_48x48.png

View Options

Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h

Merge branch 'bug-17810-contourmodel-to-image-integration'4cdb7d2390d6Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITK4cdb7d2390d6

Modules/Segmentation/Algorithms/mitkContourModelSetToImageFilter.cpp

Modules/Segmentation/Algorithms/mitkContourModelSetToImageFilter.h

Modules/Segmentation/Testing/files.cmake

Modules/Segmentation/Testing/mitkContourModelSetToImageFilterTest.cpp

Modules/Segmentation/files.cmake

Modules/SurfaceInterpolation/CMakeLists.txt

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

Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp

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

Plugins/org.mitk.gui.qt.segmentation/resources/ContourModelSetToImage_48x48.png

Plugins/org.mitk.gui.qt.segmentation/resources/SegmentationUtilities.qrc

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidget.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ContourModelToImage/QmitkContourModelToImageWidgetControls.ui

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/QmitkSegmentationUtilitiesView.h

Merge branch 'bug-17810-contourmodel-to-image-integration'
4cdb7d2390d6
Actions