Merge branch 'bug-19791-PropertyServices_with_wildcards' into T19791…
dfa1b1664307
Actions

Description

Merge branch 'bug-19791-PropertyServices_with_wildcards' into T19791-Integration-Branch

Conflicts:
Modules/Core/src/DataManagement/mitkTemporoSpatialStringProperty.cpp
Modules/Core/test/mitkPropertyPersistenceTest.cpp

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

Details

Provenance

floca	Authored on Sep 7 2016, 11:29 AM
floca	Pushed on Sep 7 2016, 11:31 AM

Parents

rMITKc74e3f10f367: Merge branch 'T19918-Create-custom-resource-folder'
rMITK6588449dcb13: added missing header to avoid compile errors for linux

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITKdfa1b1664307: Merge branch 'bug-19791-PropertyServices_with_wildcards' into T19791… (authored by floca).Sep 7 2016, 11:29 AM

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
8fbf3fd29a31 fixed gcc errors and warnings
Author
floca
Browse Repository
No Builds
No Audits
df6e1ee457b3 fixed failing test in PropertyPersistenceTest
Author
floca
Browse Repository
No Builds
No Audits
58dd89a424a1 added test coverage for regular expression features
Author
floca
Browse Repository
No Builds
No Audits
e48f6687dae1 migrated code to interface changes of IPropertyPersistence and…
Author
floca
Browse Repository
No Builds
No Audits
0dc8d11bd244 refactored PropertyDescription and PropertyPersistance service to support…
Author
floca
Browse Repository
No Builds
Audited
297245a632a3 replaced deprecated testing macros, added more tests for…
Author
floca
Browse Repository
No Builds
No Audits

Changes (15)

Path

Size

Packages

Modules/

Core/

include/

mitkIPropertyDescriptions.h

O1: MITK Reviewer Group I

mitkIPropertyPersistence.h

O1: MITK Reviewer Group I

mitkPropertyDescriptions.h

O1: MITK Reviewer Group I

mitkPropertyPersistence.h

O1: MITK Reviewer Group I

mitkPropertyPersistenceInfo.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkPropertyDescriptions.cpp

O1: MITK Reviewer Group I

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/

mitkPropertyPersistenceInfoTest.cpp

O1: MITK Reviewer Group I

mitkPropertyPersistenceTest.cpp

O1: MITK Reviewer Group I

DICOMReaderServices/

src/

mitkDICOMTagsOfInterestService.cpp

Plugins/

org.mitk.gui.qt.properties/

src/

internal/

QmitkAddNewPropertyDialog.cpp

O1: MITK Reviewer Group I

QmitkPropertyTreeView.cpp

O1: MITK Reviewer Group I

rMITKdfa1b1664307

View Options

Modules/Core/include/mitkIPropertyDescriptions.h

View Options

Modules/Core/include/mitkIPropertyPersistence.h

View Options

Modules/Core/include/mitkPropertyDescriptions.h

View Options

Modules/Core/include/mitkPropertyPersistence.h

View Options

Modules/Core/include/mitkPropertyPersistenceInfo.h

View Options

Modules/Core/src/DataManagement/mitkPropertyDescriptions.cpp

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/mitkPropertyPersistenceInfoTest.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/QmitkAddNewPropertyDialog.cpp

View Options

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

Merge branch 'bug-19791-PropertyServices_with_wildcards' into T19791…dfa1b1664307Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITKdfa1b1664307

Modules/Core/include/mitkIPropertyDescriptions.h

Modules/Core/include/mitkIPropertyPersistence.h

Modules/Core/include/mitkPropertyDescriptions.h

Modules/Core/include/mitkPropertyPersistence.h

Modules/Core/include/mitkPropertyPersistenceInfo.h

Modules/Core/src/DataManagement/mitkPropertyDescriptions.cpp

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/mitkPropertyPersistenceInfoTest.cpp

Modules/Core/test/mitkPropertyPersistenceTest.cpp

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

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

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

Merge branch 'bug-19791-PropertyServices_with_wildcards' into T19791…
dfa1b1664307
Actions