Diffusion MITK 9c0f5ed69027

Merge segmentation plugin
9c0f5ed69027
Actions

Description

Merge segmentation plugin

Summary:

Clean segmentation view
Clean ui-file
Add layers widget
Add labels widget
Make icons part of the SegmentationUI resources
Add labelset widget
Do not show dialog on new segmentation creation
Update interpolator widget if only a single label is present
Add keyboard shortcuts
Make segmentation tool names consistent
Add a member variable for the "draw outline" property
Clean segmentation preference page
Remove multilabel segmentation preference page
Remove multilabel segmentation view / controls

Test Plan: manual testing

Reviewers: floca, kislinsk, O1 MITK Reviewer Group I

Reviewed By: kislinsk, O1 MITK Reviewer Group I

Subscribers: kalali, kislinsk, floca

Maniphest Tasks: T28142

Differential Revision: https://phabricator.mitk.org/D601

Details

Provenance

kalali	Authored on Feb 25 2022, 4:22 PM
kalali	Pushed on Mar 21 2022, 6:36 AM

Reviewer

O1: MITK Reviewer Group I

Differential Revision

Restricted Differential Revision

Parents

rMITK6582705bee86: Remove multilabel segmentation view / controls
rMITKff066e0efa89: Paint tool uses the correct contour color

Branches

Unknown

Tags

Unknown

Tasks

T28142: [Segmentation] Remove plugin redundancy with MultiLabelSegmentation

Event Timeline

kalali committed rMITK9c0f5ed69027: Merge segmentation plugin (authored by kalali).Mar 21 2022, 6:36 AM

kalali added a task: T28142: [Segmentation] Remove plugin redundancy with MultiLabelSegmentation.

kalali added an edge: Restricted Differential Revision.

kislinsk mentioned this in T29046: 2022 Week 12 (Late March).Mar 23 2022, 11:23 AM

Merged Changes

6582705bee86 Remove multilabel segmentation view / controls
Author
kalali
Browse Repository
No Builds
No Audits
e98fe9ea9f9b Remove multilabel segmentation preference page
Author
kalali
Browse Repository
No Builds
No Audits
db87646fc7e7 Clean segmentation preference page
Author
kalali
Browse Repository
No Builds
No Audits
e227e6770d09 Add a member variable for the "draw outline" property
Author
kalali
Browse Repository
No Builds
No Audits
8d84d6c4da44 Make segmentation tool names consistent
Author
kalali
Browse Repository
No Builds
No Audits
a572f824d429 Add keyboard shortcuts
Author
kalali
Browse Repository
No Builds
No Audits
32320c0eb8a1 Update interpolator widget if only a single label is present
Author
kalali
Browse Repository
No Builds
No Audits
b2f602ab37d5 Do not show dialog on new segmentation creation
Author
kalali
Browse Repository
No Builds
No Audits
cba482649840 Add labelset widget
Author
kalali
Browse Repository
No Builds
No Audits
d081bbc7adf0 Make icons part of the SegmentationUI resources
Author
kalali
Browse Repository
No Builds
No Audits
1a83084742ec Add labels widget
Author
kalali
Browse Repository
No Builds
No Audits
2ae991c5942e Add layers widget
Author
kalali
Browse Repository
No Builds
No Audits
5a1d785f6d45 Clean ui-file
Author
kalali
Browse Repository
No Builds
No Audits
c353a4ed8aa4 Clean segmentation view
Author
kalali
Browse Repository
No Builds
No Audits

Changes (44)

Path

Size

Packages

Modules/

Multilabel/

files.cmake

O1: MITK Reviewer Group I

mitkLabelSetImageHelper.cpp

O1: MITK Reviewer Group I

mitkLabelSetImageHelper.h

O1: MITK Reviewer Group I

Segmentation/

Interactions/

mitkFastMarchingTool.cpp

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkLabelSetWidget.cpp

O1: MITK Reviewer Group I

QmitkLabelSetWidget.h

O1: MITK Reviewer Group I

resources/

SegmentationUI.qrc

O1: MITK Reviewer Group I

	Modules/	SegmentationUI/	resources/
	Plugins/	org.mitk.gui.qt.multilabelsegmentation/	resources/

NewLabel_48x48.png

O1: MITK Reviewer Group I

	NewSegmentation_48x48.png
	NewSegmentationSession_48x48.png

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.multilabelsegmentation/

files.cmake

plugin.xml

resources/

NewLabel_48x48.png

NewSegmentationSession_48x48.png

multilabelsegmentation.qrc

src/

QmitkMultiLabelSegmentationPreferencePage.cpp

QmitkMultiLabelSegmentationPreferencePage.h

internal/

QmitkCreateMultiLabelPresetAction.cpp

