Merge remote-tracking branch 'origin/bug-19799…
c99493d42161
Actions

Description

Merge remote-tracking branch 'origin/bug-19799-DICOM_reader_and_service_with_additinal_tag_support' into T19799-Integration-Branch

Conflicts:
Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp
Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

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

Details

Provenance

floca	Authored on Sep 14 2016, 2:51 PM
floca	Pushed on Sep 20 2016, 1:49 PM

Parents

rMITK439412955502: fixed warning as error problem for gcc 4.9. Removed assert, because it was not…
rMITK21c2a7f75d16: Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITKc99493d42161: Merge remote-tracking branch 'origin/bug-19799… (authored by floca).Sep 14 2016, 2:51 PM

Merged Changes

21c2a7f75d16 Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…
Author
floca
Browse Repository
No Builds
No Audits
b2545d280409 adde extended tag scanning to DICOM editor plugin
Author
floca
Browse Repository
No Builds
No Audits
573fb79affb0 fixed bugs in DICOMTagPath; added tests for DICOMTagPath added helper functions…
Author
floca
Browse Repository
No Builds
No Audits
4cc32f31932a Merge branch 'bug-19791-PropertyServices_with_wildcards' into bug-19799…
Author
floca
Browse Repository
No Builds
No Audits
2f582446e76b added missing new files of the last commit
Author
floca
Browse Repository
No Builds
No Audits
dc9f96718e6d Switched code to new DICOM property naming style. Added code for backwards…
Author
floca
Browse Repository
No Builds
No Audits
bd3e2fba0cbc fixed several bugs in the new infrastructure removed legacy dicom tags from the…
Author
floca
Browse Repository
No Builds
No Audits
1a1ca4e33720 first draft for the extension
Author
floca
Browse Repository
No Builds
No Audits
b0166e81d21f fixed errors in the test fixed wrong naming style in DICOMTagPath interface
Author
floca
Browse Repository
No Builds
No Audits
b3a1424eeea7 implement dcmtk based scanner fixed typo mitk::GeneratePropertyNameForDICOMTag
Author
floca
Browse Repository
No Builds
No Audits
93e699034be0 first draft of dcmtk based "deep" tag scanner
Author
floca
Browse Repository
No Builds
No Audits
f1b1adccc7ff Merge branch 'bug-19791-PropertyServices_with_wildcards' into…
Author
floca
Browse Repository
No Builds
No Audits
ec5bb6fabeda first draft of DICOMReader rework (phase 1)
Author
floca
Browse Repository
No Builds
No Audits
8887d3975e18 DICOMTagPath implemented
Author
floca
Browse Repository
No Builds
No Audits

Changes (61)

Path

Size

Packages

Modules/

Core/

files.cmake

O1: MITK Reviewer Group I

src/

IO/

mitkDicomSeriesReaderService.cpp

O1: MITK Reviewer Group I

Rendering/

mitkImageVtkMapper2D.cpp

O1: MITK Reviewer Group I

test/

files.cmake

O1: MITK Reviewer Group I

	Core/
	DICOMReader/

	include/
	src/

	mitkPropertyNameHelper.h
	mitkDICOMTagCache.cpp

O1: MITK Reviewer Group I

	src/	DataManagement/
	src/

	mitkPropertyNameHelper.cpp
	mitkDICOMTagCache.cpp

O1: MITK Reviewer Group I

test/

	mitkPropertyNameHelperTest.cpp
	mitkDICOMTagHelperTest.cpp

O1: MITK Reviewer Group I

DICOMReader/

files.cmake

include/

mitkDICOMDCMTKTagScanner.h

mitkDICOMDatasetAccess.h

mitkDICOMDatasetAccessingImageFrameInfo.h

mitkDICOMFileReader.h

mitkDICOMGDCMImageFrameInfo.h

mitkDICOMGDCMTagCache.h

mitkDICOMGDCMTagScanner.h

mitkDICOMGenericImageFrameInfo.h

mitkDICOMGenericTagCache.h

mitkDICOMITKSeriesGDCMReader.h

mitkDICOMImageBlockDescriptor.h

mitkDICOMTagScanner.h

	mitkDICOMTagsOfInterestHelper.h
	mitkDICOMTagHelper.h

mitkIDICOMTagsOfInterest.h

src/

mitkDICOMDCMTKTagScanner.cpp

mitkDICOMDatasetAccessingImageFrameInfo.cpp

mitkDICOMFileReader.cpp

mitkDICOMFileReaderSelector.cpp

mitkDICOMGDCMImageFrameInfo.cpp

