Merge branch 'bug-19038-adding-DICOM-tags-as-properties'
9957b3e16c6d
Actions

Description

Merge branch 'bug-19038-adding-DICOM-tags-as-properties'

Conflicts:
Modules/DICOMReader/src/mitkDICOMSortByTag.cpp
Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp
Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp
Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

Merge branch 'bug-19038-adding-DICOM-tags-as-properties'9957b3e16c6dActions

Description

Details

Event Timeline

Merged Changes

Changes (30)

rMITK9957b3e16c6d

Modules/DICOMReader/files.cmake

Modules/DICOMReader/include/mitkDICOMDatasetAccess.h

Modules/DICOMReader/include/mitkDICOMGDCMImageFrameInfo.h

Modules/DICOMReader/include/mitkDICOMGDCMTagScanner.h

Modules/DICOMReader/include/mitkDICOMTagCache.h

Modules/DICOMReader/include/mitkDICOMTagHelper.h

Modules/DICOMReader/include/mitkIDICOMTagsOfInterest.h

Modules/DICOMReader/src/mitkDICOMGDCMImageFrameInfo.cpp

Modules/DICOMReader/src/mitkDICOMGDCMTagScanner.cpp

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

Modules/DICOMReader/src/mitkDICOMSortByTag.cpp

Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp

Modules/DICOMReader/src/mitkDICOMTagHelper.cpp

Modules/DICOMReader/src/mitkEquiDistantBlocksSorter.cpp

Modules/DICOMReader/src/mitkIDICOMTagsOfInterest.cpp

Modules/DICOMReader/src/mitkITKDICOMSeriesReaderHelper.cpp

Modules/DICOMReader/src/mitkNormalDirectionConsistencySorter.cpp

Modules/DICOMReader/src/mitkSortByImagePositionPatient.cpp

Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

Modules/DICOMReader/test/files.cmake

Modules/DICOMReader/test/mitkDICOMFileReaderTestHelper.h

Modules/DICOMReader/test/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

Modules/DICOMReader/test/mitkDICOMTagHelperTest.cpp

Modules/DICOMReaderServices/files.cmake

Modules/DICOMReaderServices/include/mitkDICOMTagsOfInterestService.h

Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.cpp

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.h

Modules/DICOMReaderServices/src/mitkDICOMTagsOfInterestService.cpp

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

Merge branch 'bug-19038-adding-DICOM-tags-as-properties'
9957b3e16c6d
Actions