Diffusion MITK da6e347c2b93

Merge branch 'bug-18646-labelset-image-for-segmentation'
da6e347c2b93
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-18646-labelset-image-for-segmentation'

Conflicts:
CMakeExternals/MITKData.cmake
Modules/Multilabel/mitkLabelSetImage.cpp
Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp

Details

Provenance

Authored on Aug 12 2015, 4:32 PM

Parents

rMITKed87331898a5: Removed unused variable
rMITKa1aa8706ca68: Merge branch 'bug-19231-RemoveDuplicatePlanarFigureInteractionSourceFile'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITKda6e347c2b93: Merge branch 'bug-18646-labelset-image-for-segmentation' (authored by • fetzer).Aug 12 2015, 4:32 PM

Merged Changes

ed87331898a5 Removed unused variable
Author
• fetzer
Browse Repository
No Builds
No Audits
189e7911dd49 Fixed tool interaction test
Author
• fetzer
Browse Repository
No Builds
No Audits
89e70b503254 Fixed LabelSetImageIOTest failure
Author
• fetzer
Browse Repository
No Builds
No Audits
31650695c5a4 Added braces consistently
Author
• fetzer
Browse Repository
No Builds
No Audits
a18f5868490f Fixed build errors
Author
• fetzer
Browse Repository
No Builds
No Audits
5141b9eae76a Fixed confirmation of 3D interpolation for mitkLabelSetImage
Author
• fetzer
Browse Repository
No Builds
No Audits
fa8185b6861e Apdations to mitkSurfaceToImageFilter
Author
• fetzer
Browse Repository
No Builds
No Audits
80ea4b3b3199 Compare component types instead of pixel type vs component type
Author
• goch
Browse Repository
No Builds
No Audits
c6def6f9e55a Switch Otsu and Picking to multilabel output
Author
• goch
Browse Repository
No Builds
No Audits
b728cf4e8a02 Enable unsigned char and unsigned short masking
Author
• goch
Browse Repository
No Builds
No Audits
659c328ee979 Allow morphological operations for any pixeltype
Author
• goch
Browse Repository
No Builds
No Audits
fa14ede13da5 Boolean operations output multilabel images
Author
• goch
Browse Repository
No Builds
No Audits
4d30df26deae Fix 3D interpolation
Author
• goch
Browse Repository
No Builds
No Audits
31c749f135b6 More typenames
Author
• goch
Browse Repository
No Builds
No Audits
6bbb56cd3457 Fixes for mac/linux compatibility
Author
• goch
Browse Repository
No Builds
No Audits
57f9784d87f2 Correction tool handle different pixel types differently
Author
• goch
Browse Repository
No Builds
No Audits
5c9aab57afde Separate Access Macro for 4D
Author
• goch
Browse Repository
No Builds
No Audits
806b16456e54 Use active color as fill color for label set images
Author
• goch
Browse Repository
No Builds
No Audits
9e9ff5197f19 Removed image typedef
Author
• goch
Browse Repository
No Builds
No Audits
ec6ef3ef9759 Remove unnecessary typedefs
Author
• goch
Browse Repository
No Builds
No Audits
a744d5a822fa Add labelset setting for loading
Author
• goch
Browse Repository
No Builds
No Audits
83ca5a1fae1a Handle VectorImages and Images separately
Author
• goch
Browse Repository
No Builds
No Audits
9b7a291387c7 Properly set geometry for new layers
Author
• goch
Browse Repository
No Builds
No Audits
f7e25b22447a Using alternative method to create mitk images from single layer-labelsetimages
Author
• goch
Browse Repository
No Builds
No Audits
390b39b5c831 reading and writing - geometry fits
Author
• goch
Browse Repository
No Builds
No Audits
6e1c6b2be586 implementing read/write
Author
• goch
Browse Repository
No Builds
No Audits
e4f148075ccd Add Converter
Author
• goch
Browse Repository
No Builds
No Audits
6653fde31021 Move conversion code to helper class
Author
• goch
Browse Repository
No Builds
No Audits
613ba6ed2517 Use different initialize to avoid dimensions with extent 1 being ignored
Author
• goch
Browse Repository
No Builds
No Audits
fef95f95b888 Replace correction tool pixel type
Author
• goch
Browse Repository
No Builds
No Audits
975b3ba4fb83 Move png to correct location, delete wrong include
Author
• goch
Browse Repository
No Builds
No Audits
5260c9e26018 Merge remote-tracking branch 'origin/bug-18646-labelset-image-for-segmentation'…
Author
• goch
Browse Repository
No Builds
No Audits
4c4f87eb843d Initial commit
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (36)

Path

Size

Packages

CMakeExternals/

O1: MITK Reviewer Group I

Modules/

AlgorithmsExt/

src/

mitkMaskImageFilter.cpp

Core/

include/

mitkSurfaceToImageFilter.h

O1: MITK Reviewer Group I

src/

Algorithms/

mitkSurfaceToImageFilter.cpp

