Paths

Table of Contentst

-
Applications/FlowBench/
-
FlowBench/
-
CMakeLists.txt
-
icons/
-
mitkFlowBench.rc
-
mitkWorkbench.rc
-
CMake/Whitelists/
-
Whitelists/
-
FlowBenchSegmentation.cmake
-
Documentation/
-
Doxygen/3-DeveloperManual/Concepts/
-
3-DeveloperManual/
-
Concepts/
-
Concepts.dox
-
MITKSegmentationTaskLists.md
-
doxygen.conf.in
-
Modules/
-
Core/
-
include/
-
mitkAbstractFileReader.h
-
mitkDataNode.h
-
mitkIFileReader.h
-
mitkIOUtil.h
-
src/IO/
-
IO/
-
mitkAbstractFileReader.cpp
-
mitkIOUtil.cpp
-
DICOM/
-
include/
-
mitkDICOMIOHelper.h
-
src/
-
mitkDICOMIOHelper.cpp
-
Multilabel/
-
autoload/
-
DICOMSegIO/
-
mitkDICOMSegmentationIO.cpp
-
IO/
-
CMakeLists.txt
-
files.cmake
-
mitkMultilabelActivator.cpp
-
mitkMultilabelIOMimeTypes.cpp
-
mitkMultilabelIOMimeTypes.h
-
mitkSegmentationTaskListIO.cpp
-
mitkSegmentationTaskListIO.h
-
mitkSegmentationTaskListSerializer.cpp
-
mitkSegmentationTaskListSerializer.h
-
files.cmake
-
mitkSegmentationTaskList.cpp
-
mitkSegmentationTaskList.h
-
mitkSegmentationTaskListMacros.h
-
QtWidgets/
-
include/
-
QmitkStyleManager.h
-
src/
-
QmitkDataStorageTableModel.cpp
-
QmitkDataStorageTreeModel.cpp
-
QmitkStyleManager.cpp
-
RT/autoload/DICOMRTIO/
-
autoload/
-
DICOMRTIO/
-
mitkRTDoseReaderService.cpp
-
mitkRTPlanReaderService.cpp
-
mitkRTStructureSetReaderService.cpp
-
SceneSerialization/src/
-
src/
-
mitkSceneReaderV1.cpp
-
mitkSceneReaderV1.h
-
Segmentation/
-
Algorithms/
-
mitkSegmentationHelper.cpp
-
mitkSegmentationHelper.h
-
files.cmake
-
SegmentationUI/Qmitk/
-
Qmitk/
-
QmitkStaticDynamicSegmentationDialog.cpp
-
QmitkStaticDynamicSegmentationDialog.h
-
Plugins/
-
org.mitk.gui.qt.ext/src/internal/
-
src/
-
internal/
-
QmitkCommonExtPlugin.cpp
-
org.mitk.gui.qt.flow.segmentation/
-
files.cmake
-
resources/
-
SegmentationTaskList.qrc
-
SegmentationTaskListIcon.svg
-
src/internal/
-
internal/
-
QmitkSegmentationFlowControlView.cpp
-
QmitkSegmentationFlowControlView.h
-
QmitkSegmentationFlowControlView.ui
-
QmitkSegmentationTaskListWidget.cpp
-
QmitkSegmentationTaskListWidget.h
-
QmitkSegmentationTaskListWidget.ui
-
org_mitk_gui_qt_flow_segmentation_Activator.cpp
-
org.mitk.gui.qt.flowapplication/src/internal/
-
src/
-
internal/
-
QmitkFlowApplicationPlugin.cpp
-
QmitkFlowApplicationPlugin.h
-
org.mitk.gui.qt.segmentation/src/
-
src/
-
QmitkNewSegmentationDialog.cpp
-
QmitkNewSegmentationDialog.ui

Merge branch 'feature/T29159-SegmentationTasks' into develop
fdd0b0926156
Actions

Description

Merge branch 'feature/T29159-SegmentationTasks' into develop

Details

Provenance

kislinsk	Authored on Jul 27 2022, 9:24 AM
kislinsk	Pushed on Jul 27 2022, 9:24 AM

Parents

