orthanc: OrthancFramework/Sources/DicomParsing/DicomModification.cpp annotate

annotate OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4676:caf963ee3de9

DicomModification_Anonymization2017c.impl.h

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 03 Jun 2021 19:44:43 +0200
parents	7e4d1f2b3a8f
children	521e39b3f2c0

rev	line source
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1818 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	4 * Department, University Hospital of Liege, Belgium
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4313 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
b6d6b65142e8 DicomModification 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.
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
b6d6b65142e8 DicomModification 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.
786 b6d6b65142e8 DicomModification 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/>.
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2323 diff changeset	23 #include "../PrecompiledHeaders.h"
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "DicomModification.h"
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	26 #include "../Compatibility.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2323 diff changeset	27 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2323 diff changeset	28 #include "../OrthancException.h"
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	29 #include "../SerializationToolbox.h"
790 331eaf9d9d69 ParsedDicomFile Sebastien Jodogne <s.jodogne@gmail.com> parents: 789 diff changeset	30 #include "FromDcmtkBridge.h"
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	31 #include "ITagVisitor.h"
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	33 #include <memory> // For std::unique_ptr
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 790 diff changeset	34
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	35
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	36 static const std::string ORTHANC_DEIDENTIFICATION_METHOD_2008 =
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	37 "Orthanc " ORTHANC_VERSION " - PS 3.15-2008 Table E.1-1";
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	38
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	39 static const std::string ORTHANC_DEIDENTIFICATION_METHOD_2017c =
2314 c54c9523adf8 add basic profile Sebastien Jodogne <s.jodogne@gmail.com> parents: 2313 diff changeset	40 "Orthanc " ORTHANC_VERSION " - PS 3.15-2017c Table E.1-1 Basic Profile";
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	41
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 namespace Orthanc
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 {
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	44 class DicomModification::RelationshipsVisitor : public ITagVisitor
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	45 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	46 private:
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	47 DicomModification& that_;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	48
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	49 bool IsEnabled(const DicomTag& tag) const
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	50 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	51 return (!that_.IsCleared(tag) &&
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	52 !that_.IsRemoved(tag) &&
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	53 !that_.IsReplaced(tag));
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	54 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	55
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	56 void RemoveIfEnabled(ParsedDicomFile& dicom,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	57 const DicomTag& tag) const
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	58 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	59 if (IsEnabled(tag))
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	60 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	61 dicom.Remove(tag);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	62 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	63 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	64
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	65
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	66 public:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	67 explicit RelationshipsVisitor(DicomModification& that) :
7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	68 that_(that)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	69 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	70 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	71
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	72 virtual void VisitNotSupported(const std::vector<DicomTag>& parentTags,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	73 const std::vector<size_t>& parentIndexes,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	74 const DicomTag& tag,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	75 ValueRepresentation vr)
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	76 {
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	77 }
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	78
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	79 virtual void VisitEmptySequence(const std::vector<DicomTag>& parentTags,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	80 const std::vector<size_t>& parentIndexes,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	81 const DicomTag& tag)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	82 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	83 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	84
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	85 virtual void VisitBinary(const std::vector<DicomTag>& parentTags,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	86 const std::vector<size_t>& parentIndexes,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	87 const DicomTag& tag,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	88 ValueRepresentation vr,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	89 const void* data,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	90 size_t size)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	91 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	92 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	93
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	94 virtual void VisitIntegers(const std::vector<DicomTag>& parentTags,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	95 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	96 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	97 ValueRepresentation vr,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	98 const std::vector<int64_t>& values)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	99 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	100 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	101
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	102 virtual void VisitDoubles(const std::vector<DicomTag>& parentTags,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	103 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	104 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	105 ValueRepresentation vr,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	106 const std::vector<double>& value)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	107 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	108 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	109
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	110 virtual void VisitAttributes(const std::vector<DicomTag>& parentTags,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	111 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	112 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	113 const std::vector<DicomTag>& value)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	114 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	115 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	116
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	117 virtual Action VisitString(std::string& newValue,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	118 const std::vector<DicomTag>& parentTags,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	119 const std::vector<size_t>& parentIndexes,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	120 const DicomTag& tag,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	121 ValueRepresentation vr,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	122 const std::string& value)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	123 {
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	124 if (!IsEnabled(tag))
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	125 {
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	126 return Action_None;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	127 }
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	128 else if (parentTags.size() == 2 &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	129 parentTags[0] == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_SEQUENCE &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	130 parentTags[1] == DICOM_TAG_RT_REFERENCED_STUDY_SEQUENCE &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	131 tag == DICOM_TAG_REFERENCED_SOP_INSTANCE_UID)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	132 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	133 // in RT-STRUCT, this ReferencedSOPInstanceUID is actually referencing a StudyInstanceUID !!
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	134 // (observed in many data sets including: https://wiki.cancerimagingarchive.net/display/Public/Lung+CT+Segmentation+Challenge+2017)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	135 // tested in test_anonymize_relationships_5
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	136 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Study);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	137 return Action_Replace;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	138 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	139 else if (tag == DICOM_TAG_FRAME_OF_REFERENCE_UID \|\|
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	140 tag == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_UID \|\|
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	141 tag == DICOM_TAG_REFERENCED_SOP_INSTANCE_UID \|\|
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	142 tag == DICOM_TAG_RELATED_FRAME_OF_REFERENCE_UID)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Instance);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	145 return Action_Replace;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	146 }
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	147 else if (parentTags.size() == 1 &&
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	148 parentTags[0] == DICOM_TAG_CURRENT_REQUESTED_PROCEDURE_EVIDENCE_SEQUENCE &&
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	149 tag == DICOM_TAG_STUDY_INSTANCE_UID)
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	150 {
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	151 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Study);
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	152 return Action_Replace;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	153 }
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	154 else if (parentTags.size() == 2 &&
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	155 parentTags[0] == DICOM_TAG_CURRENT_REQUESTED_PROCEDURE_EVIDENCE_SEQUENCE &&
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	156 parentTags[1] == DICOM_TAG_REFERENCED_SERIES_SEQUENCE &&
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	157 tag == DICOM_TAG_SERIES_INSTANCE_UID)
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	158 {
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	159 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Series);
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	160 return Action_Replace;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	161 }
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	162 else if (parentTags.size() == 3 &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	163 parentTags[0] == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_SEQUENCE &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	164 parentTags[1] == DICOM_TAG_RT_REFERENCED_STUDY_SEQUENCE &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	165 parentTags[2] == DICOM_TAG_RT_REFERENCED_SERIES_SEQUENCE &&
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	166 tag == DICOM_TAG_SERIES_INSTANCE_UID)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	167 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	168 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Series);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	169 return Action_Replace;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	170 }
3344 90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	171 else if (parentTags.size() == 1 &&
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	172 parentTags[0] == DICOM_TAG_REFERENCED_SERIES_SEQUENCE &&
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	173 tag == DICOM_TAG_SERIES_INSTANCE_UID)
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	174 {
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	175 newValue = that_.MapDicomIdentifier(Toolbox::StripSpaces(value), ResourceType_Series);
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	176 return Action_Replace;
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	177 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	178 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	179 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	180 return Action_None;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	181 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	182 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	183
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	184 void RemoveRelationships(ParsedDicomFile& dicom) const
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	185 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	186 // Sequences containing the UID relationships
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	187 RemoveIfEnabled(dicom, DICOM_TAG_REFERENCED_IMAGE_SEQUENCE);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	188 RemoveIfEnabled(dicom, DICOM_TAG_SOURCE_IMAGE_SEQUENCE);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	189
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	190 // Individual tags
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	191 RemoveIfEnabled(dicom, DICOM_TAG_FRAME_OF_REFERENCE_UID);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	192
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	193 // The tags below should never occur at the first level of the
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	194 // hierarchy, but remove them anyway
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	195 RemoveIfEnabled(dicom, DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_UID);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	196 RemoveIfEnabled(dicom, DICOM_TAG_REFERENCED_SOP_INSTANCE_UID);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	197 RemoveIfEnabled(dicom, DICOM_TAG_RELATED_FRAME_OF_REFERENCE_UID);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	198 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	199 };
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	200
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	201
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	202 bool DicomModification::CancelReplacement(const DicomTag& tag)
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	203 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	204 Replacements::iterator it = replacements_.find(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	205
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	206 if (it != replacements_.end())
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	207 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	208 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	209 replacements_.erase(it);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	210 return true;
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	211 }
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	212 else
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	213 {
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	214 return false;
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	215 }
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	216 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	217
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	218
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	219 void DicomModification::ReplaceInternal(const DicomTag& tag,
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	220 const Json::Value& value)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	221 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	222 Replacements::iterator it = replacements_.find(tag);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	223
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	224 if (it != replacements_.end())
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	225 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	226 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	227 it->second = NULL; // In the case of an exception during the clone
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	228 it->second = new Json::Value(value); // Clone
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	229 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	230 else
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	231 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	232 replacements_[tag] = new Json::Value(value); // Clone
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	233 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	234 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	235
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	236
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	237 void DicomModification::ClearReplacements()
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	238 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	239 for (Replacements::iterator it = replacements_.begin();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	240 it != replacements_.end(); ++it)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	241 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	242 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	243 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	244
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	245 replacements_.clear();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	246 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	247
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	248
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	249 void DicomModification::MarkNotOrthancAnonymization()
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	250 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	251 Replacements::iterator it = replacements_.find(DICOM_TAG_DEIDENTIFICATION_METHOD);
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	252
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	253 if (it != replacements_.end() &&
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	254 (it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2008 \|\|
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	255 it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2017c))
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	256 {
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	257 delete it->second;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	258 replacements_.erase(it);
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	259 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	260 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	261
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	262 void DicomModification::RegisterMappedDicomIdentifier(const std::string& original,
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	263 const std::string& mapped,
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	264 ResourceType level)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	265 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	266 UidMap::const_iterator previous = uidMap_.find(std::make_pair(level, original));
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	267
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	268 if (previous == uidMap_.end())
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	269 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	270 uidMap_.insert(std::make_pair(std::make_pair(level, original), mapped));
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	271 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	272 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	273
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	274 std::string DicomModification::MapDicomIdentifier(const std::string& original,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	275 ResourceType level)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	276 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	277 std::string mapped;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	278
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	279 UidMap::const_iterator previous = uidMap_.find(std::make_pair(level, original));
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	280
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	281 if (previous == uidMap_.end())
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	282 {
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	283 if (identifierGenerator_ == NULL)
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	284 {
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	285 mapped = FromDcmtkBridge::GenerateUniqueIdentifier(level);
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	286 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	287 else
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	288 {
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	289 if (!identifierGenerator_->Apply(mapped, original, level, currentSource_))
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	290 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	291 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	292 "Unable to generate an anonymized ID");
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	293 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	294 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	295
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	296 uidMap_.insert(std::make_pair(std::make_pair(level, original), mapped));
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	297 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	298 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	299 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	300 mapped = previous->second;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	301 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	302
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	303 return mapped;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	304 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	305
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	306
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	307 void DicomModification::MapDicomTags(ParsedDicomFile& dicom,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	308 ResourceType level)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	310 std::unique_ptr<DicomTag> tag;
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 switch (level)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	314 case ResourceType_Study:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 tag.reset(new DicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	318 case ResourceType_Series:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 tag.reset(new DicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	322 case ResourceType_Instance:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 tag.reset(new DicomTag(DICOM_TAG_SOP_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 default:
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 throw OrthancException(ErrorCode_InternalError);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 std::string original;
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	331 if (!const_cast<const ParsedDicomFile&>(dicom).GetTagValue(original, *tag))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 original = "";
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	336 std::string mapped = MapDicomIdentifier(Toolbox::StripSpaces(original), level);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	338 dicom.Replace(*tag, mapped,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	339 false /* don't try and decode data URI scheme for UIDs */,
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	340 DicomReplaceMode_InsertIfAbsent, privateCreator_);
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	341 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	343
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	344 DicomModification::DicomModification() :
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	345 removePrivateTags_(false),
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	346 level_(ResourceType_Instance),
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	347 allowManualIdentifiers_(true),
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	348 keepStudyInstanceUid_(false),
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	349 keepSeriesInstanceUid_(false),
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	350 keepSopInstanceUid_(false),
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	351 updateReferencedRelationships_(true),
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	352 isAnonymization_(false),
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	353 //privateCreator_("PrivateCreator"),
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	354 identifierGenerator_(NULL)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	358 DicomModification::~DicomModification()
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	359 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	360 ClearReplacements();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	361 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	362
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	363 void DicomModification::Keep(const DicomTag& tag)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 {
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	365 bool wasRemoved = IsRemoved(tag);
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	366 bool wasCleared = IsCleared(tag);
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	367
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 removals_.erase(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	369 clearings_.erase(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	370
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	371 bool wasReplaced = CancelReplacement(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	372
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	373 if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	374 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	375 keepStudyInstanceUid_ = true;
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	376 }
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	377 else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	378 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	379 keepSeriesInstanceUid_ = true;
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	380 }
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	381 else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	382 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	383 keepSopInstanceUid_ = true;
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	384 }
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	385 else if (tag.IsPrivate())
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	386 {
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	387 privateTagsToKeep_.insert(tag);
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	388 }
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	389 else if (!wasRemoved &&
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	390 !wasReplaced &&
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	391 !wasCleared)
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	392 {
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	393 LOG(WARNING) << "Marking this tag as to be kept has no effect: " << tag.Format();
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	394 }
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	395
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	396 MarkNotOrthancAnonymization();
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 void DicomModification::Remove(const DicomTag& tag)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 removals_.insert(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	402 clearings_.erase(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	403 CancelReplacement(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	404 privateTagsToKeep_.erase(tag);
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	405
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	406 MarkNotOrthancAnonymization();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	407 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	408
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	409 void DicomModification::Clear(const DicomTag& tag)
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	410 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	411 removals_.erase(tag);
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	412 clearings_.insert(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	413 CancelReplacement(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	414 privateTagsToKeep_.erase(tag);
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	415
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	416 MarkNotOrthancAnonymization();
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 bool DicomModification::IsRemoved(const DicomTag& tag) const
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 return removals_.find(tag) != removals_.end();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	424 bool DicomModification::IsCleared(const DicomTag& tag) const
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	425 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	426 return clearings_.find(tag) != clearings_.end();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	427 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	428
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 void DicomModification::Replace(const DicomTag& tag,
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	430 const Json::Value& value,
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	431 bool safeForAnonymization)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 {
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	433 clearings_.erase(tag);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 removals_.erase(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	435 privateTagsToKeep_.erase(tag);
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	436 ReplaceInternal(tag, value);
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	437
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	438 if (!safeForAnonymization)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	439 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	440 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	441 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	444
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 bool DicomModification::IsReplaced(const DicomTag& tag) const
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 return replacements_.find(tag) != replacements_.end();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	450 const Json::Value& DicomModification::GetReplacement(const DicomTag& tag) const
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 Replacements::const_iterator it = replacements_.find(tag);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 if (it == replacements_.end())
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 throw OrthancException(ErrorCode_InexistentItem);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 else
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459 {
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	460 return *it->second;
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	464
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	465 std::string DicomModification::GetReplacementAsString(const DicomTag& tag) const
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	466 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	467 const Json::Value& json = GetReplacement(tag);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	468
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	469 if (json.type() != Json::stringValue)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	470 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	471 throw OrthancException(ErrorCode_BadParameterType);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	472 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	473 else
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	474 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	475 return json.asString();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	476 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	477 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	478
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	479
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 void DicomModification::SetRemovePrivateTags(bool removed)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 removePrivateTags_ = removed;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	483
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	484 if (!removed)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	485 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	486 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	487 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	490 bool DicomModification::ArePrivateTagsRemoved() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	491 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	492 return removePrivateTags_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	493 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	494
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	495 void DicomModification::SetLevel(ResourceType level)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 uidMap_.clear();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 level_ = level;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	499
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	500 if (level != ResourceType_Patient)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	501 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	502 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	503 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	506 ResourceType DicomModification::GetLevel() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	507 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	508 return level_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	509 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	510
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	511
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	512 void DicomModification::SetupAnonymization2008()
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 {
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	514 // This is Table E.1-1 from PS 3.15-2008 - DICOM Part 15: Security and System Management Profiles
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	515 // https://raw.githubusercontent.com/jodogne/dicom-specification/master/2008/08_15pu.pdf
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	516
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	517 removals_.insert(DicomTag(0x0008, 0x0014)); // Instance Creator UID
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	518 //removals_.insert(DicomTag(0x0008, 0x0018)); // SOP Instance UID => set in Apply()
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	519 removals_.insert(DicomTag(0x0008, 0x0050)); // Accession Number
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	520 removals_.insert(DicomTag(0x0008, 0x0080)); // Institution Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	521 removals_.insert(DicomTag(0x0008, 0x0081)); // Institution Address
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	522 removals_.insert(DicomTag(0x0008, 0x0090)); // Referring Physician's Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	523 removals_.insert(DicomTag(0x0008, 0x0092)); // Referring Physician's Address
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	524 removals_.insert(DicomTag(0x0008, 0x0094)); // Referring Physician's Telephone Numbers
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	525 removals_.insert(DicomTag(0x0008, 0x1010)); // Station Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	526 removals_.insert(DicomTag(0x0008, 0x1030)); // Study Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	527 removals_.insert(DicomTag(0x0008, 0x103e)); // Series Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	528 removals_.insert(DicomTag(0x0008, 0x1040)); // Institutional Department Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	529 removals_.insert(DicomTag(0x0008, 0x1048)); // Physician(s) of Record
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	530 removals_.insert(DicomTag(0x0008, 0x1050)); // Performing Physicians' Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	531 removals_.insert(DicomTag(0x0008, 0x1060)); // Name of Physician(s) Reading Study
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	532 removals_.insert(DicomTag(0x0008, 0x1070)); // Operators' Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	533 removals_.insert(DicomTag(0x0008, 0x1080)); // Admitting Diagnoses Description
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	534 //removals_.insert(DicomTag(0x0008, 0x1155)); // Referenced SOP Instance UID => RelationshipsVisitor
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	535 removals_.insert(DicomTag(0x0008, 0x2111)); // Derivation Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	536 //removals_.insert(DicomTag(0x0010, 0x0010)); // Patient's Name => cf. below (*)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	537 //removals_.insert(DicomTag(0x0010, 0x0020)); // Patient ID => cf. below (*)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	538 removals_.insert(DicomTag(0x0010, 0x0030)); // Patient's Birth Date
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	539 removals_.insert(DicomTag(0x0010, 0x0032)); // Patient's Birth Time
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	540 removals_.insert(DicomTag(0x0010, 0x0040)); // Patient's Sex
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	541 removals_.insert(DicomTag(0x0010, 0x1000)); // Other Patient Ids
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	542 removals_.insert(DicomTag(0x0010, 0x1001)); // Other Patient Names
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	543 removals_.insert(DicomTag(0x0010, 0x1010)); // Patient's Age
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	544 removals_.insert(DicomTag(0x0010, 0x1020)); // Patient's Size
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	545 removals_.insert(DicomTag(0x0010, 0x1030)); // Patient's Weight
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	546 removals_.insert(DicomTag(0x0010, 0x1090)); // Medical Record Locator
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	547 removals_.insert(DicomTag(0x0010, 0x2160)); // Ethnic Group
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	548 removals_.insert(DicomTag(0x0010, 0x2180)); // Occupation
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	549 removals_.insert(DicomTag(0x0010, 0x21b0)); // Additional Patient's History
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	550 removals_.insert(DicomTag(0x0010, 0x4000)); // Patient Comments
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	551 removals_.insert(DicomTag(0x0018, 0x1000)); // Device Serial Number
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	552 removals_.insert(DicomTag(0x0018, 0x1030)); // Protocol Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	553 //removals_.insert(DicomTag(0x0020, 0x000d)); // Study Instance UID => set in Apply()
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	554 //removals_.insert(DicomTag(0x0020, 0x000e)); // Series Instance UID => set in Apply()
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	555 removals_.insert(DicomTag(0x0020, 0x0010)); // Study ID
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	556 //removals_.insert(DicomTag(0x0020, 0x0052)); // Frame of Reference UID => cf. RelationshipsVisitor
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	557 removals_.insert(DicomTag(0x0020, 0x0200)); // Synchronization Frame of Reference UID
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	558 removals_.insert(DicomTag(0x0020, 0x4000)); // Image Comments
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	559 removals_.insert(DicomTag(0x0040, 0x0275)); // Request Attributes Sequence
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	560 removals_.insert(DicomTag(0x0040, 0xa124)); // UID
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	561 removals_.insert(DicomTag(0x0040, 0xa730)); // Content Sequence
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	562 removals_.insert(DicomTag(0x0088, 0x0140)); // Storage Media File-set UID
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	563 //removals_.insert(DicomTag(0x3006, 0x0024)); // Referenced Frame of Reference UID => RelationshipsVisitor
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	564 //removals_.insert(DicomTag(0x3006, 0x00c2)); // Related Frame of Reference UID => RelationshipsVisitor
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	566 // Some more removals (from the experience of DICOM files at the CHU of Liege)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	567 removals_.insert(DicomTag(0x0010, 0x1040)); // Patient's Address
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	568 removals_.insert(DicomTag(0x0032, 0x1032)); // Requesting Physician
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	569 removals_.insert(DicomTag(0x0010, 0x2154)); // PatientTelephoneNumbers
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	570 removals_.insert(DicomTag(0x0010, 0x2000)); // Medical Alerts
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	571
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	572 // Set the DeidentificationMethod tag
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	573 ReplaceInternal(DICOM_TAG_DEIDENTIFICATION_METHOD, ORTHANC_DEIDENTIFICATION_METHOD_2008);
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	574 }
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	575
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	576
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	577 void DicomModification::SetupAnonymization2017c()
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	578 {
2313 d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	579 /**
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	580 * This is Table E.1-1 from PS 3.15-2017c (DICOM Part 15: Security
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	581 * and System Management Profiles), "basic profile" column. It was
4675 7e4d1f2b3a8f GenerateAnonymizationProfile.py can read from URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	582 * generated automatically by calling:
7e4d1f2b3a8f GenerateAnonymizationProfile.py can read from URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	583 * "../../../OrthancServer/Resources/GenerateAnonymizationProfile.py
7e4d1f2b3a8f GenerateAnonymizationProfile.py can read from URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	584 * https://raw.githubusercontent.com/jodogne/dicom-specification/master/2017c/part15.xml"
2313 d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	585 **/
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	586
4676 caf963ee3de9 DicomModification_Anonymization2017c.impl.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4675 diff changeset	587 #include "DicomModification_Anonymization2017c.impl.h"
2313 d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	588
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	589 // Set the DeidentificationMethod tag
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	590 ReplaceInternal(DICOM_TAG_DEIDENTIFICATION_METHOD, ORTHANC_DEIDENTIFICATION_METHOD_2017c);
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	591 }
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	592
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	593
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	594 void DicomModification::SetupAnonymization(DicomVersion version)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	595 {
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	596 isAnonymization_ = true;
062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	597
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	598 removals_.clear();
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	599 clearings_.clear();
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	600 ClearReplacements();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	601 removePrivateTags_ = true;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	602 level_ = ResourceType_Patient;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	603 uidMap_.clear();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	604 privateTagsToKeep_.clear();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	605
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	606 switch (version)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	607 {
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	608 case DicomVersion_2008:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	609 SetupAnonymization2008();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	610 break;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	611
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	612 case DicomVersion_2017c:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	613 SetupAnonymization2017c();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	614 break;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	615
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	616 default:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	617 throw OrthancException(ErrorCode_ParameterOutOfRange);
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	618 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 // Set the PatientIdentityRemoved tag
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	621 ReplaceInternal(DicomTag(0x0012, 0x0062), "YES");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 // (*) Choose a random patient name and ID
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	624 std::string patientId = FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Patient);
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	625 ReplaceInternal(DICOM_TAG_PATIENT_ID, patientId);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	626 ReplaceInternal(DICOM_TAG_PATIENT_NAME, patientId);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 void DicomModification::Apply(ParsedDicomFile& toModify)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 // Check the request
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	632 assert(ResourceType_Patient + 1 == ResourceType_Study &&
7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	633 ResourceType_Study + 1 == ResourceType_Series &&
7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	634 ResourceType_Series + 1 == ResourceType_Instance);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 if (IsRemoved(DICOM_TAG_PATIENT_ID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 IsRemoved(DICOM_TAG_STUDY_INSTANCE_UID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 IsRemoved(DICOM_TAG_SERIES_INSTANCE_UID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 IsRemoved(DICOM_TAG_SOP_INSTANCE_UID))
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 throw OrthancException(ErrorCode_BadRequest);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	643
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	645 // Sanity checks at the patient level
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	646 if (level_ == ResourceType_Patient && !IsReplaced(DICOM_TAG_PATIENT_ID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	648 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	649 "When modifying a patient, her PatientID is required to be modified");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	652 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	653 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	654 if (level_ == ResourceType_Patient && IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	655 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	656 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	657 "When modifying a patient, the StudyInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	658 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	659
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	660 if (level_ == ResourceType_Patient && IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	661 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	662 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	663 "When modifying a patient, the SeriesInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	664 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	665
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	666 if (level_ == ResourceType_Patient && IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	667 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	668 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	669 "When modifying a patient, the SopInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	670 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	671 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	672
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	673
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	674 // Sanity checks at the study level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	675 if (level_ == ResourceType_Study && IsReplaced(DICOM_TAG_PATIENT_ID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	676 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	677 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	678 "When modifying a study, the parent PatientID cannot be manually modified");
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	679 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	680
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	681 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	682 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	683 if (level_ == ResourceType_Study && IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	684 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	685 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	686 "When modifying a study, the SeriesInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	687 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	688
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	689 if (level_ == ResourceType_Study && IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	690 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	691 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	692 "When modifying a study, the SopInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	693 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	694 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	695
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	697 // Sanity checks at the series level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	698 if (level_ == ResourceType_Series && IsReplaced(DICOM_TAG_PATIENT_ID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	699 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	700 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	701 "When modifying a series, the parent PatientID cannot be manually modified");
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	702 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	703
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	704 if (level_ == ResourceType_Series && IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	706 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	707 "When modifying a series, the parent StudyInstanceUID cannot be manually modified");
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	708 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	709
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	710 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	711 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	712 if (level_ == ResourceType_Series && IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	713 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	714 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	715 "When modifying a series, the SopInstanceUID cannot be manually modified");
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	716 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	719
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	720 // Sanity checks at the instance level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	721 if (level_ == ResourceType_Instance && IsReplaced(DICOM_TAG_PATIENT_ID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	723 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	724 "When modifying an instance, the parent PatientID cannot be manually modified");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	727 if (level_ == ResourceType_Instance && IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	728 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	729 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	730 "When modifying an instance, the parent StudyInstanceUID cannot be manually modified");
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	731 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	732
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	733 if (level_ == ResourceType_Instance && IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	734 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	735 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	736 "When modifying an instance, the parent SeriesInstanceUID cannot be manually modified");
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	737 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	738
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	739 // (0) Create a summary of the source file, if a custom generator
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	740 // is provided
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	741 if (identifierGenerator_ != NULL)
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	742 {
4139 a4f28efdfccf "maxTagLength" must be explicitly given to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	743 toModify.ExtractDicomSummary(currentSource_, ORTHANC_MAXIMUM_TAG_LENGTH);
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	744 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	745
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	746 // (1) Make sure the relationships are updated with the ids that we force too
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	747 // i.e: an RT-STRUCT is referencing its own StudyInstanceUID
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	748 if (isAnonymization_ && updateReferencedRelationships_)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	749 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	750 if (IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	751 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	752 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	753 std::string replacement = GetReplacementAsString(DICOM_TAG_STUDY_INSTANCE_UID);
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	754 const_cast<const ParsedDicomFile&>(toModify).GetTagValue(original, DICOM_TAG_STUDY_INSTANCE_UID);
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	755 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Study);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	756 }
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	757
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	758 if (IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	759 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	760 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	761 std::string replacement = GetReplacementAsString(DICOM_TAG_SERIES_INSTANCE_UID);
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	762 const_cast<const ParsedDicomFile&>(toModify).GetTagValue(original, DICOM_TAG_SERIES_INSTANCE_UID);
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	763 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Series);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	764 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	765
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	766 if (IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	767 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	768 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	769 std::string replacement = GetReplacementAsString(DICOM_TAG_SOP_INSTANCE_UID);
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	770 const_cast<const ParsedDicomFile&>(toModify).GetTagValue(original, DICOM_TAG_SOP_INSTANCE_UID);
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	771 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Instance);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	772 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	773 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	774
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	775
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	776 // (2) Remove the private tags, if need be
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 if (removePrivateTags_)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 {
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	779 toModify.RemovePrivateTags(privateTagsToKeep_);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	782 // (3) Clear the tags specified by the user
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	783 for (SetOfTags::const_iterator it = clearings_.begin();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	784 it != clearings_.end(); ++it)
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	785 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	786 toModify.Clear(it, true / only clear if the tag exists in the original file */);
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	787 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	788
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	789 // (4) Remove the tags specified by the user
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	790 for (SetOfTags::const_iterator it = removals_.begin();
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 it != removals_.end(); ++it)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793 toModify.Remove(*it);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	796 // (5) Replace the tags
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 for (Replacements::const_iterator it = replacements_.begin();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 it != replacements_.end(); ++it)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 {
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	800 toModify.Replace(it->first, it->second, true / decode data URI scheme */,
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	801 DicomReplaceMode_InsertIfAbsent, privateCreator_);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	804 // (6) Update the DICOM identifiers
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	805 if (level_ <= ResourceType_Study &&
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	806 !IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 {
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	808 if (keepStudyInstanceUid_)
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	809 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	810 LOG(WARNING) << "Modifying a study while keeping its original StudyInstanceUID: This should be avoided!";
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	811 }
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	812 else
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	813 {
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	814 MapDicomTags(toModify, ResourceType_Study);
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	815 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	818 if (level_ <= ResourceType_Series &&
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	819 !IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	820 {
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	821 if (keepSeriesInstanceUid_)
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	822 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	823 LOG(WARNING) << "Modifying a series while keeping its original SeriesInstanceUID: This should be avoided!";
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	824 }
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	825 else
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	826 {
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	827 MapDicomTags(toModify, ResourceType_Series);
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	828 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	831 if (level_ <= ResourceType_Instance && // Always true
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	832 !IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 {
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	834 if (keepSopInstanceUid_)
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	835 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	836 LOG(WARNING) << "Modifying an instance while keeping its original SOPInstanceUID: This should be avoided!";
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	837 }
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	838 else
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	839 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	840 MapDicomTags(toModify, ResourceType_Instance);
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	841 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	842 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	843
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	844 // (7) Update the "referenced" relationships in the case of an anonymization
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	845 if (isAnonymization_)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	846 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	847 RelationshipsVisitor visitor(*this);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	848
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	849 if (updateReferencedRelationships_)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	850 {
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	851 const_cast<const ParsedDicomFile&>(toModify).Apply(visitor);
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	852 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	853 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	854 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	855 visitor.RemoveRelationships(toModify);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	856 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	859
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	860 void DicomModification::SetAllowManualIdentifiers(bool check)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	861 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	862 allowManualIdentifiers_ = check;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	863 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	864
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	865 bool DicomModification::AreAllowManualIdentifiers() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	866 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	867 return allowManualIdentifiers_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	868 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	869
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	870
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	871 static bool IsDatabaseKey(const DicomTag& tag)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	872 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	873 return (tag == DICOM_TAG_PATIENT_ID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	874 tag == DICOM_TAG_STUDY_INSTANCE_UID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	875 tag == DICOM_TAG_SERIES_INSTANCE_UID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	876 tag == DICOM_TAG_SOP_INSTANCE_UID);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	877 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	878
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	879
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	880 static void ParseListOfTags(DicomModification& target,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	881 const Json::Value& query,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	882 DicomModification::TagOperation operation,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	883 bool force)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	884 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	885 if (!query.isArray())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	886 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	887 throw OrthancException(ErrorCode_BadRequest);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	888 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	889
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	890 for (Json::Value::ArrayIndex i = 0; i < query.size(); i++)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	891 {
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	892 if (query[i].type() != Json::stringValue)
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	893 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	894 throw OrthancException(ErrorCode_BadRequest);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	895 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	896
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	897 std::string name = query[i].asString();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	898
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	899 DicomTag tag = FromDcmtkBridge::ParseTag(name);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	900
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	901 if (!force && IsDatabaseKey(tag))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	902 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	903 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	904 "Marking tag \"" + name + "\" as to be " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	905 (operation == DicomModification::TagOperation_Keep ? "kept" : "removed") +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	906 " requires the \"Force\" option to be set to true");
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	907 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	908
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	909 switch (operation)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	910 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	911 case DicomModification::TagOperation_Keep:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	912 target.Keep(tag);
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	913 LOG(TRACE) << "Keep: " << name << " (" << tag.Format() << ")";
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	914 break;
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	915
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	916 case DicomModification::TagOperation_Remove:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	917 target.Remove(tag);
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	918 LOG(TRACE) << "Remove: " << name << " (" << tag.Format() << ")";
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	919 break;
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	920
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	921 default:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	922 throw OrthancException(ErrorCode_InternalError);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	923 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	924 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	925 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	926
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	927
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	928 static void ParseReplacements(DicomModification& target,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	929 const Json::Value& replacements,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	930 bool force)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	931 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	932 if (!replacements.isObject())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	933 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	934 throw OrthancException(ErrorCode_BadRequest);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	935 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	936
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	937 Json::Value::Members members = replacements.getMemberNames();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	938 for (size_t i = 0; i < members.size(); i++)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	939 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	940 const std::string& name = members[i];
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	941 const Json::Value& value = replacements[name];
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	942
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	943 DicomTag tag = FromDcmtkBridge::ParseTag(name);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	944
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	945 if (!force && IsDatabaseKey(tag))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	946 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	947 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	948 "Marking tag \"" + name + "\" as to be replaced " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	949 "requires the \"Force\" option to be set to true");
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	950 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	951
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	952 target.Replace(tag, value, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	953
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	954 LOG(TRACE) << "Replace: " << name << " (" << tag.Format()
91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	955 << ") == " << value.toStyledString();
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	956 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	957 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	958
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	959
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	960 static bool GetBooleanValue(const std::string& member,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	961 const Json::Value& json,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	962 bool defaultValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	963 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	964 if (!json.isMember(member))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	965 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	966 return defaultValue;
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	967 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	968 else if (json[member].type() == Json::booleanValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	969 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	970 return json[member].asBool();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	971 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	972 else
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	973 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	974 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	975 "Member \"" + member + "\" should be a Boolean value");
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	976 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	977 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	978
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	979
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	980 void DicomModification::ParseModifyRequest(const Json::Value& request)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	981 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	982 if (!request.isObject())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	983 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	984 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	985 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	986
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	987 bool force = GetBooleanValue("Force", request, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	988
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	989 if (GetBooleanValue("RemovePrivateTags", request, false))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	990 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	991 SetRemovePrivateTags(true);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	992 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	993
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	994 if (request.isMember("Remove"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	995 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	996 ParseListOfTags(*this, request["Remove"], TagOperation_Remove, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	997 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	998
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	999 if (request.isMember("Replace"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1000 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1001 ParseReplacements(*this, request["Replace"], force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1002 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1003
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1004 // The "Keep" operation only makes sense for the tags
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1005 // StudyInstanceUID, SeriesInstanceUID and SOPInstanceUID. Avoid
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1006 // this feature as much as possible, as this breaks the DICOM
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1007 // model of the real world, except if you know exactly what
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1008 // you're doing!
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1009 if (request.isMember("Keep"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1010 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1011 ParseListOfTags(*this, request["Keep"], TagOperation_Keep, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1012 }
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1013
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1014 // New in Orthanc 1.6.0
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1015 if (request.isMember("PrivateCreator"))
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1016 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1017 privateCreator_ = SerializationToolbox::ReadString(request, "PrivateCreator");
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1018 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1019 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1020
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1021
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1022 void DicomModification::ParseAnonymizationRequest(bool& patientNameReplaced,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1023 const Json::Value& request)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1024 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1025 if (!request.isObject())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1026 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1027 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1028 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1029
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1030 bool force = GetBooleanValue("Force", request, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1031
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1032 // As of Orthanc 1.3.0, the default anonymization is done
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1033 // according to PS 3.15-2017c Table E.1-1 (basic profile)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1034 DicomVersion version = DicomVersion_2017c;
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1035 if (request.isMember("DicomVersion"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1036 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1037 if (request["DicomVersion"].type() != Json::stringValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1038 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1039 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1040 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1041 else
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1042 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1043 version = StringToDicomVersion(request["DicomVersion"].asString());
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1044 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1045 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1046
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1047 SetupAnonymization(version);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1048
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1049 std::string patientName = GetReplacementAsString(DICOM_TAG_PATIENT_NAME);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1050
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1051 if (GetBooleanValue("KeepPrivateTags", request, false))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1052 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1053 SetRemovePrivateTags(false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1054 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1055
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1056 if (request.isMember("Remove"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1057 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1058 ParseListOfTags(*this, request["Remove"], TagOperation_Remove, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1059 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1060
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1061 if (request.isMember("Replace"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1062 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1063 ParseReplacements(*this, request["Replace"], force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1064 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1065
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1066 if (request.isMember("Keep"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1067 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1068 ParseListOfTags(*this, request["Keep"], TagOperation_Keep, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1069 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1070
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1071 patientNameReplaced = (IsReplaced(DICOM_TAG_PATIENT_NAME) &&
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1072 GetReplacement(DICOM_TAG_PATIENT_NAME) == patientName);
3709 1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1073
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1074 // New in Orthanc 1.6.0
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1075 if (request.isMember("PrivateCreator"))
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1076 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1077 privateCreator_ = SerializationToolbox::ReadString(request, "PrivateCreator");
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1078 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1079 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1080
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1081 void DicomModification::SetDicomIdentifierGenerator(DicomModification::IDicomIdentifierGenerator &generator)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1082 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1083 identifierGenerator_ = &generator;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1084 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1085
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1086
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1087
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1088
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1089 static const char* REMOVE_PRIVATE_TAGS = "RemovePrivateTags";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1090 static const char* LEVEL = "Level";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1091 static const char* ALLOW_MANUAL_IDENTIFIERS = "AllowManualIdentifiers";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1092 static const char* KEEP_STUDY_INSTANCE_UID = "KeepStudyInstanceUID";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1093 static const char* KEEP_SERIES_INSTANCE_UID = "KeepSeriesInstanceUID";
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	1094 static const char* KEEP_SOP_INSTANCE_UID = "KeepSOPInstanceUID";
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1095 static const char* UPDATE_REFERENCED_RELATIONSHIPS = "UpdateReferencedRelationships";
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1096 static const char* IS_ANONYMIZATION = "IsAnonymization";
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1097 static const char* REMOVALS = "Removals";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1098 static const char* CLEARINGS = "Clearings";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1099 static const char* PRIVATE_TAGS_TO_KEEP = "PrivateTagsToKeep";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1100 static const char* REPLACEMENTS = "Replacements";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1101 static const char* MAP_PATIENTS = "MapPatients";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1102 static const char* MAP_STUDIES = "MapStudies";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1103 static const char* MAP_SERIES = "MapSeries";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1104 static const char* MAP_INSTANCES = "MapInstances";
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1105 static const char* PRIVATE_CREATOR = "PrivateCreator"; // New in Orthanc 1.6.0
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1106
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1107 void DicomModification::Serialize(Json::Value& value) const
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1108 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1109 if (identifierGenerator_ != NULL)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1110 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1111 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1112 "Cannot serialize a DicomModification with a custom identifier generator");
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1113 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1114
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1115 value = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1116 value[REMOVE_PRIVATE_TAGS] = removePrivateTags_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1117 value[LEVEL] = EnumerationToString(level_);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1118 value[ALLOW_MANUAL_IDENTIFIERS] = allowManualIdentifiers_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1119 value[KEEP_STUDY_INSTANCE_UID] = keepStudyInstanceUid_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1120 value[KEEP_SERIES_INSTANCE_UID] = keepSeriesInstanceUid_;
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	1121 value[KEEP_SOP_INSTANCE_UID] = keepSopInstanceUid_;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1122 value[UPDATE_REFERENCED_RELATIONSHIPS] = updateReferencedRelationships_;
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1123 value[IS_ANONYMIZATION] = isAnonymization_;
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1124 value[PRIVATE_CREATOR] = privateCreator_;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1125
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1126 SerializationToolbox::WriteSetOfTags(value, removals_, REMOVALS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1127 SerializationToolbox::WriteSetOfTags(value, clearings_, CLEARINGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1128 SerializationToolbox::WriteSetOfTags(value, privateTagsToKeep_, PRIVATE_TAGS_TO_KEEP);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1129
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1130 Json::Value& tmp = value[REPLACEMENTS];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1131
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1132 tmp = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1133
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1134 for (Replacements::const_iterator it = replacements_.begin();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1135 it != replacements_.end(); ++it)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1136 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1137 assert(it->second != NULL);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1138 tmp[it->first.Format()] = *it->second;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1139 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1140
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1141 Json::Value& mapPatients = value[MAP_PATIENTS];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1142 Json::Value& mapStudies = value[MAP_STUDIES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1143 Json::Value& mapSeries = value[MAP_SERIES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1144 Json::Value& mapInstances = value[MAP_INSTANCES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1145
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1146 mapPatients = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1147 mapStudies = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1148 mapSeries = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1149 mapInstances = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1150
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1151 for (UidMap::const_iterator it = uidMap_.begin(); it != uidMap_.end(); ++it)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1152 {
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1153 Json::Value* tmp2 = NULL;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1154
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1155 switch (it->first.first)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1156 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1157 case ResourceType_Patient:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1158 tmp2 = &mapPatients;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1159 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1160
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1161 case ResourceType_Study:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1162 tmp2 = &mapStudies;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1163 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1164
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1165 case ResourceType_Series:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1166 tmp2 = &mapSeries;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1167 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1168
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1169 case ResourceType_Instance:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1170 tmp2 = &mapInstances;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1171 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1172
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1173 default:
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1174 throw OrthancException(ErrorCode_InternalError);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1175 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1176
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1177 assert(tmp2 != NULL);
7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1178 (*tmp2) [it->first.second] = it->second;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1179 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1180 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1181
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1182 void DicomModification::UnserializeUidMap(ResourceType level,
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1183 const Json::Value& serialized,
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1184 const char* field)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1185 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1186 if (!serialized.isMember(field) \|\|
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1187 serialized[field].type() != Json::objectValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1188 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1189 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1190 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1191
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1192 Json::Value::Members names = serialized[field].getMemberNames();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1193
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1194 for (Json::Value::Members::const_iterator it = names.begin(); it != names.end(); ++it)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1195 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1196 const Json::Value& value = serialized[field][*it];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1197
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1198 if (value.type() != Json::stringValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1199 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1200 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1201 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1202 else
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1203 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1204 uidMap_[std::make_pair(level, *it)] = value.asString();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1205 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1206 }
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1207 }
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1208
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1209
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1210 DicomModification::DicomModification(const Json::Value& serialized) :
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1211 identifierGenerator_(NULL)
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1212 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1213 removePrivateTags_ = SerializationToolbox::ReadBoolean(serialized, REMOVE_PRIVATE_TAGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1214 level_ = StringToResourceType(SerializationToolbox::ReadString(serialized, LEVEL).c_str());
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1215 allowManualIdentifiers_ = SerializationToolbox::ReadBoolean(serialized, ALLOW_MANUAL_IDENTIFIERS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1216 keepStudyInstanceUid_ = SerializationToolbox::ReadBoolean(serialized, KEEP_STUDY_INSTANCE_UID);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1217 keepSeriesInstanceUid_ = SerializationToolbox::ReadBoolean(serialized, KEEP_SERIES_INSTANCE_UID);
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	1218 keepSopInstanceUid_ = SerializationToolbox::ReadBoolean(serialized, KEEP_SOP_INSTANCE_UID);
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1219 updateReferencedRelationships_ = SerializationToolbox::ReadBoolean
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1220 (serialized, UPDATE_REFERENCED_RELATIONSHIPS);
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1221 isAnonymization_ = SerializationToolbox::ReadBoolean(serialized, IS_ANONYMIZATION);
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1222
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1223 if (serialized.isMember(PRIVATE_CREATOR))
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1224 {
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1225 privateCreator_ = SerializationToolbox::ReadString(serialized, PRIVATE_CREATOR);
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1226 }
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1227
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1228 SerializationToolbox::ReadSetOfTags(removals_, serialized, REMOVALS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1229 SerializationToolbox::ReadSetOfTags(clearings_, serialized, CLEARINGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1230 SerializationToolbox::ReadSetOfTags(privateTagsToKeep_, serialized, PRIVATE_TAGS_TO_KEEP);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1231
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1232 if (!serialized.isMember(REPLACEMENTS) \|\|
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1233 serialized[REPLACEMENTS].type() != Json::objectValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1234 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1235 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1236 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1237
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1238 Json::Value::Members names = serialized[REPLACEMENTS].getMemberNames();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1239
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1240 for (Json::Value::Members::const_iterator it = names.begin(); it != names.end(); ++it)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1241 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1242 DicomTag tag(0, 0);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1243 if (!DicomTag::ParseHexadecimal(tag, it->c_str()))
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1244 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1245 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1246 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1247 else
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1248 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1249 const Json::Value& value = serialized[REPLACEMENTS][*it];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1250 replacements_.insert(std::make_pair(tag, new Json::Value(value)));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1251 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1252 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1253
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1254 UnserializeUidMap(ResourceType_Patient, serialized, MAP_PATIENTS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1255 UnserializeUidMap(ResourceType_Study, serialized, MAP_STUDIES);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1256 UnserializeUidMap(ResourceType_Series, serialized, MAP_SERIES);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1257 UnserializeUidMap(ResourceType_Instance, serialized, MAP_INSTANCES);
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1258 }
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1259
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1260
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1261 void DicomModification::SetPrivateCreator(const std::string &privateCreator)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1262 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1263 privateCreator_ = privateCreator;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1264 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1265
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1266 const std::string &DicomModification::GetPrivateCreator() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1267 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1268 return privateCreator_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1269 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4676:caf963ee3de9