Merge branch 'T25401-DCMQIParametricMapsIntegration'
cd6cd6736637
Actions

Description

Merge branch 'T25401-DCMQIParametricMapsIntegration'

Details

Provenance

kompan	Authored on May 29 2019, 11:02 AM
kompan	Pushed on May 29 2019, 11:03 AM

Parents

rMITKffbd65e1b67b: Merge branch 'master' into T25401-DCMQIParametricMapsIntegration
rMITK644e6ff17d56: Merge branch 'T25831-_new_image_statistics_plugin]_improve_documentation'

Branches

Unknown

Tags

Unknown

Event Timeline

kompan committed rMITKcd6cd6736637: Merge branch 'T25401-DCMQIParametricMapsIntegration' (authored by kompan).May 29 2019, 11:02 AM

Merged Changes

ffbd65e1b67b Merge branch 'master' into T25401-DCMQIParametricMapsIntegration
Author
kompan
Browse Repository
No Builds
No Audits
d9b996e67d02 Remove include mitkDICOMPMConstants
Author
kompan
Browse Repository
No Builds
No Audits
89b23209ed67 Change name from Tofts model to Extended Tofts model.
Author
kompan
Browse Repository
No Builds
No Audits
d44f99338896 Remove commented code.
Author
kompan
Browse Repository
No Builds
No Audits
8076a9eb66f9 Remove DICOMPMConstants and TagsOfInterest, since they are currently not used.
Author
kompan
Browse Repository
No Builds
No Audits
6bceb86f5c8f Remove commented code.
Author
kompan
Browse Repository
No Builds
No Audits
9e130b60f94e Remove properties of not required information.
Author
kompan
Browse Repository
No Builds
No Audits
54012b76178b Adapt to New method in ParamapPresetParser.
Author
kompan
Browse Repository
No Builds
No Audits
97948ec32fbf Split segmentation and PM MimeTypes into two separate files. Move each to…
Author
kompan
Browse Repository
No Builds
No Audits
b1566d65b7c5 Move typedefs to private.
Author
kompan
Browse Repository
No Builds
No Audits
088937f28432 Remove commented code.
Author
kompan
Browse Repository
No Builds
No Audits
88567e2ca717 Correct header and links where employed DICOM coding schemes are defined.
Author
kompan
Browse Repository
No Builds
No Audits
0df0e148f5be Correct code comments from segmenatation to parametric maps
Author
kompan
Browse Repository
No Builds
No Audits
892f4fe5f867 Restore initial basic working version of DCMQI parametric maps in the…
Author
kompan
Browse Repository
No Builds
No Audits
82320194166f The DICOMPM PropertyHelper and Constants are moved to the DICOMQI module.
Author
kompan
Browse Repository
No Builds
No Audits
99e551c43785 Remove all DICOMPM files from the Pharmacokinetics module.
Author
kompan
Browse Repository
No Builds
No Audits
0ba950fa8c50 Create new module DICOMPM. Here, the DICOMPMIO-autoload, PresetsParser and…
Author
kompan
Browse Repository
No Builds
No Audits
dee05a515691 Move DICOM PM and QI PropertyHelpers from MRPerfusionPlugin to modelfit…
Author
kompan
Browse Repository
No Builds
No Audits
c2fc68b5df4c WriterConfidenceLevel is only supported for files with modality "PM".
Author
kompan
Browse Repository
No Builds
No Audits
93b6f11f9a95 Use DICOMPMConstants namespace instead of struct.
Author
kompan
Browse Repository
No Builds
No Audits
7605b7876d4b Adapt to separation of DICOM source and DICOM PM properties.
Author
kompan
Browse Repository
No Builds
No Audits
b40f9ae2d3b2 Direct setting paramap property list, instead of new property list and…
Author
kompan
Browse Repository
No Builds
No Audits
b60d0d1d7ce0 Use unique pointers instead of using raw pointers (and cleaning them up) for…
Author
kompan
Browse Repository
No Builds
No Audits
5af8f00a95a7 Use the alias: ParamapPresetsType = std::map<std::string, Type>.
Author
kompan
Browse Repository
No Builds
No Audits
5eab75f7423e Rename mitkParamapPresets to less misleading name mitkParamapPresetsParser.
Author
kompan
Browse Repository
No Builds
No Audits
edc3abf5fe1b Remove call of Save() in ParamapPrestes::NewPresets.
Author
kompan
Browse Repository
No Builds
No Audits
201c645d2cab Remove ParamapPresets::Save() function.
Author
kompan
Browse Repository
No Builds
No Audits
f07a84333bce Rename PropertyHandler to PropertyHelper in Segmentation context.
Author
kompan
Browse Repository
No Builds
No Audits
66da493075c1 Replace DICOMPMIOMimeTypes with DICOMQIIOMimeTypes.
Author
kompan
Browse Repository
No Builds
No Audits
edeefe84d97e Clean up include files.
Author
kompan
Browse Repository
No Builds
No Audits
e2d94fe55c9d Rename all PropertyHandler files and classes for DICOMPM, DICOMSegmentation and…
Author
kompan
Browse Repository
No Builds
No Audits
a6b24e9ae365 Remove DICOMPMIOMimeTypes and integrate content into DICOMQIIOMimeTypes instead.
Author
kompan
Browse Repository
No Builds
No Audits
c39630200934 Direct return of DICOMTagPath. Remove unnecessary comments. Remove commented…
Author
kompan
Browse Repository
No Builds
No Audits
21bd5ee7adcd Restore initial basic working version of DCMQI parametric maps in the…
Author
kompan
Browse Repository
No Builds
No Audits