rMITK6897b6276b38: Merge branch 'feature/T29244-ReintroduceACVD' into develop
rMITKbf3e719e979a: Add concept page for MITK Segmentation Task Lists

Branches

Tags

Event Timeline

kislinsk committed rMITKfdd0b0926156: Merge branch 'feature/T29159-SegmentationTasks' into develop (authored by kislinsk).Jul 27 2022, 9:24 AM

kislinsk mentioned this in T29291: 2022 Week 36 (Early September).Sep 9 2022, 10:31 AM

Merged Changes

bf3e719e979a Add concept page for MITK Segmentation Task Lists
Author
kislinsk
Browse Repository
No Builds
No Audits
28f20ff8f600 Fix initialization order
Author
kislinsk
Browse Repository
No Builds
No Audits
82c30f0795b0 Fix header location for internal widget
Author
kislinsk
Browse Repository
No Builds
No Audits
caa51b97b49b Move UI class details to implementation file
Author
kislinsk
Browse Repository
No Builds
No Audits
013943e6c9de Fix return type
Author
kislinsk
Browse Repository
No Builds
No Audits
d179a2ce01b0 Remove unused variable
Author
kislinsk
Browse Repository
No Builds
No Audits
74d6324cb617 Add org.mitk.gui.qt.ext plugin to whitelist
Author
kislinsk
Browse Repository
No Builds
No Audits
12986828e45d Fix a few copy & paste errors regarding Workbench and FlowBench
Author
kislinsk
Browse Repository
No Builds
No Audits
62792bbe4f48 Change type of segmentation task paths
Author
kislinsk
Browse Repository
No Builds
No Audits
53318c47dfe3 Add label name suggestions to segmentation tasks
Author
kislinsk
Browse Repository
No Builds
No Audits
da0be0cb6adb Make current task index an optional
Author
kislinsk
Browse Repository
No Builds
No Audits
22c4cb97a7b5 Refactor and clean up code
Author
kislinsk
Browse Repository
No Builds
No Audits
9ff6146ecbae Improve unsaved changes message box text
Author
kislinsk
Browse Repository
No Builds
No Audits
744835ebfc3e Rename SegmentationTask and Subtask to SegmentationTaskList and Task
Author
kislinsk
Browse Repository
No Builds
No Audits
3203ed08de6b Keep track of unsaved changes
Author
kislinsk
Browse Repository
No Builds
No Audits
1f79eb12b334 Load segmentation if specified but no result is available
Author
kislinsk
Browse Repository
No Builds
No Audits
1185381e2202 Update predefined macros for Doxygen
Author
kislinsk
Browse Repository
No Builds
No Audits
73f970c26197 Make all subtask properties an std::optional
Author
kislinsk
Browse Repository
No Builds
No Audits
5db869a6bd01 Refactor encapsulated but independent code into a generic function
Author
kislinsk
Browse Repository
No Builds
No Audits
eeff32f7b06e Change type of name control from line edit to combo box
Author
kislinsk
Browse Repository
No Builds
No Audits
d6ec3bf3ee90 Enable switching between multiple segmentation tasks
Author
kislinsk
Browse Repository
No Builds
No Audits
806c42111ecf Add segmentation task data node to member variables
Author
kislinsk
Browse Repository
No Builds
No Audits
abef0fef0fb3 Make relative paths in segmentation tasks also work in MITK scene files
Author
kislinsk
Browse Repository
No Builds
No Audits
a3497598cc4d Give file readers access to previous base data properties
Author
kislinsk
Browse Repository
No Builds
No Audits
544e58c48f5f Put Doxygen in the right way regarding macros
Author
kislinsk
Browse Repository
No Builds
No Audits
b57c40e34a51 Move DICOMIOHelper functions into own namespace
Author
kislinsk
Browse Repository
No Builds
No Audits
03f70b20282e Add widget and icon for segmentation tasks
Author
kislinsk
Browse Repository
No Builds
No Audits
744ba0f6820b Implement first prototype of SegmentationTask class
Author
kislinsk
Browse Repository
No Builds
No Audits
d8bb0932c6ee Allow easy access to icon colors
Author
kislinsk
Browse Repository
No Builds
No Audits
cfe59b5f6791 Fix double-loading of data in MITK FlowBench
Author
kislinsk
Browse Repository
No Builds
No Audits
a095aba80ec6 Reduce name property duality
Author
kislinsk
Browse Repository
No Builds
No Audits
6b41abd6f2c8 Fix minor bug in initial data node naming
Author
kislinsk
Browse Repository
No Builds
No Audits
c5f36297ca55 Add I/O skeleton for SegmentationTask data type
Author
kislinsk
Browse Repository
No Builds
No Audits
e6923127a95d Add skeleton for new SegmentationTask data type
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (58)

