orthanc: OrthancFramework/Sources/DicomFormat/DicomMap.cpp annotate

annotate OrthancFramework/Sources/DicomFormat/DicomMap.cpp @ 4640:66109d24d26e

"ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 26 Apr 2021 15:22:44 +0200
parents	11c2ddb4e2ca
children	b47ee86a0d10

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
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	5 * Copyright (C) 2017-2021 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
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 84 diff changeset	11 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * 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	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	15 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 730 diff changeset	23 #include "../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "DicomMap.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #include <memory>
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	28
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	29 #include "../Compatibility.h"
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	30 #include "../Endianness.h"
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	31 #include "../Logging.h"
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	32 #include "../OrthancException.h"
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	33 #include "../Toolbox.h"
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	34 #include "DicomArray.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	37 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	39 namespace
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	41 struct MainDicomTag
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	42 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	43 const DicomTag tag_;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	44 const char* name_;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	45 };
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	46 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	48 static const MainDicomTag PATIENT_MAIN_DICOM_TAGS[] =
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	50 // { DicomTag(0x0010, 0x1010), "PatientAge" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	51 // { DicomTag(0x0010, 0x1040), "PatientAddress" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	52 { DicomTag(0x0010, 0x0010), "PatientName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	53 { DicomTag(0x0010, 0x0030), "PatientBirthDate" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	54 { DicomTag(0x0010, 0x0040), "PatientSex" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	55 { DicomTag(0x0010, 0x1000), "OtherPatientIDs" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	56 { DICOM_TAG_PATIENT_ID, "PatientID" }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 };
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	58
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	59 static const MainDicomTag STUDY_MAIN_DICOM_TAGS[] =
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	60 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	61 // { DicomTag(0x0010, 0x1020), "PatientSize" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	62 // { DicomTag(0x0010, 0x1030), "PatientWeight" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	63 { DICOM_TAG_STUDY_DATE, "StudyDate" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	64 { DicomTag(0x0008, 0x0030), "StudyTime" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	65 { DicomTag(0x0020, 0x0010), "StudyID" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	66 { DICOM_TAG_STUDY_DESCRIPTION, "StudyDescription" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	67 { DICOM_TAG_ACCESSION_NUMBER, "AccessionNumber" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	68 { DICOM_TAG_STUDY_INSTANCE_UID, "StudyInstanceUID" },
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	70 // New in db v6
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	71 { DICOM_TAG_REQUESTED_PROCEDURE_DESCRIPTION, "RequestedProcedureDescription" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	72 { DICOM_TAG_INSTITUTION_NAME, "InstitutionName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	73 { DICOM_TAG_REQUESTING_PHYSICIAN, "RequestingPhysician" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	74 { DICOM_TAG_REFERRING_PHYSICIAN_NAME, "ReferringPhysicianName" }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	75 };
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	76
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	77 static const MainDicomTag SERIES_MAIN_DICOM_TAGS[] =
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	79 // { DicomTag(0x0010, 0x1080), "MilitaryRank" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	80 { DicomTag(0x0008, 0x0021), "SeriesDate" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	81 { DicomTag(0x0008, 0x0031), "SeriesTime" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	82 { DICOM_TAG_MODALITY, "Modality" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	83 { DicomTag(0x0008, 0x0070), "Manufacturer" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	84 { DicomTag(0x0008, 0x1010), "StationName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	85 { DICOM_TAG_SERIES_DESCRIPTION, "SeriesDescription" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	86 { DicomTag(0x0018, 0x0015), "BodyPartExamined" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	87 { DicomTag(0x0018, 0x0024), "SequenceName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	88 { DicomTag(0x0018, 0x1030), "ProtocolName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	89 { DicomTag(0x0020, 0x0011), "SeriesNumber" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	90 { DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES, "CardiacNumberOfImages" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	91 { DICOM_TAG_IMAGES_IN_ACQUISITION, "ImagesInAcquisition" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	92 { DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS, "NumberOfTemporalPositions" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	93 { DICOM_TAG_NUMBER_OF_SLICES, "NumberOfSlices" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	94 { DICOM_TAG_NUMBER_OF_TIME_SLICES, "NumberOfTimeSlices" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	95 { DICOM_TAG_SERIES_INSTANCE_UID, "SeriesInstanceUID" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	96
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	97 // New in db v6
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	98 { DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "ImageOrientationPatient" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	99 { DICOM_TAG_SERIES_TYPE, "SeriesType" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	100 { DICOM_TAG_OPERATOR_NAME, "OperatorsName" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	101 { DICOM_TAG_PERFORMED_PROCEDURE_STEP_DESCRIPTION, "PerformedProcedureStepDescription" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	102 { DICOM_TAG_ACQUISITION_DEVICE_PROCESSING_DESCRIPTION, "AcquisitionDeviceProcessingDescription" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	103 { DICOM_TAG_CONTRAST_BOLUS_AGENT, "ContrastBolusAgent" }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 };
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	105
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	106 static const MainDicomTag INSTANCE_MAIN_DICOM_TAGS[] =
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	108 { DicomTag(0x0008, 0x0012), "InstanceCreationDate" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	109 { DicomTag(0x0008, 0x0013), "InstanceCreationTime" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	110 { DicomTag(0x0020, 0x0012), "AcquisitionNumber" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	111 { DICOM_TAG_IMAGE_INDEX, "ImageIndex" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	112 { DICOM_TAG_INSTANCE_NUMBER, "InstanceNumber" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	113 { DICOM_TAG_NUMBER_OF_FRAMES, "NumberOfFrames" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	114 { DICOM_TAG_TEMPORAL_POSITION_IDENTIFIER, "TemporalPositionIdentifier" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	115 { DICOM_TAG_SOP_INSTANCE_UID, "SOPInstanceUID" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	116
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	117 // New in db v6
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	118 { DICOM_TAG_IMAGE_POSITION_PATIENT, "ImagePositionPatient" },
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	119 { DICOM_TAG_IMAGE_COMMENTS, "ImageComments" },
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	120
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 * 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	123 * 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	124 * 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	125 * 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	126 * 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	127 **/
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	128 { DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "ImageOrientationPatient" } // New in Orthanc 1.4.2
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	132 static void LoadMainDicomTags(const MainDicomTag*& tags,
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	133 size_t& size,
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	134 ResourceType level)
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	135 {
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	136 switch (level)
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	137 {
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	138 case ResourceType_Patient:
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	139 tags = PATIENT_MAIN_DICOM_TAGS;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	140 size = sizeof(PATIENT_MAIN_DICOM_TAGS) / sizeof(MainDicomTag);
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	141 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	142
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	143 case ResourceType_Study:
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	144 tags = STUDY_MAIN_DICOM_TAGS;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	145 size = sizeof(STUDY_MAIN_DICOM_TAGS) / sizeof(MainDicomTag);
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	146 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	147
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	148 case ResourceType_Series:
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	149 tags = SERIES_MAIN_DICOM_TAGS;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	150 size = sizeof(SERIES_MAIN_DICOM_TAGS) / sizeof(MainDicomTag);
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	151 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	152
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	153 case ResourceType_Instance:
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	154 tags = INSTANCE_MAIN_DICOM_TAGS;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	155 size = sizeof(INSTANCE_MAIN_DICOM_TAGS) / sizeof(MainDicomTag);
1749 99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	156 break;
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	157
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	158 default:
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	159 throw OrthancException(ErrorCode_ParameterOutOfRange);
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	160 }
99f4a05f39fa various types of constraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	161 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	164 static void LoadMainDicomTags(std::map<DicomTag, std::string>& target,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	165 ResourceType level)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	166 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	167 const MainDicomTag* tags = NULL;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	168 size_t size;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	169 LoadMainDicomTags(tags, size, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	170
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	171 assert(tags != NULL &&
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	172 size != 0);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	173
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	174 for (size_t i = 0; i < size; i++)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	175 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	176 assert(target.find(tags[i].tag_) == target.end());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	177
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	178 target[tags[i].tag_] = tags[i].name_;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	179 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	180 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	181
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	182
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	183 namespace
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	184 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	185 class DicomTag2 : public DicomTag
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	186 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	187 public:
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	188 DicomTag2() :
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	189 DicomTag(0, 0) // To make std::map<> happy
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	190 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	191 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	192
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	193 explicit DicomTag2(const DicomTag& tag) :
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	194 DicomTag(tag)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	195 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	196 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	197 };
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	198 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	199
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	200
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	201 static void LoadMainDicomTags(std::map<std::string, DicomTag2>& target,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	202 ResourceType level)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	203 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	204 const MainDicomTag* tags = NULL;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	205 size_t size;
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	206 LoadMainDicomTags(tags, size, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	207
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	208 assert(tags != NULL &&
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	209 size != 0);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	210
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	211 for (size_t i = 0; i < size; i++)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	212 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	213 assert(target.find(tags[i].name_) == target.end());
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	214
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	215 target[tags[i].name_] = DicomTag2(tags[i].tag_);
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	216 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	217 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	218
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	219
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	220 void DicomMap::SetValueInternal(uint16_t group,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	221 uint16_t element,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	222 DicomValue* value)
0 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 DicomTag tag(group, element);
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	225 Content::iterator it = content_.find(tag);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	227 if (it != content_.end())
0 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 delete it->second;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 it->second = value;
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 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	234 content_.insert(std::make_pair(tag, value));
0 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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 void DicomMap::Clear()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	241 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 {
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	243 assert(it->second != NULL);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 delete it->second;
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
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	247 content_.clear();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	250 void DicomMap::SetNullValue(uint16_t group, uint16_t element)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	251 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	252 SetValueInternal(group, element, new DicomValue);
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	253 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	254
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	255 void DicomMap::SetNullValue(const DicomTag &tag)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	256 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	257 SetValueInternal(tag.GetGroup(), tag.GetElement(), new DicomValue);
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	258 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	259
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	260 void DicomMap::SetValue(uint16_t group, uint16_t element, const DicomValue &value)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	261 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	262 SetValueInternal(group, element, value.Clone());
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	263 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	264
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	265 void DicomMap::SetValue(const DicomTag &tag, const DicomValue &value)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	266 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	267 SetValueInternal(tag.GetGroup(), tag.GetElement(), value.Clone());
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	268 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	269
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	270 void DicomMap::SetValue(const DicomTag &tag, const std::string &str, bool isBinary)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	271 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	272 SetValueInternal(tag.GetGroup(), tag.GetElement(), new DicomValue(str, isBinary));
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	273 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	274
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	275 void DicomMap::SetValue(uint16_t group, uint16_t element, const std::string &str, bool isBinary)
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	276 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	277 SetValueInternal(group, element, new DicomValue(str, isBinary));
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	278 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	279
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	280 bool DicomMap::HasTag(uint16_t group, uint16_t element) const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	281 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	282 return HasTag(DicomTag(group, element));
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	283 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	284
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	285 bool DicomMap::HasTag(const DicomTag &tag) const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	286 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	287 return content_.find(tag) != content_.end();
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	288 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	289
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	290 const DicomValue &DicomMap::GetValue(uint16_t group, uint16_t element) const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	291 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	292 return GetValue(DicomTag(group, element));
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	293 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	294
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	296 static void ExtractTags(DicomMap& result,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	297 const DicomMap::Content& source,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	298 const MainDicomTag* tags,
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	299 size_t count)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 result.Clear();
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 for (unsigned int i = 0; i < count; i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	305 DicomMap::Content::const_iterator it = source.find(tags[i].tag_);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	306 if (it != source.end())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	308 result.SetValue(it->first, it->second / value will be cloned */);
0 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 }
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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 void DicomMap::ExtractPatientInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	316 ExtractTags(result, content_, PATIENT_MAIN_DICOM_TAGS, sizeof(PATIENT_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
0 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
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 void DicomMap::ExtractStudyInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	321 ExtractTags(result, content_, STUDY_MAIN_DICOM_TAGS, sizeof(STUDY_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 void DicomMap::ExtractSeriesInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	326 ExtractTags(result, content_, SERIES_MAIN_DICOM_TAGS, sizeof(SERIES_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
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::ExtractInstanceInformation(DicomMap& result) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	331 ExtractTags(result, content_, INSTANCE_MAIN_DICOM_TAGS, sizeof(INSTANCE_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4296 diff changeset	335 DicomMap::~DicomMap()
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	336 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	337 Clear();
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	338 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	339
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	340 size_t DicomMap::GetSize() const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	341 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	342 return content_.size();
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	343 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	344
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	345
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 DicomMap* DicomMap::Clone() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	348 std::unique_ptr<DicomMap> result(new DicomMap);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	350 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	352 result->content_.insert(std::make_pair(it->first, it->second->Clone()));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 return result.release();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	359 void DicomMap::Assign(const DicomMap& other)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	360 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	361 Clear();
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	362
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	363 for (Content::const_iterator it = other.content_.begin(); it != other.content_.end(); ++it)
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	364 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	365 content_.insert(std::make_pair(it->first, it->second->Clone()));
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	366 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	367 }
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	368
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	369
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 const DicomValue& DicomMap::GetValue(const DicomTag& tag) const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	372 const DicomValue* value = TestAndGetValue(tag);
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	373
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	374 if (value)
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	375 {
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	376 return *value;
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	377 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	378 else
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	379 {
730 309e686b41e7 better logging about nonexistent tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	380 throw OrthancException(ErrorCode_InexistentTag);
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	381 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	382 }
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	383
4296 3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	384 const DicomValue *DicomMap::TestAndGetValue(uint16_t group, uint16_t element) const
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	385 {
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	386 return TestAndGetValue(DicomTag(group, element));
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	387 }
3b70a2e6a06c moving inline methods to source files for ABI compatibility Sebastien Jodogne <s.jodogne@gmail.com> parents: 4214 diff changeset	388
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	389
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	390 const DicomValue* DicomMap::TestAndGetValue(const DicomTag& tag) const
6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	391 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	392 Content::const_iterator it = content_.find(tag);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	394 if (it == content_.end())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	396 return NULL;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 {
80 6212bf978584 status of series Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	400 return it->second;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 void DicomMap::Remove(const DicomTag& tag)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	407 Content::iterator it = content_.find(tag);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	408 if (it != content_.end())
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 delete it->second;
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	411 content_.erase(it);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 static void SetupFindTemplate(DicomMap& result,
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	417 const MainDicomTag* tags,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 size_t count)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 result.Clear();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 for (size_t i = 0; i < count; i++)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	424 result.SetValue(tags[i].tag_, "", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 void DicomMap::SetupFindPatientTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	430 SetupFindTemplate(result, PATIENT_MAIN_DICOM_TAGS, sizeof(PATIENT_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 void DicomMap::SetupFindStudyTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	435 SetupFindTemplate(result, STUDY_MAIN_DICOM_TAGS, sizeof(STUDY_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	436 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	437 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	438
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	439 // 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	440 // General Study Module, remove them
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	441 result.Remove(DICOM_TAG_INSTITUTION_NAME);
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	442 result.Remove(DICOM_TAG_REQUESTING_PHYSICIAN);
e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	443 result.Remove(DICOM_TAG_REQUESTED_PROCEDURE_DESCRIPTION);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 void DicomMap::SetupFindSeriesTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	448 SetupFindTemplate(result, SERIES_MAIN_DICOM_TAGS, sizeof(SERIES_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	449 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	450 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	451 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "", false);
1372 1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	452
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	453 // 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	454 result.Remove(DicomTag(0x0008, 0x0070)); // Manufacturer
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	455 result.Remove(DicomTag(0x0008, 0x1010)); // Station name
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	456 result.Remove(DicomTag(0x0018, 0x0024)); // Sequence name
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	457 result.Remove(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	458 result.Remove(DICOM_TAG_IMAGES_IN_ACQUISITION);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	459 result.Remove(DICOM_TAG_NUMBER_OF_SLICES);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	460 result.Remove(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS);
1412ec22ee0b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	461 result.Remove(DICOM_TAG_NUMBER_OF_TIME_SLICES);
1706 e8a7512a1e40 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1702 diff changeset	462 result.Remove(DICOM_TAG_IMAGE_ORIENTATION_PATIENT);
1848 e39716f71d67 new main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1841 diff changeset	463 result.Remove(DICOM_TAG_SERIES_TYPE);
1850 68854412c7bc new main dicomtags: AcquisitionDeviceProcessingDescription and ContrastBolusAgent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1848 diff changeset	464 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	465 result.Remove(DICOM_TAG_CONTRAST_BOLUS_AGENT);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 void DicomMap::SetupFindInstanceTemplate(DicomMap& result)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	470 SetupFindTemplate(result, INSTANCE_MAIN_DICOM_TAGS, sizeof(INSTANCE_MAIN_DICOM_TAGS) / sizeof(MainDicomTag));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	471 result.SetValue(DICOM_TAG_ACCESSION_NUMBER, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	472 result.SetValue(DICOM_TAG_PATIENT_ID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	473 result.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, "", false);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	474 result.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, "", false);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 void DicomMap::CopyTagIfExists(const DicomMap& source,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 const DicomTag& tag)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 if (source.HasTag(tag))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 SetValue(tag, source.GetValue(tag));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 }
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	486
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	487
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	488 bool DicomMap::IsMainDicomTag(const DicomTag& tag, ResourceType level)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	489 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	490 const MainDicomTag *tags = NULL;
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	491 size_t size;
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	492 LoadMainDicomTags(tags, size, level);
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	493
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	494 for (size_t i = 0; i < size; i++)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	495 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	496 if (tags[i].tag_ == tag)
562 f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	497 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	498 return true;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	499 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	500 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	501
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	502 return false;
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	503 }
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	504
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	505 bool DicomMap::IsMainDicomTag(const DicomTag& tag)
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	506 {
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	507 return (IsMainDicomTag(tag, ResourceType_Patient) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	508 IsMainDicomTag(tag, ResourceType_Study) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	509 IsMainDicomTag(tag, ResourceType_Series) \|\|
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	510 IsMainDicomTag(tag, ResourceType_Instance));
f64e3838d6e1 refactoring enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	511 }
567 c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	512
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	513
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	514 void DicomMap::GetMainDicomTagsInternal(std::set<DicomTag>& result, ResourceType level)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	515 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	516 const MainDicomTag *tags = NULL;
567 c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	517 size_t size;
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	518 LoadMainDicomTags(tags, size, level);
567 c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	519
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	520 for (size_t i = 0; i < size; i++)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	521 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	522 result.insert(tags[i].tag_);
567 c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	523 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	524 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	525
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	526
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	527 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result, ResourceType level)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	528 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	529 result.clear();
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	530 GetMainDicomTagsInternal(result, level);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	531 }
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	532
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	533
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	534 void DicomMap::GetMainDicomTags(std::set<DicomTag>& result)
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	535 {
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	536 result.clear();
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	537 GetMainDicomTagsInternal(result, ResourceType_Patient);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	538 GetMainDicomTagsInternal(result, ResourceType_Study);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	539 GetMainDicomTagsInternal(result, ResourceType_Series);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	540 GetMainDicomTagsInternal(result, ResourceType_Instance);
c2be0a0e049e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 562 diff changeset	541 }
1206 f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	542
f5b0207967bc Fix issue 19 (YBR_FULL are decoded incorrectly) Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	543
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	544 void DicomMap::GetTags(std::set<DicomTag>& tags) const
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	545 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	546 tags.clear();
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	547
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	548 for (Content::const_iterator it = content_.begin();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	549 it != content_.end(); ++it)
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	550 {
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	551 tags.insert(it->first);
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	552 }
0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1310 diff changeset	553 }
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
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	556 static uint16_t ReadLittleEndianUint16(const char* dicom)
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	557 {
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	558 const uint8_t* p = reinterpret_cast<const uint8_t*>(dicom);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	559
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	560 return (static_cast<uint16_t>(p[0]) \|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	561 (static_cast<uint16_t>(p[1]) << 8));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	562 }
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
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	565 static uint32_t ReadLittleEndianUint32(const char* dicom)
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	566 {
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	567 const uint8_t* p = reinterpret_cast<const uint8_t*>(dicom);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	568
4214 7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	569 return (static_cast<uint32_t>(p[0]) \|
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	570 (static_cast<uint32_t>(p[1]) << 8) \|
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	571 (static_cast<uint32_t>(p[2]) << 16) \|
7b011cfda135 working on DicomStreamReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 4213 diff changeset	572 (static_cast<uint32_t>(p[3]) << 24));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	573 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	574
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 static bool ValidateTag(const ValueRepresentation& vr,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	577 const std::string& value)
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 switch (vr)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	580 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	581 case ValueRepresentation_ApplicationEntity:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	582 return value.size() <= 16;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	583
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	584 case ValueRepresentation_AgeString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	585 return (value.size() == 4 &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	586 isdigit(value[0]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	587 isdigit(value[1]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	588 isdigit(value[2]) &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	589 (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	590
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	591 case ValueRepresentation_AttributeTag:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	592 return value.size() == 4;
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_CodeString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	595 return value.size() <= 16;
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_Date:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	598 return value.size() <= 18;
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_DecimalString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	601 return value.size() <= 16;
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 case ValueRepresentation_DateTime:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	604 return value.size() <= 54;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	605
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	606 case ValueRepresentation_FloatingPointSingle:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	607 return value.size() == 4;
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 case ValueRepresentation_FloatingPointDouble:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	610 return value.size() == 8;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	611
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	612 case ValueRepresentation_IntegerString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	613 return value.size() <= 12;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	614
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	615 case ValueRepresentation_LongString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	616 return value.size() <= 64;
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 case ValueRepresentation_LongText:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	619 return value.size() <= 10240;
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_OtherByte:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	622 return true;
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 case ValueRepresentation_OtherDouble:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	625 return value.size() <= (static_cast<uint64_t>(1) << 32) - 8;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	626
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	627 case ValueRepresentation_OtherFloat:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	628 return value.size() <= (static_cast<uint64_t>(1) << 32) - 4;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	629
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	630 case ValueRepresentation_OtherLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	631 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	632
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	633 case ValueRepresentation_OtherWord:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	634 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	635
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	636 case ValueRepresentation_PersonName:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	637 return true;
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 case ValueRepresentation_ShortString:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	640 return value.size() <= 16;
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 case ValueRepresentation_SignedLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	643 return value.size() == 4;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	644
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	645 case ValueRepresentation_Sequence:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	646 return true;
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 case ValueRepresentation_SignedShort:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	649 return value.size() == 2;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	650
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	651 case ValueRepresentation_ShortText:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	652 return value.size() <= 1024;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	653
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	654 case ValueRepresentation_Time:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	655 return value.size() <= 28;
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 case ValueRepresentation_UnlimitedCharacters:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	658 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 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 case ValueRepresentation_UniqueIdentifier:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	661 return value.size() <= 64;
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 case ValueRepresentation_UnsignedLong:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	664 return value.size() == 4;
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 case ValueRepresentation_Unknown:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	667 return true;
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 case ValueRepresentation_UniversalResource:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	670 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 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 case ValueRepresentation_UnsignedShort:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	673 return value.size() == 2;
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 case ValueRepresentation_UnlimitedText:
2013 f6e68c0c2737 fix for msvc Sebastien Jodogne <s.jodogne@gmail.com> parents: 2008 diff changeset	676 return value.size() <= (static_cast<uint64_t>(1) << 32) - 2;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	677
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	678 default:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	679 // Assume unsupported tags are OK
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	680 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	681 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	682 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	683
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	684
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	685 static void RemoveTagPadding(std::string& value,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	686 const ValueRepresentation& vr)
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 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	689 * Remove padding from character strings, if need be. For the time
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	690 * being, only the UI VR is supported.
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	691 * 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	692 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	693
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	694 switch (vr)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	695 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	696 case ValueRepresentation_UniqueIdentifier:
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 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	699 * "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	700 * trailing NULL (00H) character when necessary to achieve even
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	701 * length."
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
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	704 if (!value.empty() &&
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	705 value[value.size() - 1] == '\0')
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 value.resize(value.size() - 1);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	708 }
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 break;
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
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 * TODO implement other VR
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	715 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	716
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	717 default:
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	718 // No padding is applicable to this VR
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	719 break;
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 }
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 static bool ReadNextTag(DicomTag& tag,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	725 ValueRepresentation& vr,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	726 std::string& value,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	727 const char* dicom,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	728 size_t size,
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	729 size_t& position)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	730 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	731 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	732 * 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	733 * 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	734 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	735
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	736 if (position + 6 > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	737 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	738 return false;
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
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	741 tag = DicomTag(ReadLittleEndianUint16(dicom + position),
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	742 ReadLittleEndianUint16(dicom + position + 2));
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	743
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	744 vr = StringToValueRepresentation(std::string(dicom + position + 4, 2), true);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	745 if (vr == ValueRepresentation_NotSupported)
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
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	750 // http://dicom.nema.org/medical/dicom/current/output/chtml/part05/chapter_7.html#sect_7.1.2
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	751 if (vr == ValueRepresentation_ApplicationEntity /* AE */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	752 vr == ValueRepresentation_AgeString /* AS */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	753 vr == ValueRepresentation_AttributeTag /* AT */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	754 vr == ValueRepresentation_CodeString /* CS */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	755 vr == ValueRepresentation_Date /* DA */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	756 vr == ValueRepresentation_DecimalString /* DS */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	757 vr == ValueRepresentation_DateTime /* DT */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	758 vr == ValueRepresentation_FloatingPointSingle /* FL */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	759 vr == ValueRepresentation_FloatingPointDouble /* FD */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	760 vr == ValueRepresentation_IntegerString /* IS */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	761 vr == ValueRepresentation_LongString /* LO */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	762 vr == ValueRepresentation_LongText /* LT */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	763 vr == ValueRepresentation_PersonName /* PN */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	764 vr == ValueRepresentation_ShortString /* SH */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	765 vr == ValueRepresentation_SignedLong /* SL */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	766 vr == ValueRepresentation_SignedShort /* SS */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	767 vr == ValueRepresentation_ShortText /* ST */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	768 vr == ValueRepresentation_Time /* TM */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	769 vr == ValueRepresentation_UniqueIdentifier /* UI */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	770 vr == ValueRepresentation_UnsignedLong /* UL */ \|\|
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	771 vr == ValueRepresentation_UnsignedShort /* US */)
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	772 {
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	773 /**
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	774 * This is Table 7.1-2. "Data Element with Explicit VR of AE,
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	775 * AS, AT, CS, DA, DS, DT, FL, FD, IS, LO, LT, PN, SH, SL, SS,
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	776 * ST, TM, UI, UL and US"
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	777 **/
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	778 if (position + 8 > size)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	779 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	780 return false;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	781 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	782
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	783 uint16_t length = ReadLittleEndianUint16(dicom + position + 6);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	784 if (position + 8 + length > size)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	785 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	786 return false;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	787 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	788
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	789 value.assign(dicom + position + 8, length);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	790 position += (8 + length);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	791 }
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	792 else
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	793 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	794 /**
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	795 * This is Table 7.1-1. "Data Element with Explicit VR other
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	796 * than as shown in Table 7.1-2"
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	797 **/
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	798 if (position + 12 > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	799 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	800 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	801 }
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	802
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	803 uint16_t reserved = ReadLittleEndianUint16(dicom + position + 6);
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	804 if (reserved != 0)
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	805 {
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	806 return false;
be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	807 }
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	808
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	809 uint32_t length = ReadLittleEndianUint32(dicom + position + 8);
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	810 if (position + 12 + length > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	811 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	812 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	813 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	814
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	815 value.assign(dicom + position + 12, length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	816 position += (12 + length);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	817 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	818
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	819 if (!ValidateTag(vr, value))
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	820 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	821 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	822 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	823
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	824 RemoveTagPadding(value, vr);
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	825
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	826 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	827 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	828
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	829
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	830 bool DicomMap::IsDicomFile(const void* dicom,
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	831 size_t size)
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	832 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	833 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	834 * 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	835 * 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	836 * 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	837 * 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	838 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	839
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	840 const uint8_t* p = reinterpret_cast<const uint8_t*>(dicom);
e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	841
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	842 return (size >= 132 &&
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	843 p[128] == 'D' &&
e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	844 p[129] == 'I' &&
e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	845 p[130] == 'C' &&
e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	846 p[131] == 'M');
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	847 }
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	848
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	849
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	850 bool DicomMap::ParseDicomMetaInformation(DicomMap& result,
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	851 const void* dicom,
3771 74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	852 size_t size)
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	853 {
74889e6f6d68 fix memory issues if parsing invalid DICOM file Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	854 if (!IsDicomFile(dicom, size))
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	855 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	856 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	857 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	858
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	859
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	860 /**
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	861 * The DICOM File Meta Information must be encoded using the
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	862 * Explicit VR Little Endian Transfer Syntax
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	863 * (UID=1.2.840.10008.1.2.1).
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	864 **/
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	865
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	866 result.Clear();
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	867
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	868 // First, we read the "File Meta Information Group Length" tag
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	869 // (0002,0000) to know where to stop reading the meta header
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	870 size_t position = 132;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	871
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	872 DicomTag tag(0x0000, 0x0000); // Dummy initialization
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	873 ValueRepresentation vr;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	874 std::string value;
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	875 if (!ReadNextTag(tag, vr, value, reinterpret_cast<const char*>(dicom), size, position) \|\|
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	876 tag.GetGroup() != 0x0002 \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	877 tag.GetElement() != 0x0000 \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	878 vr != ValueRepresentation_UnsignedLong \|\|
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	879 value.size() != 4)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	880 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	881 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	882 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	883
4213 be2eca8b02e1 testing DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	884 size_t stopPosition = position + ReadLittleEndianUint32(value.c_str());
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	885 if (stopPosition > size)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	886 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	887 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	888 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	889
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	890 while (position < stopPosition)
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	891 {
3840 e7003b2203a7 fixing signature of DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3771 diff changeset	892 if (ReadNextTag(tag, vr, value, reinterpret_cast<const char*>(dicom), size, position))
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	893 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	894 result.SetValue(tag, value, IsBinaryValueRepresentation(vr));
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	895 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	896 else
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	897 {
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	898 return false;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	899 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	900 }
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	901
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	902 return true;
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	903 }
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	904
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	905
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	906 static std::string ValueAsString(const DicomMap& summary,
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	907 const DicomTag& tag)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	908 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	909 const DicomValue& value = summary.GetValue(tag);
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	910 if (value.IsNull())
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	911 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	912 return "(null)";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	913 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	914 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	915 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	916 return value.GetContent();
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	917 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	918 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	919
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	920
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	921 void DicomMap::LogMissingTagsForStore() const
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	922 {
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	923 std::string patientId, studyInstanceUid, seriesInstanceUid, sopInstanceUid;
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	924
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	925 if (HasTag(DICOM_TAG_PATIENT_ID))
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	926 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	927 patientId = ValueAsString(*this, DICOM_TAG_PATIENT_ID);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	928 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	929
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	930 if (HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	931 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	932 studyInstanceUid = ValueAsString(*this, DICOM_TAG_STUDY_INSTANCE_UID);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	933 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	934
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	935 if (HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	936 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	937 seriesInstanceUid = ValueAsString(*this, DICOM_TAG_SERIES_INSTANCE_UID);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	938 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	939
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	940 if (HasTag(DICOM_TAG_SOP_INSTANCE_UID))
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	941 {
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	942 sopInstanceUid = ValueAsString(*this, DICOM_TAG_SOP_INSTANCE_UID);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	943 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	944
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	945 LogMissingTagsForStore(patientId, studyInstanceUid, seriesInstanceUid, sopInstanceUid);
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	946 }
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	947
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	948
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	949 void DicomMap::LogMissingTagsForStore(const std::string& patientId,
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	950 const std::string& studyInstanceUid,
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	951 const std::string& seriesInstanceUid,
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	952 const std::string& sopInstanceUid)
11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	953 {
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	954 std::string s, t;
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	955
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	956 if (!patientId.empty())
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	957 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	958 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	959 t += ", ";
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	960 t += "PatientID=" + patientId;
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	961 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	962 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	963 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	964 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	965 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	966 s += "PatientID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	967 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	968
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	969 if (!studyInstanceUid.empty())
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	970 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	971 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	972 t += ", ";
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	973 t += "StudyInstanceUID=" + studyInstanceUid;
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	974 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	975 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	976 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	977 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	978 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	979 s += "StudyInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	980 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	981
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	982 if (!seriesInstanceUid.empty())
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	983 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	984 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	985 t += ", ";
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	986 t += "SeriesInstanceUID=" + seriesInstanceUid;
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	987 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	988 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	989 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	990 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	991 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	992 s += "SeriesInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	993 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	994
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	995 if (!sopInstanceUid.empty())
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	996 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	997 if (t.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	998 t += ", ";
4501 11c2ddb4e2ca FromDcmtkBridge::LogMissingTagsForStore() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	999 t += "SOPInstanceUID=" + sopInstanceUid;
2380 96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1000 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1001 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1002 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1003 if (s.size() > 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1004 s += ", ";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1005 s += "SOPInstanceUID";
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1006 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1007
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1008 if (t.size() == 0)
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1009 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1010 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	1011 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1012 else
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1013 {
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1014 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	1015 }
96b3ec054b69 reorganization in macros Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	1016 }
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1017
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1018
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1019 bool DicomMap::LookupStringValue(std::string& result,
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1020 const DicomTag& tag,
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1021 bool allowBinary) const
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1022 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1023 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1024
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1025 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1026 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1027 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1028 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1029 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1030 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1031 return value->CopyToString(result, allowBinary);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1032 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1033 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1034
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1035 bool DicomMap::ParseInteger32(int32_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1036 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1037 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1038 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1039
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1040 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1041 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1042 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1043 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1044 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1045 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1046 return value->ParseInteger32(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1047 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1048 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1049
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1050 bool DicomMap::ParseInteger64(int64_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1051 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1052 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1053 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1054
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1055 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1056 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1057 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1058 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1059 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1060 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1061 return value->ParseInteger64(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1062 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1063 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1064
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1065 bool DicomMap::ParseUnsignedInteger32(uint32_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1066 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1067 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1068 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1069
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1070 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1071 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1072 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1073 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1074 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1075 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1076 return value->ParseUnsignedInteger32(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1077 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1078 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1079
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1080 bool DicomMap::ParseUnsignedInteger64(uint64_t& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1081 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1082 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1083 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1084
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1085 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1086 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1087 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1088 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1089 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1090 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1091 return value->ParseUnsignedInteger64(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1092 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1093 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1094
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1095 bool DicomMap::ParseFloat(float& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1096 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1097 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1098 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1099
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1100 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1101 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1102 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1103 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1104 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1105 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1106 return value->ParseFloat(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1107 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1108 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1109
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1110 bool DicomMap::ParseFirstFloat(float& result,
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1111 const DicomTag& tag) const
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1112 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1113 const DicomValue* value = TestAndGetValue(tag);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1114
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1115 if (value == NULL)
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1116 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1117 return false;
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1118 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1119 else
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1120 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1121 return value->ParseFirstFloat(result);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1122 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1123 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3678 diff changeset	1124
2412 cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1125 bool DicomMap::ParseDouble(double& result,
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1126 const DicomTag& tag) const
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1127 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1128 const DicomValue* value = TestAndGetValue(tag);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1129
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1130 if (value == NULL)
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1131 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1132 return false;
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1133 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1134 else
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1135 {
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1136 return value->ParseDouble(result);
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1137 }
cad393b41bc3 handy shortcuts in DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2380 diff changeset	1138 }
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1139
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1140
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1141 void DicomMap::FromDicomAsJson(const Json::Value& dicomAsJson)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1142 {
3498 957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	1143 if (dicomAsJson.type() != Json::objectValue)
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	1144 {
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	1145 throw OrthancException(ErrorCode_BadFileFormat);
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	1146 }
957e06cbe76a additional check Sebastien Jodogne <s.jodogne@gmail.com> parents: 3496 diff changeset	1147
3005 8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1148 Clear();
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1149
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1150 Json::Value::Members tags = dicomAsJson.getMemberNames();
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1151 for (Json::Value::Members::const_iterator
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1152 it = tags.begin(); it != tags.end(); ++it)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1153 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1154 DicomTag tag(0, 0);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1155 if (!DicomTag::ParseHexadecimal(tag, it->c_str()))
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1156 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1157 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1158 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1159
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1160 const Json::Value& value = dicomAsJson[*it];
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1161
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1162 if (value.type() != Json::objectValue \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1163 !value.isMember("Type") \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1164 !value.isMember("Value") \|\|
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1165 value["Type"].type() != Json::stringValue)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1166 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1167 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1168 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1169
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1170 if (value["Type"] == "String")
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1171 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1172 if (value["Value"].type() != Json::stringValue)
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1173 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1174 throw OrthancException(ErrorCode_CorruptedFile);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1175 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1176 else
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1177 {
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1178 SetValue(tag, value["Value"].asString(), false /* not binary */);
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1179 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1180 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1181 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1182 }
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1183
8265a6b56100 DicomMap::FromDicomAsJson Sebastien Jodogne <s.jodogne@gmail.com> parents: 2863 diff changeset	1184
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1185 void DicomMap::Merge(const DicomMap& other)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1186 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1187 for (Content::const_iterator it = other.content_.begin();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1188 it != other.content_.end(); ++it)
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1189 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1190 assert(it->second != NULL);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1191
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1192 if (content_.find(it->first) == content_.end())
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1193 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1194 content_[it->first] = it->second->Clone();
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1195 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1196 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1197 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1198
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1199
3678 26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1200 void DicomMap::MergeMainDicomTags(const DicomMap& other,
26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1201 ResourceType level)
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1202 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1203 const MainDicomTag* tags = NULL;
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1204 size_t size = 0;
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1205
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1206 LoadMainDicomTags(tags, size, level);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1207 assert(tags != NULL && size > 0);
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1208
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1209 for (size_t i = 0; i < size; i++)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1210 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1211 Content::const_iterator found = other.content_.find(tags[i].tag_);
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1212
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1213 if (found != other.content_.end() &&
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1214 content_.find(tags[i].tag_) == content_.end())
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1215 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1216 assert(found->second != NULL);
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1217 content_[tags[i].tag_] = found->second->Clone();
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1218 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1219 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1220 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1221
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1222
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1223 void DicomMap::ExtractMainDicomTags(const DicomMap& other)
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1224 {
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1225 Clear();
3678 26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1226 MergeMainDicomTags(other, ResourceType_Patient);
26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1227 MergeMainDicomTags(other, ResourceType_Study);
26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1228 MergeMainDicomTags(other, ResourceType_Series);
26c6d47467a9 DicomMap::MergeMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3653 diff changeset	1229 MergeMainDicomTags(other, ResourceType_Instance);
3006 0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1230 }
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1231
0e1755e5efd0 DicomMap::ExtractMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	1232
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1233 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	1234 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1235 // 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	1236
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1237 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	1238 GetMainDicomTags(mainDicomTags);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1239
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1240 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it)
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1241 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1242 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	1243 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1244 return false;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1245 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1246 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1247
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1248 return true;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1249 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1250
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	1251
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1252 void DicomMap::Serialize(Json::Value& target) const
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1253 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1254 target = Json::objectValue;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1255
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1256 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it)
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1257 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1258 assert(it->second != NULL);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1259
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1260 std::string tag = it->first.Format();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1261
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1262 Json::Value value;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1263 it->second->Serialize(value);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1264
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1265 target[tag] = value;
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1266 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1267 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1268
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1269
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1270 void DicomMap::Unserialize(const Json::Value& source)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1271 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1272 Clear();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1273
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1274 if (source.type() != Json::objectValue)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1275 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1276 throw OrthancException(ErrorCode_BadFileFormat);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1277 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1278
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1279 Json::Value::Members tags = source.getMemberNames();
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1280
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1281 for (size_t i = 0; i < tags.size(); i++)
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1282 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1283 DicomTag tag(0, 0);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1284
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1285 if (!DicomTag::ParseHexadecimal(tag, tags[i].c_str()) \|\|
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1286 content_.find(tag) != content_.end())
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1287 {
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1288 throw OrthancException(ErrorCode_BadFileFormat);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1289 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1290
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1291 std::unique_ptr<DicomValue> value(new DicomValue);
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1292 value->Unserialize(source[tags[i]]);
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1293
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1294 content_[tag] = value.release();
2863 da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1295 }
da12ba232119 serialization of DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1296 }
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1297
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1298
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1299 void DicomMap::FromDicomWeb(const Json::Value& source)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1300 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1301 static const char* const ALPHABETIC = "Alphabetic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1302 static const char* const IDEOGRAPHIC = "Ideographic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1303 static const char* const INLINE_BINARY = "InlineBinary";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1304 static const char* const PHONETIC = "Phonetic";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1305 static const char* const VALUE = "Value";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1306 static const char* const VR = "vr";
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1307
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1308 Clear();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1309
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1310 if (source.type() != Json::objectValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1311 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1312 throw OrthancException(ErrorCode_BadFileFormat);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1313 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1314
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1315 Json::Value::Members tags = source.getMemberNames();
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1316
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1317 for (size_t i = 0; i < tags.size(); i++)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1318 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1319 const Json::Value& item = source[tags[i]];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1320 DicomTag tag(0, 0);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1321
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1322 if (item.type() != Json::objectValue \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1323 !item.isMember(VR) \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1324 item[VR].type() != Json::stringValue \|\|
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1325 !DicomTag::ParseHexadecimal(tag, tags[i].c_str()))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1326 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1327 throw OrthancException(ErrorCode_BadFileFormat);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1328 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1329
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1330 ValueRepresentation vr = StringToValueRepresentation(item[VR].asString(), false);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1331
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1332 if (item.isMember(INLINE_BINARY))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1333 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1334 const Json::Value& value = item[INLINE_BINARY];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1335
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1336 if (value.type() == Json::stringValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1337 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1338 std::string decoded;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1339 Toolbox::DecodeBase64(decoded, value.asString());
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1340 SetValue(tag, decoded, true /* binary data */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1341 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1342 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1343 else if (!item.isMember(VALUE))
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1344 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1345 // Tag is present, but it has a null value
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1346 SetValue(tag, "", false /* not binary */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1347 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1348 else
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1349 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1350 const Json::Value& value = item[VALUE];
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1351
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1352 if (value.type() == Json::arrayValue)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1353 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1354 bool supported = true;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1355
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1356 std::string s;
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1357 for (Json::Value::ArrayIndex j = 0; j < value.size() && supported; j++)
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1358 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1359 if (!s.empty())
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1360 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1361 s += '\\';
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1362 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1363
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1364 switch (value[j].type())
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1365 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1366 case Json::objectValue:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1367 if (vr == ValueRepresentation_PersonName &&
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1368 value[j].type() == Json::objectValue)
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1369 {
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1370 if (value[j].isMember(ALPHABETIC) &&
fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1371 value[j][ALPHABETIC].type() == Json::stringValue)
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1372 {
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1373 s += value[j][ALPHABETIC].asString();
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1374 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1375
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1376 bool hasIdeographic = false;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1377
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1378 if (value[j].isMember(IDEOGRAPHIC) &&
fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1379 value[j][IDEOGRAPHIC].type() == Json::stringValue)
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1380 {
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1381 s += '=' + value[j][IDEOGRAPHIC].asString();
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1382 hasIdeographic = true;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1383 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1384
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1385 if (value[j].isMember(PHONETIC) &&
fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1386 value[j][PHONETIC].type() == Json::stringValue)
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1387 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1388 if (!hasIdeographic)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1389 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1390 s += '=';
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1391 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1392
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1393 s += '=' + value[j][PHONETIC].asString();
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1394 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1395 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1396 else
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1397 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1398 // This is the case of sequences
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1399 supported = false;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1400 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1401
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1402 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1403
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1404 case Json::stringValue:
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1405 s += value[j].asString();
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1406 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1407
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1408 case Json::intValue:
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1409 s += boost::lexical_cast<std::string>(value[j].asInt());
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1410 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1411
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1412 case Json::uintValue:
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1413 s += boost::lexical_cast<std::string>(value[j].asUInt());
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1414 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1415
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1416 case Json::realValue:
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1417 s += boost::lexical_cast<std::string>(value[j].asDouble());
3496 109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1418 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1419
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1420 default:
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1421 break;
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1422 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1423 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1424
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1425 if (supported)
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1426 {
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1427 SetValue(tag, s, false /* not binary */);
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1428 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1429 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1430 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1431 }
109631ed3564 DicomMap::FromDicomWeb() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	1432 }
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1433
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1434
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1435 std::string DicomMap::GetStringValue(const DicomTag& tag,
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1436 const std::string& defaultValue,
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1437 bool allowBinary) const
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1438 {
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1439 std::string s;
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1440 if (LookupStringValue(s, tag, allowBinary))
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1441 {
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1442 return s;
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1443 }
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1444 else
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1445 {
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1446 return defaultValue;
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1447 }
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1448 }
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1449
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1450
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1451 void DicomMap::RemoveBinaryTags()
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1452 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1453 Content kept;
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1454
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1455 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1456 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1457 assert(it->second != NULL);
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1458
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1459 if (!it->second->IsBinary() &&
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1460 !it->second->IsNull())
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1461 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1462 kept[it->first] = it->second;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1463 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1464 else
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1465 {
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1466 delete it->second;
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1467 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1468 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1469
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1470 content_ = kept;
3551 173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1471 }
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1472
173c7f363d8f DicomMap::RemoveBinaryTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 3518 diff changeset	1473
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1474 void DicomMap::DumpMainDicomTags(Json::Value& target,
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1475 ResourceType level) const
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1476 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1477 std::map<DicomTag, std::string> mainTags; // TODO - Create a singleton to hold this map
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1478 LoadMainDicomTags(mainTags, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1479
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1480 target = Json::objectValue;
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1481
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1482 for (Content::const_iterator it = content_.begin(); it != content_.end(); ++it)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1483 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1484 assert(it->second != NULL);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1485
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1486 if (!it->second->IsBinary() &&
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1487 !it->second->IsNull())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1488 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1489 std::map<DicomTag, std::string>::const_iterator found = mainTags.find(it->first);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1490
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1491 if (found != mainTags.end())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1492 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1493 target[found->second] = it->second->GetContent();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1494 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1495 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1496 }
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1497 }
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1498
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1499
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1500 void DicomMap::ParseMainDicomTags(const Json::Value& source,
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1501 ResourceType level)
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1502 {
3651 46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1503 if (source.type() != Json::objectValue)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1504 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1505 throw OrthancException(ErrorCode_BadFileFormat);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1506 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1507
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1508 std::map<std::string, DicomTag2> mainTags; // TODO - Create a singleton to hold this map
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1509 LoadMainDicomTags(mainTags, level);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1510
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1511 Json::Value::Members members = source.getMemberNames();
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1512 for (size_t i = 0; i < members.size(); i++)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1513 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1514 std::map<std::string, DicomTag2>::const_iterator found = mainTags.find(members[i]);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1515
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1516 if (found != mainTags.end())
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1517 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1518 const Json::Value& value = source[members[i]];
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1519 if (value.type() != Json::stringValue)
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1520 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1521 throw OrthancException(ErrorCode_BadFileFormat);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1522 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1523 else
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1524 {
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1525 SetValue(found->second, value.asString(), false);
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1526 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1527 }
46cb00e4adbb DicomMap::DumpMainDicomTags() and DicomMap::ParseMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	1528 }
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1529 }
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1530
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1531
3518 a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1532 void DicomMap::Print(FILE* fp) const
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1533 {
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1534 DicomArray a(*this);
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1535 a.Print(fp);
a57c8163d9ae DicomMap::GetStringValue() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3498 diff changeset	1536 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1537 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomFormat/DicomMap.cpp @ 4640:66109d24d26e