orthanc: Core/DicomFormat/DicomMap.cpp annotate

annotate Core/DicomFormat/DicomMap.cpp @ 3512:4bced7d1ec20

in /ordered-slices route, ignore instances without position/normal/seriesIndex

author	amazy
date	Wed, 04 Sep 2019 18:23:22 +0200
parents	957e06cbe76a
children	a57c8163d9ae

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1850 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1206 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	34 #include "../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "DicomMap.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include <memory>
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	39
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	40 #include "../Endianness.h"
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	41 #include "../Logging.h"
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	42 #include "../OrthancException.h"
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	43 #include "../Toolbox.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	46 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 static DicomTag patientTags[] =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
38 2cefaf5b3c2e improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	50 //DicomTag(0x0010, 0x1010), // PatientAge
2cefaf5b3c2e improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	51 //DicomTag(0x0010, 0x1040) // PatientAddress
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	52 DicomTag(0x0010, 0x0010), // PatientName
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	53 DicomTag(0x0010, 0x0030), // PatientBirthDate
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	54 DicomTag(0x0010, 0x0040), // PatientSex
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	55 DicomTag(0x0010, 0x1000), // OtherPatientIDs
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	56 DICOM_TAG_PATIENT_ID
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 static DicomTag studyTags[] =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
38 2cefaf5b3c2e improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	61 //DicomTag(0x0010, 0x1020), // PatientSize
2cefaf5b3c2e improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	62 //DicomTag(0x0010, 0x1030) // PatientWeight
1716 2ca7888f8600 refactoring DicomIdentifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1706 diff changeset	63 DICOM_TAG_STUDY_DATE,
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	64 DicomTag(0x0008, 0x0030), // StudyTime
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	65 DicomTag(0x0020, 0x0010), // StudyID
1716 2ca7888f8600 refactoring DicomIdentifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1706 diff changeset	66 DICOM_TAG_STUDY_DESCRIPTION,
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	67 DICOM_TAG_ACCESSION_NUMBER,
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	68 DICOM_TAG_STUDY_INSTANCE_UID,
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	69 DICOM_TAG_REQUESTED_PROCEDURE_DESCRIPTION, // New in db v6
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	70 DICOM_TAG_INSTITUTION_NAME, // New in db v6
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	71 DICOM_TAG_REQUESTING_PHYSICIAN, // New in db v6
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	72 DICOM_TAG_REFERRING_PHYSICIAN_NAME // New in db v6
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 static DicomTag seriesTags[] =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 {
38 2cefaf5b3c2e improvements Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	77 //DicomTag(0x0010, 0x1080), // MilitaryRank
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	78 DicomTag(0x0008, 0x0021), // SeriesDate
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	79 DicomTag(0x0008, 0x0031), // SeriesTime
1755 39c37a994b2f handling of DICOM_TAG_MODALITIES_IN_STUDY Sebastien Jodogne <s.jodogne@gmail.com> parents: 1749 diff changeset	80 DICOM_TAG_MODALITY,
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	81 DicomTag(0x0008, 0x0070), // Manufacturer
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	82 DicomTag(0x0008, 0x1010), // StationName
1716 2ca7888f8600 refactoring DicomIdentifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1706 diff changeset	83 DICOM_TAG_SERIES_DESCRIPTION,
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	84 DicomTag(0x0018, 0x0015), // BodyPartExamined
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	85 DicomTag(0x0018, 0x0024), // SequenceName
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	86 DicomTag(0x0018, 0x1030), // ProtocolName
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	87 DicomTag(0x0020, 0x0011), // SeriesNumber
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	88 DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES,
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	89 DICOM_TAG_IMAGES_IN_ACQUISITION,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	90 DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS,
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	91 DICOM_TAG_NUMBER_OF_SLICES,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	92 DICOM_TAG_NUMBER_OF_TIME_SLICES,
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1372 diff changeset	93 DICOM_TAG_SERIES_INSTANCE_UID,
1850 68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	94 DICOM_TAG_IMAGE_ORIENTATION_PATIENT, // New in db v6
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	95 DICOM_TAG_SERIES_TYPE, // New in db v6
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	96 DICOM_TAG_OPERATOR_NAME, // New in db v6
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	97 DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION, // New in db v6
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	98 DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION, // New in db v6
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	99 DICOM_TAG_CONTRAST_BOLUS_AGENT // New in db v6
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 static DicomTag instanceTags[] =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 {
77 b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	104 DicomTag(0x0008, 0x0012), // InstanceCreationDate
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	105 DicomTag(0x0008, 0x0013), // InstanceCreationTime
b8dfde8d64e8 new dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	106 DicomTag(0x0020, 0x0012), // AcquisitionNumber
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	107 DICOM_TAG_IMAGE_INDEX,
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	108 DICOM_TAG_INSTANCE_NUMBER,
84 a84291457608 fix of multi-frames Sebastien Jodogne <s.jodogne@gmail.com> parents: 82 diff changeset	109 DICOM_TAG_NUMBER_OF_FRAMES,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	110 DICOM_TAG_TEMPORAL_POSITION_IDENTIFIER,
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1372 diff changeset	111 DICOM_TAG_SOP_INSTANCE_UID,
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	112 DICOM_TAG_IMAGE_POSITION_PATIENT, // New in db v6
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	113 DICOM_TAG_IMAGE_COMMENTS, // New in db v6
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	114
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	115 /**
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	116 * Main DICOM tags that are not part of any release of the
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	117 * database schema yet, and that will be part of future db v7. In
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	118 * the meantime, the user must call "/tools/reconstruct" once to
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	119 * access these tags if the corresponding DICOM files where
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	120 * indexed in the database by an older version of Orthanc.
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	121 **/
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	122 DICOM_TAG_IMAGE_ORIENTATION_PATIENT // New in Orthanc 1.4.2
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	126 void DicomMap::LoadMainDicomTags(const DicomTag*& tags,
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	127 size_t& size,
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	128 ResourceType level)
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	129 {
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	130 switch (level)
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	131 {
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	132 case ResourceType_Patient:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	133 tags = patientTags;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	134 size = sizeof(patientTags) / sizeof(DicomTag);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	135 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	136
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	137 case ResourceType_Study:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	138 tags = studyTags;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	139 size = sizeof(studyTags) / sizeof(DicomTag);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	140 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	141
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	142 case ResourceType_Series:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	143 tags = seriesTags;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	144 size = sizeof(seriesTags) / sizeof(DicomTag);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	145 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	146
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	147 case ResourceType_Instance:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	148 tags = instanceTags;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	149 size = sizeof(instanceTags) / sizeof(DicomTag);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	150 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	151
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	152 default:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	153 throw OrthancException(ErrorCode_ParameterOutOfRange);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	154 }
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	155 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 void DicomMap::SetValue(uint16_t group,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 uint16_t element,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 DicomValue* value)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 DicomTag tag(group, element);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 Map::iterator it = map_.find(tag);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 if (it != map_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 delete it->second;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 it->second = value;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 map_.insert(std::make_pair(tag, value));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 void DicomMap::SetValue(DicomTag tag,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 DicomValue* value)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 SetValue(tag.GetGroup(), tag.GetElement(), value);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 void DicomMap::Clear()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 567 diff changeset	185 for (Map::iterator it = map_.begin(); it != map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 {
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	187 assert(it->second != NULL);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 delete it->second;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 map_.clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 void DicomMap::ExtractTags(DicomMap& result,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 const DicomTag* tags,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 size_t count) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 result.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 for (unsigned int i = 0; i < count; i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 Map::const_iterator it = map_.find(tags[i]);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 if (it != map_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 result.SetValue(it->first, it->second->Clone());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 void DicomMap::ExtractPatientInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 ExtractTags(result, patientTags, sizeof(patientTags) / sizeof(DicomTag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 void DicomMap::ExtractStudyInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 ExtractTags(result, studyTags, sizeof(studyTags) / sizeof(DicomTag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 void DicomMap::ExtractSeriesInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 ExtractTags(result, seriesTags, sizeof(seriesTags) / sizeof(DicomTag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 void DicomMap::ExtractInstanceInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 ExtractTags(result, instanceTags, sizeof(instanceTags) / sizeof(DicomTag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	233
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 DicomMap* DicomMap::Clone() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 std::auto_ptr<DicomMap> result(new DicomMap);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 567 diff changeset	238 for (Map::const_iterator it = map_.begin(); it != map_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 result->map_.insert(std::make_pair(it->first, it->second->Clone()));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 return result.release();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	247 void DicomMap::Assign(const DicomMap& other)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	248 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	249 Clear();
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	250
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	251 for (Map::const_iterator it = other.map_.begin(); it != other.map_.end(); ++it)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	252 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	253 map_.insert(std::make_pair(it->first, it->second->Clone()));
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	254 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	255 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	256
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	257
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 const DicomValue& DicomMap::GetValue(const DicomTag& tag) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	260 const DicomValue* value = TestAndGetValue(tag);
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	261
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	262 if (value)
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	263 {
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	264 return *value;
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	265 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	266 else
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	267 {
730 309e686b41e7 better logging about nonexistent tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	268 throw OrthancException(ErrorCode_InexistentTag);
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	269 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	270 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	271
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	272
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	273 const DicomValue* DicomMap::TestAndGetValue(const DicomTag& tag) const
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	274 {
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 Map::const_iterator it = map_.find(tag);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 if (it == map_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	279 return NULL;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	283 return it->second;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 void DicomMap::Remove(const DicomTag& tag)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 Map::iterator it = map_.find(tag);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 if (it != map_.end())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 delete it->second;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 map_.erase(it);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 static void SetupFindTemplate(DicomMap& result,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 const DicomTag* tags,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 size_t count)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 result.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 for (size_t i = 0; i < count; i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	307 result.SetValue(tags[i], "", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 void DicomMap::SetupFindPatientTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 SetupFindTemplate(result, patientTags, sizeof(patientTags) / sizeof(DicomTag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 void DicomMap::SetupFindStudyTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 SetupFindTemplate(result, studyTags, sizeof(studyTags) / sizeof(DicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	319 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	320 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	321
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	322 // These main DICOM tags are only indirectly related to the
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	323 // General Study Module, remove them
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	324 result.Remove(DICOM_TAG_INSTITUTION_NAME);
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	325 result.Remove(DICOM_TAG_REQUESTING_PHYSICIAN);
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	326 result.Remove(DICOM_TAG_REQUESTED_PROCEDURE_DESCRIPTION);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 void DicomMap::SetupFindSeriesTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 SetupFindTemplate(result, seriesTags, sizeof(seriesTags) / sizeof(DicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	332 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	333 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	334 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "", false);
1372 1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	335
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	336 // These tags are considered as "main" by Orthanc, but are not in the Series module
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	337 result.Remove(DicomTag(0x0008, 0x0070)); // Manufacturer
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	338 result.Remove(DicomTag(0x0008, 0x1010)); // Station name
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	339 result.Remove(DicomTag(0x0018, 0x0024)); // Sequence name
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	340 result.Remove(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	341 result.Remove(DICOM_TAG_IMAGES_IN_ACQUISITION);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	342 result.Remove(DICOM_TAG_NUMBER_OF_SLICES);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	343 result.Remove(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	344 result.Remove(DICOM_TAG_NUMBER_OF_TIME_SLICES);
1706 e8a7512a1e40 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1702 diff changeset	345 result.Remove(DICOM_TAG_IMAGE_ORIENTATION_PATIENT);
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	346 result.Remove(DICOM_TAG_SERIES_TYPE);
1850 68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	347 result.Remove(DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION);
68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	348 result.Remove(DICOM_TAG_CONTRAST_BOLUS_AGENT);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 void DicomMap::SetupFindInstanceTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 SetupFindTemplate(result, instanceTags, sizeof(instanceTags) / sizeof(DicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	354 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	355 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	356 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	357 result.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 void DicomMap::CopyTagIfExists(const DicomMap& source,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 const DicomTag& tag)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 if (source.HasTag(tag))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 SetValue(tag, source.GetValue(tag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	369
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	370
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	371 bool DicomMap::IsMainDicomTag(const DicomTag& tag, ResourceType level)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	372 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	373 DicomTag *tags = NULL;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	374 size_t size;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	375
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	376 switch (level)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	377 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	378 case ResourceType_Patient:
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	379 tags = patientTags;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	380 size = sizeof(patientTags) / sizeof(DicomTag);
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	381 break;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	382
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	383 case ResourceType_Study:
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	384 tags = studyTags;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	385 size = sizeof(studyTags) / sizeof(DicomTag);
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	386 break;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	387
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	388 case ResourceType_Series:
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	389 tags = seriesTags;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	390 size = sizeof(seriesTags) / sizeof(DicomTag);
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	391 break;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	392
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	393 case ResourceType_Instance:
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	394 tags = instanceTags;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	395 size = sizeof(instanceTags) / sizeof(DicomTag);
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	396 break;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	397
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	398 default:
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	399 throw OrthancException(ErrorCode_ParameterOutOfRange);
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	400 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	401
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	402 for (size_t i = 0; i < size; i++)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	403 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	404 if (tags[i] == tag)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	405 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	406 return true;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	407 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	408 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	409
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	410 return false;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	411 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	412
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	413 bool DicomMap::IsMainDicomTag(const DicomTag& tag)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	414 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	415 return (IsMainDicomTag(tag, ResourceType_Patient) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	416 IsMainDicomTag(tag, ResourceType_Study) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	417 IsMainDicomTag(tag, ResourceType_Series) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	418 IsMainDicomTag(tag, ResourceType_Instance));
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	419 }
567 c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	420
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	421
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	422 void DicomMap::GetMainDicomTagsInternal(std::set<DicomTag>& result, ResourceType level)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	423 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	424 DicomTag *tags = NULL;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	425 size_t size;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	426
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	427 switch (level)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	428 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	429 case ResourceType_Patient:
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	430 tags = patientTags;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	431 size = sizeof(patientTags) / sizeof(DicomTag);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	432 break;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	433
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	434 case ResourceType_Study:
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	435 tags = studyTags;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	436 size = sizeof(studyTags) / sizeof(DicomTag);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	437 break;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	438
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	439 case ResourceType_Series:
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	440 tags = seriesTags;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	441 size = sizeof(seriesTags) / sizeof(DicomTag);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	442 break;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	443
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	444 case ResourceType_Instance:
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	445 tags = instanceTags;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	446 size = sizeof(instanceTags) / sizeof(DicomTag);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	447 break;
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	448
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	449 default:
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	450 throw OrthancException(ErrorCode_ParameterOutOfRange);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	451 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	452
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	453 for (size_t i = 0; i < size; i++)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	454 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	455 result.insert(tags[i]);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	456 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	457 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	458
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	459
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	460 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result, ResourceType level)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	461 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	462 result.clear();
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	463 GetMainDicomTagsInternal(result, level);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	464 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	465
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	466
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	467 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	468 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	469 result.clear();
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	470 GetMainDicomTagsInternal(result, ResourceType_Patient);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	471 GetMainDicomTagsInternal(result, ResourceType_Study);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	472 GetMainDicomTagsInternal(result, ResourceType_Series);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	473 GetMainDicomTagsInternal(result, ResourceType_Instance);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	474 }
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	475
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	476
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	477 void DicomMap::GetTags(std::set<DicomTag>& tags) const
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	478 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	479 tags.clear();
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	480
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	481 for (Map::const_iterator it = map_.begin();
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	482 it != map_.end(); ++it)
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	483 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	484 tags.insert(it->first);
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	485 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	486 }
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	487
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	488
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	489 static uint16_t ReadUnsignedInteger16(const char* dicom)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	490 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	491 return le16toh(reinterpret_cast<const uint16_t>(dicom));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	492 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	493
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	494
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	495 static uint32_t ReadUnsignedInteger32(const char* dicom)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	496 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	497 return le32toh(reinterpret_cast<const uint32_t>(dicom));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	498 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	499
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	500
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	501 static bool ValidateTag(const ValueRepresentation& vr,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	502 const std::string& value)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	503 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	504 switch (vr)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	505 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	506 case ValueRepresentation_ApplicationEntity:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	507 return value.size() <= 16;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	508
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	509 case ValueRepresentation_AgeString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	510 return (value.size() == 4 &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	511 isdigit(value[0]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	512 isdigit(value[1]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	513 isdigit(value[2]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	514 (value[3] == 'D' \|\| value[3] == 'W' \|\| value[3] == 'M' \|\| value[3] == 'Y'));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	515
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	516 case ValueRepresentation_AttributeTag:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	517 return value.size() == 4;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	518
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	519 case ValueRepresentation_CodeString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	520 return value.size() <= 16;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	521
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	522 case ValueRepresentation_Date:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	523 return value.size() <= 18;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	524
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	525 case ValueRepresentation_DecimalString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	526 return value.size() <= 16;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	527
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	528 case ValueRepresentation_DateTime:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	529 return value.size() <= 54;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	530
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	531 case ValueRepresentation_FloatingPointSingle:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	532 return value.size() == 4;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	533
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	534 case ValueRepresentation_FloatingPointDouble:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	535 return value.size() == 8;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	536
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	537 case ValueRepresentation_IntegerString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	538 return value.size() <= 12;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	539
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	540 case ValueRepresentation_LongString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	541 return value.size() <= 64;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	542
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	543 case ValueRepresentation_LongText:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	544 return value.size() <= 10240;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	545
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	546 case ValueRepresentation_OtherByte:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	547 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	548
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	549 case ValueRepresentation_OtherDouble:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	550 return value.size() <= (static_cast<uint64_t>(1) << 32) - 8;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	551
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	552 case ValueRepresentation_OtherFloat:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	553 return value.size() <= (static_cast<uint64_t>(1) << 32) - 4;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	554
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	555 case ValueRepresentation_OtherLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	556 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	557
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	558 case ValueRepresentation_OtherWord:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	559 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	560
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	561 case ValueRepresentation_PersonName:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	562 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	563
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	564 case ValueRepresentation_ShortString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	565 return value.size() <= 16;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	566
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	567 case ValueRepresentation_SignedLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	568 return value.size() == 4;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	569
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	570 case ValueRepresentation_Sequence:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	571 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	572
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	573 case ValueRepresentation_SignedShort:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	574 return value.size() == 2;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	575
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	576 case ValueRepresentation_ShortText:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	577 return value.size() <= 1024;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	578
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	579 case ValueRepresentation_Time:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	580 return value.size() <= 28;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	581
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	582 case ValueRepresentation_UnlimitedCharacters:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	583 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	584
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	585 case ValueRepresentation_UniqueIdentifier:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	586 return value.size() <= 64;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	587
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	588 case ValueRepresentation_UnsignedLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	589 return value.size() == 4;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	590
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	591 case ValueRepresentation_Unknown:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	592 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	593
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	594 case ValueRepresentation_UniversalResource:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	595 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	596
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	597 case ValueRepresentation_UnsignedShort:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	598 return value.size() == 2;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	599
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	600 case ValueRepresentation_UnlimitedText:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	601 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	602
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	603 default:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	604 // Assume unsupported tags are OK
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	605 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	606 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	607 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	608
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	609
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	610 static void RemoveTagPadding(std::string& value,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	611 const ValueRepresentation& vr)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	612 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	613 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	614 * Remove padding from character strings, if need be. For the time
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	615 * being, only the UI VR is supported.
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	616 * http://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_6.2.html
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	617 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	618
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	619 switch (vr)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	620 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	621 case ValueRepresentation_UniqueIdentifier:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	622 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	623 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	624 * "Values with a VR of UI shall be padded with a single
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	625 * trailing NULL (00H) character when necessary to achieve even
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	626 * length."
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	627 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	628
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	629 if (!value.empty() &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	630 value[value.size() - 1] == '\0')
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	631 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	632 value.resize(value.size() - 1);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	633 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	634
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	635 break;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	636 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	637
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	638 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	639 * TODO implement other VR
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	640 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	641
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	642 default:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	643 // No padding is applicable to this VR
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	644 break;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	645 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	646 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	647
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	648
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	649 static bool ReadNextTag(DicomTag& tag,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	650 ValueRepresentation& vr,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	651 std::string& value,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	652 const char* dicom,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	653 size_t size,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	654 size_t& position)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	655 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	656 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	657 * http://dicom.nema.org/medical/dicom/current/output/chtml/part05/chapter_7.html#sect_7.1.2
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	658 * This function reads a data element with Explicit VR encoded using Little-Endian.
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	659 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	660
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	661 if (position + 6 > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	662 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	663 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	664 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	665
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	666 tag = DicomTag(ReadUnsignedInteger16(dicom + position),
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	667 ReadUnsignedInteger16(dicom + position + 2));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	668
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	669 vr = StringToValueRepresentation(std::string(dicom + position + 4, 2), true);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	670 if (vr == ValueRepresentation_NotSupported)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	671 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	672 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	673 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	674
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	675 if (vr == ValueRepresentation_OtherByte \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	676 vr == ValueRepresentation_OtherDouble \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	677 vr == ValueRepresentation_OtherFloat \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	678 vr == ValueRepresentation_OtherLong \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	679 vr == ValueRepresentation_OtherWord \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	680 vr == ValueRepresentation_Sequence \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	681 vr == ValueRepresentation_UnlimitedCharacters \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	682 vr == ValueRepresentation_UniversalResource \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	683 vr == ValueRepresentation_UnlimitedText \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	684 vr == ValueRepresentation_Unknown) // Note that "UN" should never appear in the Meta Information
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	685 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	686 if (position + 12 > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	687 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	688 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	689 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	690
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	691 uint32_t length = ReadUnsignedInteger32(dicom + position + 8);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	692
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	693 if (position + 12 + length > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	694 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	695 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	696 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	697
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	698 value.assign(dicom + position + 12, length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	699 position += (12 + length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	700 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	701 else
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	702 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	703 if (position + 8 > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	704 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	705 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	706 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	707
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	708 uint16_t length = ReadUnsignedInteger16(dicom + position + 6);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	709
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	710 if (position + 8 + length > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	711 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	712 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	713 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	714
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	715 value.assign(dicom + position + 8, length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	716 position += (8 + length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	717 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	718
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	719 if (!ValidateTag(vr, value))
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	720 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	721 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	722 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	723
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	724 RemoveTagPadding(value, vr);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	725
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	726 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	727 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	728
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	729
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	730 bool DicomMap::ParseDicomMetaInformation(DicomMap& result,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	731 const char* dicom,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	732 size_t size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	733 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	734 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	735 * http://dicom.nema.org/medical/dicom/current/output/chtml/part10/chapter_7.html
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	736 * According to Table 7.1-1, besides the "DICM" DICOM prefix, the
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	737 * file preamble (i.e. dicom[0..127]) should not be taken into
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	738 * account to determine whether the file is or is not a DICOM file.
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	739 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	740
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	741 if (size < 132 \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	742 dicom[128] != 'D' \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	743 dicom[129] != 'I' \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	744 dicom[130] != 'C' \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	745 dicom[131] != 'M')
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	746 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	747 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	748 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	749
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	750
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	751 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	752 * The DICOM File Meta Information must be encoded using the
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	753 * Explicit VR Little Endian Transfer Syntax
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	754 * (UID=1.2.840.10008.1.2.1).
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	755 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	756
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	757 result.Clear();
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	758
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	759 // First, we read the "File Meta Information Group Length" tag
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	760 // (0002,0000) to know where to stop reading the meta header
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	761 size_t position = 132;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	762
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	763 DicomTag tag(0x0000, 0x0000); // Dummy initialization
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	764 ValueRepresentation vr;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	765 std::string value;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	766 if (!ReadNextTag(tag, vr, value, dicom, size, position) \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	767 tag.GetGroup() != 0x0002 \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	768 tag.GetElement() != 0x0000 \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	769 vr != ValueRepresentation_UnsignedLong \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	770 value.size() != 4)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	771 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	772 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	773 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	774
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	775 size_t stopPosition = position + ReadUnsignedInteger32(value.c_str());
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	776 if (stopPosition > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	777 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	778 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	779 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	780
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	781 while (position < stopPosition)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	782 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	783 if (ReadNextTag(tag, vr, value, dicom, size, position))
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	784 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	785 result.SetValue(tag, value, IsBinaryValueRepresentation(vr));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	786 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	787 else
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	788 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	789 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	790 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	791 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	792
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	793 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	794 }
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	795
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	796
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	797 static std::string ValueAsString(const DicomMap& summary,
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	798 const DicomTag& tag)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	799 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	800 const DicomValue& value = summary.GetValue(tag);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	801 if (value.IsNull())
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	802 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	803 return "(null)";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	804 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	805 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	806 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	807 return value.GetContent();
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	808 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	809 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	810
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	811
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	812 void DicomMap::LogMissingTagsForStore() const
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	813 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	814 std::string s, t;
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	815
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	816 if (HasTag(DICOM_TAG_PATIENT_ID))
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	817 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	818 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	819 t += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	820 t += "PatientID=" + ValueAsString(*this, DICOM_TAG_PATIENT_ID);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	821 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	822 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	823 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	824 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	825 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	826 s += "PatientID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	827 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	828
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	829 if (HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	830 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	831 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	832 t += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	833 t += "StudyInstanceUID=" + ValueAsString(*this, DICOM_TAG_STUDY_INSTANCE_UID);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	834 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	835 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	836 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	837 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	838 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	839 s += "StudyInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	840 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	841
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	842 if (HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	843 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	844 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	845 t += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	846 t += "SeriesInstanceUID=" + ValueAsString(*this, DICOM_TAG_SERIES_INSTANCE_UID);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	847 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	848 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	849 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	850 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	851 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	852 s += "SeriesInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	853 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	854
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	855 if (HasTag(DICOM_TAG_SOP_INSTANCE_UID))
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	856 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	857 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	858 t += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	859 t += "SOPInstanceUID=" + ValueAsString(*this, DICOM_TAG_SOP_INSTANCE_UID);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	860 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	861 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	862 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	863 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	864 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	865 s += "SOPInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	866 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	867
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	868 if (t.size() == 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	869 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	870 LOG(ERROR) << "Store has failed because all the required tags (" << s << ") are missing (is it a DICOMDIR file?)";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	871 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	872 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	873 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	874 LOG(ERROR) << "Store has failed because required tags (" << s << ") are missing for the following instance: " << t;
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	875 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	876 }
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	877
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	878
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	879 bool DicomMap::CopyToString(std::string& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	880 const DicomTag& tag,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	881 bool allowBinary) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	882 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	883 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	884
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	885 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	886 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	887 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	888 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	889 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	890 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	891 return value->CopyToString(result, allowBinary);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	892 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	893 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	894
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	895 bool DicomMap::ParseInteger32(int32_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	896 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	897 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	898 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	899
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	900 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	901 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	902 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	903 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	904 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	905 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	906 return value->ParseInteger32(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	907 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	908 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	909
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	910 bool DicomMap::ParseInteger64(int64_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	911 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	912 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	913 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	914
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	915 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	916 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	917 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	918 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	919 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	920 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	921 return value->ParseInteger64(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	922 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	923 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	924
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	925 bool DicomMap::ParseUnsignedInteger32(uint32_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	926 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	927 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	928 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	929
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	930 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	931 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	932 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	933 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	934 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	935 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	936 return value->ParseUnsignedInteger32(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	937 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	938 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	939
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	940 bool DicomMap::ParseUnsignedInteger64(uint64_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	941 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	942 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	943 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	944
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	945 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	946 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	947 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	948 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	949 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	950 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	951 return value->ParseUnsignedInteger64(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	952 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	953 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	954
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	955 bool DicomMap::ParseFloat(float& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	956 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	957 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	958 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	959
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	960 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	961 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	962 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	963 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	964 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	965 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	966 return value->ParseFloat(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	967 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	968 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	969
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	970 bool DicomMap::ParseDouble(double& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	971 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	972 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	973 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	974
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	975 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	976 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	977 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	978 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	979 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	980 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	981 return value->ParseDouble(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	982 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	983 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	984
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	985
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	986 void DicomMap::FromDicomAsJson(const Json::Value& dicomAsJson)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	987 {
3498 957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	988 if (dicomAsJson.type() != Json::objectValue)
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	989 {
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	990 throw OrthancException(ErrorCode_BadFileFormat);
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	991 }
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	992
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	993 Clear();
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	994
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	995 Json::Value::Members tags = dicomAsJson.getMemberNames();
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	996 for (Json::Value::Members::const_iterator
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	997 it = tags.begin(); it != tags.end(); ++it)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	998 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	999 DicomTag tag(0, 0);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1000 if (!DicomTag::ParseHexadecimal(tag, it->c_str()))
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1001 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1002 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1003 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1004
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1005 const Json::Value& value = dicomAsJson[*it];
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1006
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1007 if (value.type() != Json::objectValue \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1008 !value.isMember("Type") \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1009 !value.isMember("Value") \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1010 value["Type"].type() != Json::stringValue)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1011 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1012 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1013 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1014
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1015 if (value["Type"] == "String")
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1016 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1017 if (value["Value"].type() != Json::stringValue)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1018 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1019 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1020 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1021 else
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1022 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1023 SetValue(tag, value["Value"].asString(), false /* not binary */);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1024 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1025 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1026 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1027 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1028
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1029
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1030 void DicomMap::Merge(const DicomMap& other)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1031 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1032 for (Map::const_iterator it = other.map_.begin();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1033 it != other.map_.end(); ++it)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1034 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1035 assert(it->second != NULL);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1036
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1037 if (map_.find(it->first) == map_.end())
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1038 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1039 map_[it->first] = it->second->Clone();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1040 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1041 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1042 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1043
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1044
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1045 void DicomMap::ExtractMainDicomTagsInternal(const DicomMap& other,
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1046 ResourceType level)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1047 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1048 const DicomTag* tags = NULL;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1049 size_t size = 0;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1050
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1051 LoadMainDicomTags(tags, size, level);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1052 assert(tags != NULL && size > 0);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1053
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1054 for (size_t i = 0; i < size; i++)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1055 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1056 Map::const_iterator found = other.map_.find(tags[i]);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1057
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1058 if (found != other.map_.end() &&
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1059 map_.find(tags[i]) == map_.end())
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1060 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1061 assert(found->second != NULL);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1062 map_[tags[i]] = found->second->Clone();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1063 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1064 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1065 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1066
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1067
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1068 void DicomMap::ExtractMainDicomTags(const DicomMap& other)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1069 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1070 Clear();
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1071 ExtractMainDicomTagsInternal(other, ResourceType_Patient);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1072 ExtractMainDicomTagsInternal(other, ResourceType_Study);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1073 ExtractMainDicomTagsInternal(other, ResourceType_Series);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1074 ExtractMainDicomTagsInternal(other, ResourceType_Instance);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1075 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1076
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1077
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1078 bool DicomMap::HasOnlyMainDicomTags() const
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1079 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1080 // TODO - Speed up possible by making this std::set a global variable
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1081
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1082 std::set<DicomTag> mainDicomTags;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1083 GetMainDicomTags(mainDicomTags);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1084
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1085 for (Map::const_iterator it = map_.begin(); it != map_.end(); ++it)
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1086 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1087 if (mainDicomTags.find(it->first) == mainDicomTags.end())
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1088 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1089 return false;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1090 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1091 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1092
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1093 return true;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1094 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1095
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1096
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1097 void DicomMap::Serialize(Json::Value& target) const
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1098 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1099 target = Json::objectValue;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1100
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1101 for (Map::const_iterator it = map_.begin(); it != map_.end(); ++it)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1102 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1103 assert(it->second != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1104
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1105 std::string tag = it->first.Format();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1106
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1107 Json::Value value;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1108 it->second->Serialize(value);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1109
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1110 target[tag] = value;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1111 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1112 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1113
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1114
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1115 void DicomMap::Unserialize(const Json::Value& source)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1116 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1117 Clear();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1118
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1119 if (source.type() != Json::objectValue)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1120 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1121 throw OrthancException(ErrorCode_BadFileFormat);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1122 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1123
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1124 Json::Value::Members tags = source.getMemberNames();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1125
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1126 for (size_t i = 0; i < tags.size(); i++)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1127 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1128 DicomTag tag(0, 0);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1129
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1130 if (!DicomTag::ParseHexadecimal(tag, tags[i].c_str()) \|\|
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1131 map_.find(tag) != map_.end())
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1132 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1133 throw OrthancException(ErrorCode_BadFileFormat);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1134 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1135
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1136 std::auto_ptr<DicomValue> value(new DicomValue);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1137 value->Unserialize(source[tags[i]]);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1138
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1139 map_[tag] = value.release();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1140 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1141 }
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1142
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1143
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1144 void DicomMap::FromDicomWeb(const Json::Value& source)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1145 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1146 static const char* const ALPHABETIC = "Alphabetic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1147 static const char* const IDEOGRAPHIC = "Ideographic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1148 static const char* const INLINE_BINARY = "InlineBinary";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1149 static const char* const PHONETIC = "Phonetic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1150 static const char* const VALUE = "Value";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1151 static const char* const VR = "vr";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1152
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1153 Clear();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1154
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1155 if (source.type() != Json::objectValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1156 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1157 throw OrthancException(ErrorCode_BadFileFormat);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1158 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1159
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1160 Json::Value::Members tags = source.getMemberNames();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1161
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1162 for (size_t i = 0; i < tags.size(); i++)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1163 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1164 const Json::Value& item = source[tags[i]];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1165 DicomTag tag(0, 0);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1166
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1167 if (item.type() != Json::objectValue \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1168 !item.isMember(VR) \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1169 item[VR].type() != Json::stringValue \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1170 !DicomTag::ParseHexadecimal(tag, tags[i].c_str()))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1171 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1172 throw OrthancException(ErrorCode_BadFileFormat);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1173 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1174
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1175 ValueRepresentation vr = StringToValueRepresentation(item[VR].asString(), false);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1176
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1177 if (item.isMember(INLINE_BINARY))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1178 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1179 const Json::Value& value = item[INLINE_BINARY];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1180
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1181 if (value.type() == Json::stringValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1182 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1183 std::string decoded;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1184 Toolbox::DecodeBase64(decoded, value.asString());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1185 SetValue(tag, decoded, true /* binary data */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1186 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1187 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1188 else if (!item.isMember(VALUE))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1189 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1190 // Tag is present, but it has a null value
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1191 SetValue(tag, "", false /* not binary */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1192 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1193 else
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1194 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1195 const Json::Value& value = item[VALUE];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1196
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1197 if (value.type() == Json::arrayValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1198 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1199 bool supported = true;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1200
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1201 std::string s;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1202 for (Json::Value::ArrayIndex i = 0; i < value.size() && supported; i++)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1203 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1204 if (!s.empty())
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1205 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1206 s += '\\';
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1207 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1208
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1209 switch (value[i].type())
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1210 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1211 case Json::objectValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1212 if (vr == ValueRepresentation_PersonName &&
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1213 value[i].type() == Json::objectValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1214 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1215 if (value[i].isMember(ALPHABETIC) &&
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1216 value[i][ALPHABETIC].type() == Json::stringValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1217 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1218 s += value[i][ALPHABETIC].asString();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1219 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1220
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1221 bool hasIdeographic = false;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1222
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1223 if (value[i].isMember(IDEOGRAPHIC) &&
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1224 value[i][IDEOGRAPHIC].type() == Json::stringValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1225 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1226 s += '=' + value[i][IDEOGRAPHIC].asString();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1227 hasIdeographic = true;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1228 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1229
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1230 if (value[i].isMember(PHONETIC) &&
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1231 value[i][PHONETIC].type() == Json::stringValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1232 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1233 if (!hasIdeographic)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1234 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1235 s += '=';
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1236 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1237
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1238 s += '=' + value[i][PHONETIC].asString();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1239 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1240 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1241 else
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1242 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1243 // This is the case of sequences
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1244 supported = false;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1245 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1246
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1247 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1248
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1249 case Json::stringValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1250 s += value[i].asString();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1251 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1252
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1253 case Json::intValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1254 s += boost::lexical_cast<std::string>(value[i].asInt());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1255 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1256
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1257 case Json::uintValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1258 s += boost::lexical_cast<std::string>(value[i].asUInt());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1259 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1260
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1261 case Json::realValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1262 s += boost::lexical_cast<std::string>(value[i].asDouble());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1263 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1264
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1265 default:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1266 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1267 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1268 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1269
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1270 if (supported)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1271 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1272 SetValue(tag, s, false /* not binary */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1273 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1274 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1275 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1276 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1277 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1278 }

Mercurial > hg > orthanc

annotate Core/DicomFormat/DicomMap.cpp @ 3512:4bced7d1ec20