mitkDICOMGDCMTagCache.cpp

mitkDICOMGDCMTagScanner.cpp

mitkDICOMGenericImageFrameInfo.cpp

mitkDICOMGenericTagCache.cpp

mitkDICOMITKSeriesGDCMReader.cpp

mitkDICOMImageBlockDescriptor.cpp

mitkDICOMProperty.cpp

mitkDICOMTagCache.cpp

mitkDICOMTagHelper.cpp

mitkDICOMTagPath.cpp

mitkDICOMTagScanner.cpp

	mitkDICOMTagsOfInterestHelper.cpp
	mitkDICOMTagHelper.cpp

mitkITKDICOMSeriesReaderHelper.cpp

mitkThreeDnTDICOMSeriesReader.cpp

test/

files.cmake

mitkDICOMDCMTKTagScannerTest.cpp

mitkDICOMFileReaderTestHelper.h

mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

mitkDICOMNullFileReader.h

mitkDICOMPropertyTest.cpp

mitkDICOMTagHelperTest.cpp

mitkDICOMTagPathTest.cpp

DICOMReaderServices/

include/

mitkDICOMTagsOfInterestService.h

src/

mitkBaseDICOMReaderService.cpp

mitkDICOMReaderServicesActivator.cpp

mitkDICOMTagsOfInterestService.cpp

DicomRT/

src/

mitkDoseImageVtkMapper2D.cpp

LegacyIO/

mitkDataNodeFactory.cpp

O3: MITK Reviewer Group II

QtWidgets/

src/

QmitkDataStorageTreeModel.cpp

O3: MITK Reviewer Group II

Plugins/

org.mitk.gui.qt.dicom/

src/

internal/

DicomEventHandler.cpp

rMITKc99493d42161

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkPropertyNameHelper.h

View Options

Modules/Core/src/DataManagement/mitkPropertyNameHelper.cpp

View Options

Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp

View Options

Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp

View Options

Modules/Core/test/files.cmake

View Options

Modules/Core/test/mitkPropertyNameHelperTest.cpp

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/include/mitkDICOMDCMTKTagScanner.h

View Options

Modules/DICOMReader/include/mitkDICOMDatasetAccess.h

View Options

Modules/DICOMReader/include/mitkDICOMDatasetAccessingImageFrameInfo.h

View Options

Modules/DICOMReader/include/mitkDICOMFileReader.h

View Options

Modules/DICOMReader/include/mitkDICOMGDCMImageFrameInfo.h

View Options

Modules/DICOMReader/include/mitkDICOMGDCMTagCache.h

View Options

Modules/DICOMReader/include/mitkDICOMGDCMTagScanner.h

View Options

Modules/DICOMReader/include/mitkDICOMGenericImageFrameInfo.h

View Options

Modules/DICOMReader/include/mitkDICOMGenericTagCache.h

View Options

Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/include/mitkDICOMProperty.h

View Options

Modules/DICOMReader/include/mitkDICOMTagCache.h

View Options

Modules/DICOMReader/include/mitkDICOMTagHelper.h

View Options

Modules/DICOMReader/include/mitkDICOMTagPath.h

View Options

Modules/DICOMReader/include/mitkDICOMTagScanner.h

View Options

Modules/DICOMReader/include/mitkDICOMTagsOfInterestHelper.h

View Options

Modules/DICOMReader/include/mitkIDICOMTagsOfInterest.h

View Options

Modules/DICOMReader/src/mitkDICOMDCMTKTagScanner.cpp

View Options

Modules/DICOMReader/src/mitkDICOMDatasetAccessingImageFrameInfo.cpp

View Options

Modules/DICOMReader/src/mitkDICOMFileReader.cpp

View Options

Modules/DICOMReader/src/mitkDICOMFileReaderSelector.cpp

View Options

Modules/DICOMReader/src/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/src/mitkDICOMGDCMTagCache.cpp

View Options

Modules/DICOMReader/src/mitkDICOMGDCMTagScanner.cpp

View Options

Modules/DICOMReader/src/mitkDICOMGenericImageFrameInfo.cpp

View Options

Modules/DICOMReader/src/mitkDICOMGenericTagCache.cpp

View Options

Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp

View Options

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/src/mitkDICOMProperty.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagCache.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagHelper.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagPath.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagScanner.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagsOfInterestHelper.cpp

View Options

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/test/files.cmake

View Options

Modules/DICOMReader/test/mitkDICOMDCMTKTagScannerTest.cpp

View Options

Modules/DICOMReader/test/mitkDICOMFileReaderTestHelper.h

View Options

Modules/DICOMReader/test/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