Path

Size

Packages

Applications/

FlowBench/

CMakeLists.txt

icons/

	mitkFlowBench.rc
	mitkWorkbench.rc

mitkWorkbench.rc

CMake/

Whitelists/

FlowBenchSegmentation.cmake

O1: MITK Reviewer Group I

Documentation/

Doxygen/

3-DeveloperManual/

Concepts/

Concepts.dox

MITKSegmentationTaskLists.md

doxygen.conf.in

Modules/

Core/

include/

mitkAbstractFileReader.h

O1: MITK Reviewer Group I

mitkDataNode.h

O1: MITK Reviewer Group I

mitkIFileReader.h

O1: MITK Reviewer Group I

mitkIOUtil.h

O1: MITK Reviewer Group I

src/

IO/

mitkAbstractFileReader.cpp

O1: MITK Reviewer Group I

mitkIOUtil.cpp

O1: MITK Reviewer Group I

DICOM/

include/

mitkDICOMIOHelper.h

O1: MITK Reviewer Group I

src/

mitkDICOMIOHelper.cpp

O1: MITK Reviewer Group I

Multilabel/

autoload/

DICOMSegIO/

mitkDICOMSegmentationIO.cpp

O1: MITK Reviewer Group I

IO/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkMultilabelActivator.cpp

O1: MITK Reviewer Group I

mitkMultilabelIOMimeTypes.cpp

O1: MITK Reviewer Group I

mitkMultilabelIOMimeTypes.h

O1: MITK Reviewer Group I

mitkSegmentationTaskListIO.cpp

O1: MITK Reviewer Group I

mitkSegmentationTaskListIO.h

O1: MITK Reviewer Group I

mitkSegmentationTaskListSerializer.cpp

O1: MITK Reviewer Group I

mitkSegmentationTaskListSerializer.h

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkSegmentationTaskList.cpp

O1: MITK Reviewer Group I

mitkSegmentationTaskList.h

O1: MITK Reviewer Group I

mitkSegmentationTaskListMacros.h

O1: MITK Reviewer Group I

QtWidgets/

include/

QmitkStyleManager.h

O3: MITK Reviewer Group II

src/

QmitkDataStorageTableModel.cpp

O3: MITK Reviewer Group II

QmitkDataStorageTreeModel.cpp

O3: MITK Reviewer Group II

QmitkStyleManager.cpp

O3: MITK Reviewer Group II

RT/

autoload/

DICOMRTIO/

mitkRTDoseReaderService.cpp

mitkRTPlanReaderService.cpp

mitkRTStructureSetReaderService.cpp

SceneSerialization/

src/

mitkSceneReaderV1.cpp

O1: MITK Reviewer Group I

mitkSceneReaderV1.h

O1: MITK Reviewer Group I

Segmentation/

Algorithms/

mitkSegmentationHelper.cpp

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

	Segmentation/	Algorithms/
	QtWidgets/	include/

	mitkSegmentationHelper.h
	QmitkStyleManager.h

O1: MITK Reviewer Group I

SegmentationUI/

Qmitk/

QmitkStaticDynamicSegmentationDialog.cpp

O1: MITK Reviewer Group I

QmitkStaticDynamicSegmentationDialog.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.ext/

src/

internal/

QmitkCommonExtPlugin.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.flow.segmentation/

files.cmake

O3: MITK Reviewer Group II

resources/

SegmentationTaskList.qrc

O3: MITK Reviewer Group II

SegmentationTaskListIcon.svg

O3: MITK Reviewer Group II

src/

internal/

QmitkSegmentationFlowControlView.cpp

O3: MITK Reviewer Group II

QmitkSegmentationFlowControlView.h

O3: MITK Reviewer Group II

