Diffusion MITK 5260c9e26018

Merge remote-tracking branch 'origin/bug-18646-labelset-image-for…
5260c9e26018
Actions

Description

Merge remote-tracking branch 'origin/bug-18646-labelset-image-for-segmentation' into local/multilabel

Conflicts:
Modules/Segmentation/Interactions/mitkTool.cpp

Details

Provenance

• goch

Authored on Jun 18 2015, 10:51 AM

Parents

rMITK4c4f87eb843d: Initial commit
rMITK02ba25f29671: Merge branch 'bug-19026-implement-connectomics-text-overlay-for-nodes-2'

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITK5260c9e26018: Merge remote-tracking branch 'origin/bug-18646-labelset-image-for… (authored by • goch).Jun 18 2015, 10:51 AM

Merged Changes

4c4f87eb843d Initial commit
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Packages

Modules/

QtWidgets/

LabelSetImage_48.png

O3: MITK Reviewer Group II

resource/

Qmitk.qrc

O3: MITK Reviewer Group II

src/

QmitkNodeDescriptorManager.cpp

O3: MITK Reviewer Group II

Segmentation/

Interactions/

mitkBinaryThresholdULTool.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

mitkRegionGrow3DTool.cpp

O1: MITK Reviewer Group I

mitkTool.cpp

O1: MITK Reviewer Group I

mitkTool.h

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkAdaptiveRegionGrowingToolGUI.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.segmentation/

src/

internal/

SegmentationUtilities/

SurfaceToImage/

QmitkSurfaceToImageWidget.cpp

O1: MITK Reviewer Group I

QmitkSurfaceToImageWidget.h

O1: MITK Reviewer Group I

rMITK5260c9e26018

View Options

Modules/QtWidgets/LabelSetImage_48.png

View Options

Modules/QtWidgets/resource/Qmitk.qrc

View Options

Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp

View Options

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

View Options

Modules/Segmentation/Interactions/mitkFastMarchingTool.h

View Options

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.h

View Options

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

View Options

Modules/Segmentation/Interactions/mitkRegionGrow3DTool.cpp

View Options

Modules/Segmentation/Interactions/mitkTool.cpp

View Options

Modules/Segmentation/Interactions/mitkTool.h

View Options

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUI.cpp

View Options

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

View Options

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

Merge remote-tracking branch 'origin/bug-18646-labelset-image-for…5260c9e26018Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK5260c9e26018

Modules/QtWidgets/LabelSetImage_48.png

Modules/QtWidgets/resource/Qmitk.qrc

Modules/QtWidgets/src/QmitkNodeDescriptorManager.cpp

Modules/Segmentation/Interactions/mitkBinaryThresholdULTool.cpp

Modules/Segmentation/Interactions/mitkFastMarchingTool.h

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.h

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

Modules/Segmentation/Interactions/mitkRegionGrow3DTool.cpp

Modules/Segmentation/Interactions/mitkTool.cpp

Modules/Segmentation/Interactions/mitkTool.h

Modules/SegmentationUI/Qmitk/QmitkAdaptiveRegionGrowingToolGUI.cpp

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

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

Merge remote-tracking branch 'origin/bug-18646-labelset-image-for…
5260c9e26018
Actions