Merge branch 'T25246-DICOMSeg_Refactoring' into T25246…
8646d9be40a8
Actions

Description

Merge branch 'T25246-DICOMSeg_Refactoring' into T25246-DICOMSegRefactoringIntegrationMaster

Details

Provenance

• metzger	Authored on Sep 5 2018, 2:38 PM
• metzger	Pushed on Sep 5 2018, 2:41 PM

Parents

rMITK7c2f82fcbc31: Raise DICOMQI in ModuleList. Multilabel has a dependency.
rMITKbc551865e997: Disable opencv and vtk python

Branches

Tags

Event Timeline

• metzger committed rMITK8646d9be40a8: Merge branch 'T25246-DICOMSeg_Refactoring' into T25246… (authored by • metzger).Sep 5 2018, 2:38 PM

Merged Changes

7c2f82fcbc31 Raise DICOMQI in ModuleList. Multilabel has a dependency.
Author
• metzger
Browse Repository
No Builds
No Audits
2f048cbceddb Add missing include
Author
• metzger
Browse Repository
No Builds
No Audits
7d491bec1e8e Separate the property helper for DICOM Seg objects. the old class handles only…
Author
• metzger
Browse Repository
No Builds
No Audits
ffa996981523 Change DICOM QI mimetype again. Now every object type (SEG, PM,...) get his own…
Author
• metzger
Browse Repository
No Builds
No Audits
21eb50300fc1 Generalize DICOMQIMimeType for usage of SEG, PM,...
Author
• metzger
Browse Repository
No Builds
No Audits
6e12dd86eab0 Move DICOMSegmentation IO classes to a separated module. Now DICOM SEG, PM and…
Author
• metzger
Browse Repository
No Builds
No Audits
ae05353c21c3 Remove unused include.
Author
• metzger
Browse Repository
No Builds
No Audits
b8de652348b4 Remove return-by-value
Author
• metzger
Browse Repository
No Builds
No Audits
5bf50f208893 Code review topics. Replace raw pointer by unique_ptr.
Author
• metzger
Browse Repository
No Builds
No Audits
33ec6cae0faf Changes based on a code review for DICOM PM (D141) Added Header file and…
Author
• metzger
Browse Repository
No Builds
No Audits
11a62e9f553a Remove redundant copy constructor.
Author
• metzger
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

Packages

Modules/

DICOMQI

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

autoload

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkDICOMQIPropertyHelper.cpp

O3: MITK Reviewer Group II

mitkDICOMQIPropertyHelper.h

O3: MITK Reviewer Group II

	DICOMQI/	autoload/	IO/
	Multilabel/	autoload/	DICOMQIIO/

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkDICOMQIIOActivator.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.h

O3: MITK Reviewer Group II

mitkDICOMSegmentationIO.cpp

O3: MITK Reviewer Group II

mitkDICOMSegmentationIO.h

O3: MITK Reviewer Group II

ModuleList.cmake

Multilabel/

CMakeLists.txt

O1: MITK Reviewer Group I

autoload/

DICOMQIIO/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkDICOMQIIOActivator.cpp

O1: MITK Reviewer Group I

mitkDICOMQIIOMimeTypes.cpp

O1: MITK Reviewer Group I

mitkDICOMQIIOMimeTypes.h

O1: MITK Reviewer Group I

mitkDICOMSegmentationIO.cpp

O1: MITK Reviewer Group I

mitkDICOMSegmentationIO.h

O1: MITK Reviewer Group I

mitkDICOMSegmentationConstants.cpp

O1: MITK Reviewer Group I

mitkDICOMSegmentationPropertyHelper.cpp

O1: MITK Reviewer Group I

mitkDICOMSegmentationPropertyHelper.h

O1: MITK Reviewer Group I

mitkLabelSet.cpp

O1: MITK Reviewer Group I

mitkLabelSetImage.cpp

O1: MITK Reviewer Group I

Segmentation/

Interactions/

mitkTool.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.multilabelsegmentation/

src/

internal/

QmitkMultiLabelSegmentationView.cpp

rMITK8646d9be40a8

View Options

Modules/DICOMQI/CMakeLists.txt

View Options

Modules/DICOMQI/autoload/IO/CMakeLists.txt

View Options

Modules/DICOMQI/autoload/IO/files.cmake

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOActivator.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.h

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.cpp

View Options

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.h

View Options

Modules/DICOMQI/files.cmake

View Options

Modules/DICOMQI/mitkDICOMQIPropertyHelper.cpp

View Options

Modules/DICOMQI/mitkDICOMQIPropertyHelper.h

View Options

Modules/ModuleList.cmake

View Options

Modules/Multilabel/CMakeLists.txt

View Options

Modules/Multilabel/autoload/DICOMQIIO

View Options

Modules/Multilabel/autoload/DICOMQIIO/CMakeLists.txt

View Options

Modules/Multilabel/autoload/DICOMQIIO/files.cmake

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOActivator.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.h

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.cpp

View Options

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.h

View Options

Modules/Multilabel/mitkDICOMSegmentationConstants.cpp

View Options

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.cpp

View Options

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.h

View Options

Modules/Multilabel/mitkLabelSet.cpp

View Options

Modules/Multilabel/mitkLabelSetImage.cpp

View Options

Modules/Segmentation/Interactions/mitkTool.cpp

View Options

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

Merge branch 'T25246-DICOMSeg_Refactoring' into T25246…8646d9be40a8Actions

Description

Details

Event Timeline

Merged Changes

Changes (31)

rMITK8646d9be40a8

Modules/DICOMQI/CMakeLists.txt

Modules/DICOMQI/autoload/IO/CMakeLists.txt

Modules/DICOMQI/autoload/IO/files.cmake

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOActivator.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMQIIOMimeTypes.h

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.cpp

Modules/DICOMQI/autoload/IO/mitkDICOMSegmentationIO.h

Modules/DICOMQI/files.cmake

Modules/DICOMQI/mitkDICOMQIPropertyHelper.cpp

Modules/DICOMQI/mitkDICOMQIPropertyHelper.h

Modules/ModuleList.cmake

Modules/Multilabel/CMakeLists.txt

Modules/Multilabel/autoload/DICOMQIIO

Modules/Multilabel/autoload/DICOMQIIO/CMakeLists.txt

Modules/Multilabel/autoload/DICOMQIIO/files.cmake

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOActivator.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMQIIOMimeTypes.h

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.cpp

Modules/Multilabel/autoload/DICOMQIIO/mitkDICOMSegmentationIO.h

Modules/Multilabel/mitkDICOMSegmentationConstants.cpp

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.cpp

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.h

Modules/Multilabel/mitkLabelSet.cpp

Modules/Multilabel/mitkLabelSetImage.cpp

Modules/Segmentation/Interactions/mitkTool.cpp

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

Merge branch 'T25246-DICOMSeg_Refactoring' into T25246…
8646d9be40a8
Actions