Mercurial > hg > orthanc
changeset 1850:68854412c7bc
new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 01 Dec 2015 14:02:35 +0100 |
| parents | 6394a2f8f1e1 |
| children | d364926389e0 |
| files | Core/DicomFormat/DicomMap.cpp Core/DicomFormat/DicomTag.h UnitTestsSources/DicomMapTests.cpp |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.cpp Tue Dec 01 13:41:48 2015 +0100 +++ b/Core/DicomFormat/DicomMap.cpp Tue Dec 01 14:02:35 2015 +0100 @@ -87,10 +87,12 @@ DICOM_TAG_NUMBER_OF_SLICES, DICOM_TAG_NUMBER_OF_TIME_SLICES, DICOM_TAG_SERIES_INSTANCE_UID, - DICOM_TAG_IMAGE_ORIENTATION_PATIENT, // New in db v6 - DICOM_TAG_SERIES_TYPE, // New in db v6 - DICOM_TAG_OPERATOR_NAME, // New in db v6 - DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION // New in db v6 + DICOM_TAG_IMAGE_ORIENTATION_PATIENT, // New in db v6 + DICOM_TAG_SERIES_TYPE, // New in db v6 + DICOM_TAG_OPERATOR_NAME, // New in db v6 + DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION, // New in db v6 + DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION, // New in db v6 + DICOM_TAG_CONTRAST_BOLUS_AGENT // New in db v6 }; static DicomTag instanceTags[] = @@ -330,6 +332,8 @@ result.Remove(DICOM_TAG_NUMBER_OF_TIME_SLICES); result.Remove(DICOM_TAG_IMAGE_ORIENTATION_PATIENT); result.Remove(DICOM_TAG_SERIES_TYPE); + result.Remove(DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION); + result.Remove(DICOM_TAG_CONTRAST_BOLUS_AGENT); } void DicomMap::SetupFindInstanceTemplate(DicomMap& result)
--- a/Core/DicomFormat/DicomTag.h Tue Dec 01 13:41:48 2015 +0100 +++ b/Core/DicomFormat/DicomTag.h Tue Dec 01 14:02:35 2015 +0100 @@ -167,5 +167,6 @@ static const DicomTag DICOM_TAG_OPERATOR_NAME(0x0008, 0x1070); static const DicomTag DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION(0x0040, 0x0254); static const DicomTag DICOM_TAG_IMAGE_COMMENTS(0x0020, 0x4000); - + static const DicomTag DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION(0x0018, 0x1400); + static const DicomTag DICOM_TAG_CONTRAST_BOLUS_AGENT(0x0018, 0x0010); }
--- a/UnitTestsSources/DicomMapTests.cpp Tue Dec 01 13:41:48 2015 +0100 +++ b/UnitTestsSources/DicomMapTests.cpp Tue Dec 01 14:02:35 2015 +0100 @@ -183,7 +183,9 @@ *it == DicomTag(0x0020, 0x1002) || /* ImagesInAcquisition, from General Image Module (SIMPLIFICATION => Series) */ *it == DicomTag(0x0054, 0x0081) || /* NumberOfSlices, from PET Series module */ *it == DicomTag(0x0054, 0x0101) || /* NumberOfTimeSlices, from PET Series module */ - *it == DicomTag(0x0054, 0x1000))) /* SeriesType, from PET Series module */ + *it == DicomTag(0x0054, 0x1000) || /* SeriesType, from PET Series module */ + *it == DicomTag(0x0018, 0x1400) || /* AcquisitionDeviceProcessingDescription, from CR/X-Ray/DX/WholeSlideMicro Image (SIMPLIFICATION => Series) */ + *it == DicomTag(0x0018, 0x0010))) /* ContrastBolusAgent, from Contrast/Bolus module (SIMPLIFICATION => Series) */ { ok = true; }