QmitkSegmentationFlowControlView.ui

O3: MITK Reviewer Group II

QmitkSegmentationTaskListWidget.cpp

O3: MITK Reviewer Group II

QmitkSegmentationTaskListWidget.h

O3: MITK Reviewer Group II

QmitkSegmentationTaskListWidget.ui

O3: MITK Reviewer Group II

org_mitk_gui_qt_flow_segmentation_Activator.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.flowapplication/

src/

internal/

QmitkFlowApplicationPlugin.cpp

O1: MITK Reviewer Group I

QmitkFlowApplicationPlugin.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.segmentation/

src/

QmitkNewSegmentationDialog.cpp

O1: MITK Reviewer Group I

QmitkNewSegmentationDialog.ui

O1: MITK Reviewer Group I

rMITKfdd0b0926156

View Options

Applications/FlowBench/CMakeLists.txt

View Options

Applications/FlowBench/icons/mitkFlowBench.rc

View Options

Applications/FlowBench/icons/mitkWorkbench.rc

View Options

CMake/Whitelists/FlowBenchSegmentation.cmake

View Options

Documentation/Doxygen/3-DeveloperManual/Concepts/Concepts.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Concepts/MITKSegmentationTaskLists.md

View Options

Documentation/doxygen.conf.in

View Options

Modules/Core/include/mitkAbstractFileReader.h

View Options

Modules/Core/include/mitkDataNode.h

View Options

Modules/Core/include/mitkIFileReader.h

View Options

Modules/Core/include/mitkIOUtil.h

View Options

Modules/Core/src/IO/mitkAbstractFileReader.cpp

View Options

Modules/Core/src/IO/mitkIOUtil.cpp

View Options

Modules/DICOM/include/mitkDICOMIOHelper.h

View Options

Modules/DICOM/src/mitkDICOMIOHelper.cpp

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegmentationIO.cpp

View Options

Modules/Multilabel/autoload/IO/CMakeLists.txt

View Options

Modules/Multilabel/autoload/IO/files.cmake

View Options

Modules/Multilabel/autoload/IO/mitkMultilabelActivator.cpp

View Options

Modules/Multilabel/autoload/IO/mitkMultilabelIOMimeTypes.cpp

View Options

Modules/Multilabel/autoload/IO/mitkMultilabelIOMimeTypes.h

View Options

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListIO.cpp

View Options

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListIO.h

View Options

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListSerializer.cpp

View Options

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListSerializer.h

View Options

Modules/Multilabel/files.cmake

View Options

Modules/Multilabel/mitkSegmentationTaskList.cpp

View Options

Modules/Multilabel/mitkSegmentationTaskList.h

View Options

Modules/Multilabel/mitkSegmentationTaskListMacros.h

View Options

Modules/QtWidgets/include/QmitkStyleManager.h

View Options

Modules/QtWidgets/src/QmitkDataStorageTableModel.cpp

View Options

Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

View Options

Modules/QtWidgets/src/QmitkStyleManager.cpp

View Options

Modules/RT/autoload/DICOMRTIO/mitkRTDoseReaderService.cpp

View Options

Modules/RT/autoload/DICOMRTIO/mitkRTPlanReaderService.cpp

View Options

Modules/RT/autoload/DICOMRTIO/mitkRTStructureSetReaderService.cpp

View Options

Modules/SceneSerialization/src/mitkSceneReaderV1.cpp

View Options

Modules/SceneSerialization/src/mitkSceneReaderV1.h

View Options

Modules/Segmentation/Algorithms/mitkSegmentationHelper.cpp

View Options

Modules/Segmentation/Algorithms/mitkSegmentationHelper.h

View Options

Modules/Segmentation/files.cmake

View Options

Modules/SegmentationUI/Qmitk/QmitkStaticDynamicSegmentationDialog.cpp

View Options

Modules/SegmentationUI/Qmitk/QmitkStaticDynamicSegmentationDialog.h

View Options

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/resources/SegmentationTaskList.qrc

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/resources/SegmentationTaskListIcon.svg

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.cpp

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.h

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.ui

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.cpp

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.h

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.ui

