Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…
21c2a7f75d16
Actions

Description

Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799-DICOM_reader_and_service_with_additinal_tag_support

Conflicts:
Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance

floca

Authored on Jul 14 2016, 2:11 PM

Parents

rMITK6588449dcb13: added missing header to avoid compile errors for linux
rMITKb2545d280409: adde extended tag scanning to DICOM editor plugin

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITK21c2a7f75d16: Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799… (authored by floca).Jul 14 2016, 2:11 PM

Merged Changes

6588449dcb13 added missing header to avoid compile errors for linux
Author
floca
Browse Repository
No Builds
No Audits
5cf7233f1678 refactored method naming in IPropertyPersistence(review feedback)
Author
floca
Browse Repository
No Builds
No Audits
bc4f1558f6bf made lambda more readable (review feedback); fixed assert bug in…
Author
floca
Browse Repository
No Builds
No Audits
91470812e699 fixed typos and documentation (review feedback)
Author
floca
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Packages

Modules/

Core/

include/

mitkIPropertyPersistence.h

O1: MITK Reviewer Group I

mitkPropertyPersistence.h

O1: MITK Reviewer Group I

mitkPropertyPersistenceInfo.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkPropertyPersistence.cpp

O1: MITK Reviewer Group I

mitkPropertyPersistenceInfo.cpp

O1: MITK Reviewer Group I

mitkTemporoSpatialStringProperty.cpp

O1: MITK Reviewer Group I

IO/

mitkItkImageIO.cpp

O1: MITK Reviewer Group I

test/

mitkPropertyPersistenceTest.cpp

O1: MITK Reviewer Group I

DICOMReaderServices/

src/

mitkDICOMTagsOfInterestService.cpp

Plugins/

org.mitk.gui.qt.properties/

src/

internal/

QmitkPropertyTreeView.cpp

O1: MITK Reviewer Group I

rMITK21c2a7f75d16

View Options

Modules/Core/include/mitkIPropertyPersistence.h

View Options

Modules/Core/include/mitkPropertyPersistence.h

View Options

Modules/Core/include/mitkPropertyPersistenceInfo.h

View Options

Modules/Core/src/DataManagement/mitkPropertyPersistence.cpp

View Options

Modules/Core/src/DataManagement/mitkPropertyPersistenceInfo.cpp

View Options

Modules/Core/src/DataManagement/mitkTemporoSpatialStringProperty.cpp

View Options

Modules/Core/src/IO/mitkItkImageIO.cpp

View Options

Modules/Core/test/mitkPropertyPersistenceTest.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

View Options

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp

Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…21c2a7f75d16Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITK21c2a7f75d16

Modules/Core/include/mitkIPropertyPersistence.h

Modules/Core/include/mitkPropertyPersistence.h

Modules/Core/include/mitkPropertyPersistenceInfo.h

Modules/Core/src/DataManagement/mitkPropertyPersistence.cpp

Modules/Core/src/DataManagement/mitkPropertyPersistenceInfo.cpp

Modules/Core/src/DataManagement/mitkTemporoSpatialStringProperty.cpp

Modules/Core/src/IO/mitkItkImageIO.cpp

Modules/Core/test/mitkPropertyPersistenceTest.cpp

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp

Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…
21c2a7f75d16
Actions