Changes (39)

Path

Size

Packages

Modules/

DICOMPM

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

autoload

O3: MITK Reviewer Group II

DICOMPMIO

O3: MITK Reviewer Group II

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

mitkDICOMPMIO.cpp

O3: MITK Reviewer Group II

mitkDICOMPMIO.h

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

include

O3: MITK Reviewer Group II

mitkParamapPresetsParser.h

O3: MITK Reviewer Group II

resource

O3: MITK Reviewer Group II

mitkParamapPresets.xml

O3: MITK Reviewer Group II

src

O3: MITK Reviewer Group II

mitkParamapPresetsParser.cpp

O3: MITK Reviewer Group II

	DICOMPM/	autoload/	DICOMPMIO/
	Multilabel/	autoload/	DICOMSegIO/

	mitkDICOMPMIOActivator.cpp
	mitkDICOMQIIOActivator.cpp

O3: MITK Reviewer Group II

	DICOMPM/	autoload/	DICOMPMIO/
			DICOMQI/

	mitkDICOMPMIOMimeTypes.cpp
	mitkDICOMQIIOMimeTypes.cpp

O3: MITK Reviewer Group II

	mitkDICOMPMIOMimeTypes.h
	mitkDICOMQIIOMimeTypes.h

O3: MITK Reviewer Group II

DICOMQI/

files.cmake

O3: MITK Reviewer Group II

mitkDICOMPMPropertyHelper.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.cpp

O3: MITK Reviewer Group II

mitkDICOMQIIOMimeTypes.h

O3: MITK Reviewer Group II

mitkDICOMQIPropertyHelper.cpp

O3: MITK Reviewer Group II

mitkDICOMQIPropertyHelper.h

O3: MITK Reviewer Group II

	DICOMQI/
	Multilabel/

	mitkDICOMPMPropertyHelper.h
	mitkDICOMSegmentationPropertyHelper.h

O3: MITK Reviewer Group II

ModelFit/

src/

Common/

mitkModelFitResultHelper.cpp

O3: MITK Reviewer Group II

ModuleList.cmake

Multilabel/

autoload/

DICOMSegIO/

files.cmake

O1: MITK Reviewer Group I

mitkDICOMQIIOActivator.cpp

O1: MITK Reviewer Group I

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

	Multilabel/	autoload/	DICOMSegIO/
			DICOMQI/

	mitkDICOMSegIOMimeTypes.cpp
	mitkDICOMQIIOMimeTypes.cpp

O1: MITK Reviewer Group I

	mitkDICOMSegIOMimeTypes.h
	mitkDICOMQIIOMimeTypes.h

O1: MITK Reviewer Group I

Pharmacokinetics/

files.cmake

O4: MITK Reviewer Group III

src/