O1: MITK Reviewer Group I

DataManagement/

mitkLevelWindowManager.cpp

O1: MITK Reviewer Group I

test/

mitkSurfaceToImageFilterTest.cpp

O1: MITK Reviewer Group I

Multilabel/

O1: MITK Reviewer Group I

mitkLabelSetImage.cpp

O1: MITK Reviewer Group I

mitkLabelSetImage.h

O1: MITK Reviewer Group I

mitkLabelSetImageConverter.cpp

O1: MITK Reviewer Group I

mitkLabelSetImageConverter.h

O1: MITK Reviewer Group I

mitkLabelSetImageIO.cpp

O1: MITK Reviewer Group I

mitkLabelSetImageIO.h

O1: MITK Reviewer Group I

QtWidgets/

resource/

LabelSetImage_48.png

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

src/

QmitkNodeDescriptorManager.cpp

O3: MITK Reviewer Group II

Segmentation/

Algorithms/

mitkCorrectorAlgorithm.cpp

O1: MITK Reviewer Group I

mitkCorrectorAlgorithm.h

O1: MITK Reviewer Group I

Interactions/

mitkBinaryThresholdULTool.cpp

O1: MITK Reviewer Group I

mitkCorrectorTool2D.cpp

O1: MITK Reviewer Group I

mitkFastMarchingTool.h

O1: MITK Reviewer Group I

mitkFastMarchingTool3D.h

O1: MITK Reviewer Group I

mitkOtsuTool3D.cpp

O1: MITK Reviewer Group I

mitkPickingTool.cpp

O1: MITK Reviewer Group I

mitkRegionGrow3DTool.cpp

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

SegmentationUtilities/

BooleanOperations/

mitkBooleanOperation.cpp

O1: MITK Reviewer Group I

mitkBooleanOperation.h

O1: MITK Reviewer Group I

MorphologicalOperations/

mitkMorphologicalOperations.cpp

O1: MITK Reviewer Group I

Testing/

mitkToolInteractionTest.cpp

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkAdaptiveRegionGrowingToolGUI.cpp

O1: MITK Reviewer Group I

QmitkSlicesInterpolator.cpp

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkComputeContourSetNormalsFilter.cpp

Plugins/

org.mitk.gui.qt.segmentation/

src/

internal/

SegmentationUtilities/

SurfaceToImage/

QmitkSurfaceToImageWidget.cpp

O1: MITK Reviewer Group I

QmitkSurfaceToImageWidget.h

O1: MITK Reviewer Group I

rMITKda6e347c2b93

CMakeExternals/MITKData.cmake

Loading...

Modules/AlgorithmsExt/src/mitkMaskImageFilter.cpp

Loading...

Modules/Core/include/mitkSurfaceToImageFilter.h

Loading...

Modules/Core/src/Algorithms/mitkSurfaceToImageFilter.cpp

Loading...

Modules/Core/src/DataManagement/mitkLevelWindowManager.cpp

Loading...

Modules/Core/test/mitkSurfaceToImageFilterTest.cpp

Loading...

Modules/Multilabel/files.cmake

Loading...

Modules/Multilabel/mitkLabelSetImage.cpp

Loading...

Modules/Multilabel/mitkLabelSetImage.h

Loading...

Modules/Multilabel/mitkLabelSetImageConverter.cpp

Loading...

Modules/Multilabel/mitkLabelSetImageConverter.h

Loading...

Modules/Multilabel/mitkLabelSetImageIO.cpp

Loading...

Modules/Multilabel/mitkLabelSetImageIO.h

Loading...

Modules/QtWidgets/resource/LabelSetImage_48.png

Loading...

Modules/QtWidgets/resource/Qmitk.qrc

Loading...

Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp

Loading...

Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.cpp

Loading...

Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.h

Loading...

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

Loading...

Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp

Loading...

Modules/Segmentation/Interactions/mitkFastMarchingTool.h

Loading...

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.h

Loading...

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

Loading...

Modules/Segmentation/Interactions/mitkPickingTool.cpp

Loading...

Modules/Segmentation/Interactions/mitkRegionGrow3DTool.cpp

Loading...

Modules/Segmentation/Interactions/mitkTool.cpp

Loading...

Modules/Segmentation/Interactions/mitkTool.h

Loading...

Modules/Segmentation/SegmentationUtilities/BooleanOperations/mitkBooleanOperation.cpp

Loading...

Modules/Segmentation/SegmentationUtilities/BooleanOperations/mitkBooleanOperation.h

Loading...

Modules/Segmentation/SegmentationUtilities/MorphologicalOperations/mitkMorphologicalOperations.cpp

Loading...

Modules/Segmentation/Testing/mitkToolInteractionTest.cpp

Loading...

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUI.cpp

Loading...

Modules/SegmentationUI/Qmitk/QmitkSlicesInterpolator.cpp

Loading...

Modules/SurfaceInterpolation/mitkComputeContourSetNormalsFilter.cpp

Loading...

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

Loading...

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

Loading...