QmitkCreateMultiLabelPresetAction.h

QmitkCreateMultiLabelSegmentationAction.cpp

QmitkLoadMultiLabelPresetAction.cpp

QmitkLoadMultiLabelPresetAction.h

QmitkMultiLabelSegmentationControls.ui

QmitkMultiLabelSegmentationView.cpp

QmitkMultiLabelSegmentationView.h

mitkPluginActivator.cpp

org.mitk.gui.qt.segmentation/

files.cmake

O1: MITK Reviewer Group I

plugin.xml

O1: MITK Reviewer Group I

src/

QmitkSegmentationPreferencePage.cpp

O1: MITK Reviewer Group I

QmitkSegmentationPreferencePage.h

O1: MITK Reviewer Group I

internal/

Common/

QmitkLabelsWidget.cpp

O1: MITK Reviewer Group I

QmitkLabelsWidget.h

O1: MITK Reviewer Group I

QmitkLabelsWidgetControls.ui

O1: MITK Reviewer Group I

QmitkLayersWidget.cpp

O1: MITK Reviewer Group I

QmitkLayersWidget.h

O1: MITK Reviewer Group I

QmitkLayersWidgetControls.ui

O1: MITK Reviewer Group I

QmitkSegmentationControls.ui

O1: MITK Reviewer Group I

QmitkSegmentationView.cpp

O1: MITK Reviewer Group I

QmitkSegmentationView.h

O1: MITK Reviewer Group I

	QmitkSegmentationViewControls.ui
	QmitkSegmentationControls.ui

O1: MITK Reviewer Group I

mitkPluginActivator.cpp

O1: MITK Reviewer Group I

	org.mitk.gui.qt.segmentation/	src/	internal/
	org.mitk.gui.qt.multilabelsegmentation/	src/	internal/

QmitkLoadMultiLabelPresetAction.cpp

O1: MITK Reviewer Group I

QmitkLoadMultiLabelPresetAction.h

O1: MITK Reviewer Group I

	QmitkSaveMultiLabelPresetAction.cpp
	QmitkCreateMultiLabelPresetAction.cpp

O1: MITK Reviewer Group I

	QmitkSaveMultiLabelPresetAction.h
	QmitkCreateMultiLabelPresetAction.h

O1: MITK Reviewer Group I

rMITK9c0f5ed69027

View Options

Modules/Multilabel/files.cmake

View Options

Modules/Multilabel/mitkLabelSetImageHelper.cpp

View Options

Modules/Multilabel/mitkLabelSetImageHelper.h

View Options

Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp

View Options

Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.cpp

View Options

Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.h

View Options

Modules/SegmentationUI/resources/NewLabel_48x48.png

View Options

Modules/SegmentationUI/resources/NewSegmentation_48x48.png

View Options

Modules/SegmentationUI/resources/SegmentationUI.qrc

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewLabel_48x48.png

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewSegmentationSession_48x48.png

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.qrc

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.h

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelSegmentationAction.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.h

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationControls.ui

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationView.cpp

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationView.h

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkLabelsWidgetControls.ui

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkLayersWidgetControls.ui

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkLoadMultiLabelPresetAction.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSaveMultiLabelPresetAction.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSaveMultiLabelPresetAction.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp

Merge segmentation plugin9c0f5ed69027Actions

Description

Details

Event Timeline

Merged Changes

Changes (44)

rMITK9c0f5ed69027

Modules/Multilabel/files.cmake

Modules/Multilabel/mitkLabelSetImageHelper.cpp

Modules/Multilabel/mitkLabelSetImageHelper.h

Modules/Segmentation/Interactions/mitkFastMarchingTool.cpp

Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.cpp

Modules/SegmentationUI/Qmitk/QmitkLabelSetWidget.h

Modules/SegmentationUI/resources/NewLabel_48x48.png

Modules/SegmentationUI/resources/NewSegmentation_48x48.png

Modules/SegmentationUI/resources/SegmentationUI.qrc

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

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

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewLabel_48x48.png

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/NewSegmentationSession_48x48.png

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.qrc

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/QmitkMultiLabelSegmentationPreferencePage.h

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelPresetAction.h

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkCreateMultiLabelSegmentationAction.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkLoadMultiLabelPresetAction.h

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationControls.ui

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationView.cpp

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/QmitkMultiLabelSegmentationView.h

Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/mitkPluginActivator.cpp

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

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

Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp

Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h

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

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

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkLabelsWidgetControls.ui

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

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

Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkLayersWidgetControls.ui

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkLoadMultiLabelPresetAction.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkLoadMultiLabelPresetAction.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSaveMultiLabelPresetAction.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSaveMultiLabelPresetAction.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationViewControls.ui

Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp

Merge segmentation plugin
9c0f5ed69027
Actions