Models/

mitkExtendedToftsModel.cpp

O4: MITK Reviewer Group III

Plugins/

org.mitk.gui.qt.pharmacokinetics.mri/

src/

internal/

MRPerfusionView.cpp

O3: MITK Reviewer Group II

rMITKcd6cd6736637

View Options

Modules/DICOMPM/CMakeLists.txt

View Options

Modules/DICOMPM/autoload/DICOMPMIO/CMakeLists.txt

View Options

Modules/DICOMPM/autoload/DICOMPMIO/files.cmake

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.cpp

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.h

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOActivator.cpp

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOMimeTypes.cpp

View Options

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOMimeTypes.h

View Options

Modules/DICOMPM/files.cmake

View Options

Modules/DICOMPM/include/mitkParamapPresetsParser.h

View Options

Modules/DICOMPM/resource/mitkParamapPresets.xml

View Options

Modules/DICOMPM/src/mitkParamapPresetsParser.cpp

View Options

Modules/DICOMQI/files.cmake

View Options

Modules/DICOMQI/mitkDICOMPMPropertyHelper.cpp

View Options

Modules/DICOMQI/mitkDICOMPMPropertyHelper.h

View Options

Modules/DICOMQI/mitkDICOMQIIOMimeTypes.cpp

View Options

Modules/DICOMQI/mitkDICOMQIIOMimeTypes.h

View Options

Modules/DICOMQI/mitkDICOMQIPropertyHelper.cpp

View Options

Modules/DICOMQI/mitkDICOMQIPropertyHelper.h

View Options

Modules/ModelFit/src/Common/mitkModelFitResultHelper.cpp

View Options

Modules/ModuleList.cmake

View Options

Modules/Multilabel/autoload/DICOMSegIO/files.cmake

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMQIIOActivator.cpp

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.cpp

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.h

View Options

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegmentationIO.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/Pharmacokinetics/files.cmake

View Options

Modules/Pharmacokinetics/src/Models/mitkExtendedToftsModel.cpp

View Options

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.cpp

Merge branch 'T25401-DCMQIParametricMapsIntegration'cd6cd6736637Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

rMITKcd6cd6736637

Modules/DICOMPM/CMakeLists.txt

Modules/DICOMPM/autoload/DICOMPMIO/CMakeLists.txt

Modules/DICOMPM/autoload/DICOMPMIO/files.cmake

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.cpp

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIO.h

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOActivator.cpp

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOMimeTypes.cpp

Modules/DICOMPM/autoload/DICOMPMIO/mitkDICOMPMIOMimeTypes.h

Modules/DICOMPM/files.cmake

Modules/DICOMPM/include/mitkParamapPresetsParser.h

Modules/DICOMPM/resource/mitkParamapPresets.xml

Modules/DICOMPM/src/mitkParamapPresetsParser.cpp

Modules/DICOMQI/files.cmake

Modules/DICOMQI/mitkDICOMPMPropertyHelper.cpp

Modules/DICOMQI/mitkDICOMPMPropertyHelper.h

Modules/DICOMQI/mitkDICOMQIIOMimeTypes.cpp

Modules/DICOMQI/mitkDICOMQIIOMimeTypes.h

Modules/DICOMQI/mitkDICOMQIPropertyHelper.cpp

Modules/DICOMQI/mitkDICOMQIPropertyHelper.h

Modules/ModelFit/src/Common/mitkModelFitResultHelper.cpp

Modules/ModuleList.cmake

Modules/Multilabel/autoload/DICOMSegIO/files.cmake

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMQIIOActivator.cpp

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.cpp

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.h

Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegmentationIO.cpp

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.cpp

Modules/Multilabel/mitkDICOMSegmentationPropertyHelper.h

Modules/Multilabel/mitkLabelSet.cpp

Modules/Multilabel/mitkLabelSetImage.cpp

Modules/Pharmacokinetics/files.cmake

Modules/Pharmacokinetics/src/Models/mitkExtendedToftsModel.cpp

Plugins/org.mitk.gui.qt.pharmacokinetics.mri/src/internal/MRPerfusionView.cpp

Merge branch 'T25401-DCMQIParametricMapsIntegration'
cd6cd6736637
Actions