View Options

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/org_mitk_gui_qt_flow_segmentation_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.flowapplication/src/internal/QmitkFlowApplicationPlugin.cpp

View Options

Plugins/org.mitk.gui.qt.flowapplication/src/internal/QmitkFlowApplicationPlugin.h

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.ui

Merge branch 'feature/T29159-SegmentationTasks' into developfdd0b0926156Actions

Description

Details

Event Timeline

Merged Changes

Changes (58)

rMITKfdd0b0926156

Applications/FlowBench/CMakeLists.txt

Applications/FlowBench/icons/mitkFlowBench.rc

Applications/FlowBench/icons/mitkWorkbench.rc

CMake/Whitelists/FlowBenchSegmentation.cmake

Documentation/Doxygen/3-DeveloperManual/Concepts/Concepts.dox

Documentation/Doxygen/3-DeveloperManual/Concepts/MITKSegmentationTaskLists.md

Documentation/doxygen.conf.in

Modules/Core/include/mitkAbstractFileReader.h

Modules/Core/include/mitkDataNode.h

Modules/Core/include/mitkIFileReader.h

Modules/Core/include/mitkIOUtil.h

Modules/Core/src/IO/mitkAbstractFileReader.cpp

Modules/Core/src/IO/mitkIOUtil.cpp

Modules/DICOM/include/mitkDICOMIOHelper.h

Modules/DICOM/src/mitkDICOMIOHelper.cpp

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegmentationIO.cpp

Modules/Multilabel/autoload/IO/CMakeLists.txt

Modules/Multilabel/autoload/IO/files.cmake

Modules/Multilabel/autoload/IO/mitkMultilabelActivator.cpp

Modules/Multilabel/autoload/IO/mitkMultilabelIOMimeTypes.cpp

Modules/Multilabel/autoload/IO/mitkMultilabelIOMimeTypes.h

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListIO.cpp

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListIO.h

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListSerializer.cpp

Modules/Multilabel/autoload/IO/mitkSegmentationTaskListSerializer.h

Modules/Multilabel/files.cmake

Modules/Multilabel/mitkSegmentationTaskList.cpp

Modules/Multilabel/mitkSegmentationTaskList.h

Modules/Multilabel/mitkSegmentationTaskListMacros.h

Modules/QtWidgets/include/QmitkStyleManager.h

Modules/QtWidgets/src/QmitkDataStorageTableModel.cpp

Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

Modules/QtWidgets/src/QmitkStyleManager.cpp

Modules/RT/autoload/DICOMRTIO/mitkRTDoseReaderService.cpp

Modules/RT/autoload/DICOMRTIO/mitkRTPlanReaderService.cpp

Modules/RT/autoload/DICOMRTIO/mitkRTStructureSetReaderService.cpp

Modules/SceneSerialization/src/mitkSceneReaderV1.cpp

Modules/SceneSerialization/src/mitkSceneReaderV1.h

Modules/Segmentation/Algorithms/mitkSegmentationHelper.cpp

Modules/Segmentation/Algorithms/mitkSegmentationHelper.h

Modules/Segmentation/files.cmake

Modules/SegmentationUI/Qmitk/QmitkStaticDynamicSegmentationDialog.cpp

Modules/SegmentationUI/Qmitk/QmitkStaticDynamicSegmentationDialog.h

Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp

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

Plugins/org.mitk.gui.qt.flow.segmentation/resources/SegmentationTaskList.qrc

Plugins/org.mitk.gui.qt.flow.segmentation/resources/SegmentationTaskListIcon.svg

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.cpp

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.h

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationFlowControlView.ui

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.cpp

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.h

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/QmitkSegmentationTaskListWidget.ui

Plugins/org.mitk.gui.qt.flow.segmentation/src/internal/org_mitk_gui_qt_flow_segmentation_Activator.cpp

Plugins/org.mitk.gui.qt.flowapplication/src/internal/QmitkFlowApplicationPlugin.cpp

Plugins/org.mitk.gui.qt.flowapplication/src/internal/QmitkFlowApplicationPlugin.h

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

Plugins/org.mitk.gui.qt.segmentation/src/QmitkNewSegmentationDialog.ui

Merge branch 'feature/T29159-SegmentationTasks' into develop
fdd0b0926156
Actions