View Options

Modules/DICOMReader/test/mitkDICOMNullFileReader.h

View Options

Modules/DICOMReader/test/mitkDICOMPropertyTest.cpp

View Options

Modules/DICOMReader/test/mitkDICOMTagHelperTest.cpp

View Options

Modules/DICOMReader/test/mitkDICOMTagPathTest.cpp

View Options

Modules/DICOMReaderServices/include/mitkDICOMTagsOfInterestService.h

View Options

Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

View Options

Modules/DicomRT/src/mitkDoseImageVtkMapper2D.cpp

View Options

Modules/LegacyIO/mitkDataNodeFactory.cpp

View Options

Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

View Options

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

Merge remote-tracking branch 'origin/bug-19799…c99493d42161Actions

Description

Details

Event Timeline

Merged Changes

Changes (61)

rMITKc99493d42161

Modules/Core/files.cmake

Modules/Core/include/mitkPropertyNameHelper.h

Modules/Core/src/DataManagement/mitkPropertyNameHelper.cpp

Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp

Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp

Modules/Core/test/files.cmake

Modules/Core/test/mitkPropertyNameHelperTest.cpp

Modules/DICOMReader/files.cmake

Modules/DICOMReader/include/mitkDICOMDCMTKTagScanner.h

Modules/DICOMReader/include/mitkDICOMDatasetAccess.h

Modules/DICOMReader/include/mitkDICOMDatasetAccessingImageFrameInfo.h

Modules/DICOMReader/include/mitkDICOMFileReader.h

Modules/DICOMReader/include/mitkDICOMGDCMImageFrameInfo.h

Modules/DICOMReader/include/mitkDICOMGDCMTagCache.h

Modules/DICOMReader/include/mitkDICOMGDCMTagScanner.h

Modules/DICOMReader/include/mitkDICOMGenericImageFrameInfo.h

Modules/DICOMReader/include/mitkDICOMGenericTagCache.h

Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h

Modules/DICOMReader/include/mitkDICOMImageBlockDescriptor.h

Modules/DICOMReader/include/mitkDICOMProperty.h

Modules/DICOMReader/include/mitkDICOMTagCache.h

Modules/DICOMReader/include/mitkDICOMTagHelper.h

Modules/DICOMReader/include/mitkDICOMTagPath.h

Modules/DICOMReader/include/mitkDICOMTagScanner.h

Modules/DICOMReader/include/mitkDICOMTagsOfInterestHelper.h

Modules/DICOMReader/include/mitkIDICOMTagsOfInterest.h

Modules/DICOMReader/src/mitkDICOMDCMTKTagScanner.cpp

Modules/DICOMReader/src/mitkDICOMDatasetAccessingImageFrameInfo.cpp

Modules/DICOMReader/src/mitkDICOMFileReader.cpp

Modules/DICOMReader/src/mitkDICOMFileReaderSelector.cpp

Modules/DICOMReader/src/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/src/mitkDICOMGDCMTagCache.cpp

Modules/DICOMReader/src/mitkDICOMGDCMTagScanner.cpp

Modules/DICOMReader/src/mitkDICOMGenericImageFrameInfo.cpp

Modules/DICOMReader/src/mitkDICOMGenericTagCache.cpp

Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/src/mitkDICOMProperty.cpp

Modules/DICOMReader/src/mitkDICOMTagCache.cpp

Modules/DICOMReader/src/mitkDICOMTagHelper.cpp

Modules/DICOMReader/src/mitkDICOMTagPath.cpp

Modules/DICOMReader/src/mitkDICOMTagScanner.cpp

Modules/DICOMReader/src/mitkDICOMTagsOfInterestHelper.cpp

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

Modules/DICOMReader/test/files.cmake

Modules/DICOMReader/test/mitkDICOMDCMTKTagScannerTest.cpp

Modules/DICOMReader/test/mitkDICOMFileReaderTestHelper.h

Modules/DICOMReader/test/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

Modules/DICOMReader/test/mitkDICOMNullFileReader.h

Modules/DICOMReader/test/mitkDICOMPropertyTest.cpp

Modules/DICOMReader/test/mitkDICOMTagHelperTest.cpp

Modules/DICOMReader/test/mitkDICOMTagPathTest.cpp

Modules/DICOMReaderServices/include/mitkDICOMTagsOfInterestService.h

Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.cpp

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

Modules/DicomRT/src/mitkDoseImageVtkMapper2D.cpp

Modules/LegacyIO/mitkDataNodeFactory.cpp

Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

Merge remote-tracking branch 'origin/bug-19799…
c99493d42161
Actions