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

annotate OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4678:2e850edf03d6

Full support for the anonymization of subsequences containing tags whose VR is UI

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 04 Jun 2021 17:38:43 +0200
parents	521e39b3f2c0
children	e3810750dc9d

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
4677 521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	42 static const std::string ORTHANC_DEIDENTIFICATION_METHOD_2021b =
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	43 "Orthanc " ORTHANC_VERSION " - PS 3.15-2021b Table E.1-1 Basic Profile";
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	44
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 namespace Orthanc
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	47 DicomModification::DicomTagRange::DicomTagRange(uint16_t groupFrom,
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	48 uint16_t groupTo,
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	49 uint16_t elementFrom,
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	50 uint16_t elementTo) :
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	51 groupFrom_(groupFrom),
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	52 groupTo_(groupTo),
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	53 elementFrom_(elementFrom),
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	54 elementTo_(elementTo)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	55 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	56 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	57
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	58
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	59 bool DicomModification::DicomTagRange::Contains(const DicomTag& tag) const
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	60 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	61 return (tag.GetGroup() >= groupFrom_ &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	62 tag.GetGroup() <= groupTo_ &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	63 tag.GetElement() >= elementFrom_ &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	64 tag.GetElement() <= elementTo_);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	65 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	66
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	67
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	68 class DicomModification::RelationshipsVisitor : public ITagVisitor
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 private:
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	71 DicomModification& that_;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	72
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	73 bool IsEnabled(const DicomTag& tag) const
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	74 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	75 return (!that_.IsCleared(tag) &&
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	76 !that_.IsRemoved(tag) &&
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	77 !that_.IsReplaced(tag));
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	78 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	79
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	80 void RemoveIfEnabled(ParsedDicomFile& dicom,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	81 const DicomTag& tag) const
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 if (IsEnabled(tag))
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 dicom.Remove(tag);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	86 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	87 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	88
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	89
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	90 public:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	91 explicit RelationshipsVisitor(DicomModification& that) :
7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	92 that_(that)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	93 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	94 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	95
3195 880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	96 virtual void VisitNotSupported(const std::vector<DicomTag>& parentTags,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	97 const std::vector<size_t>& parentIndexes,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	98 const DicomTag& tag,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	99 ValueRepresentation vr)
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	100 {
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	101 }
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	102
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	103 virtual void VisitEmptySequence(const std::vector<DicomTag>& parentTags,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	104 const std::vector<size_t>& parentIndexes,
880e4161c312 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3194 diff changeset	105 const DicomTag& tag)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	106 {
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 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	110 const std::vector<size_t>& parentIndexes,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	111 const DicomTag& tag,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	112 ValueRepresentation vr,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	113 const void* data,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	114 size_t size)
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
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	118 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	119 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	120 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	121 ValueRepresentation vr,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	122 const std::vector<int64_t>& values)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	123 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	124 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	125
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	126 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	127 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	128 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	129 ValueRepresentation vr,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	130 const std::vector<double>& value)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	131 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	132 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	133
3194 47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	134 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	135 const std::vector<size_t>& parentIndexes,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	136 const DicomTag& tag,
47ef29168698 support of value multiplicity in ITagVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	137 const std::vector<DicomTag>& value)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	138 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	139 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	140
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	141 virtual Action VisitString(std::string& newValue,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	142 const std::vector<DicomTag>& parentTags,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143 const std::vector<size_t>& parentIndexes,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144 const DicomTag& tag,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	145 ValueRepresentation vr,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	146 const std::string& value)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	147 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	148 // Note that all the tags in "uids_" have the VR UI (unique
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	149 // identifier), and are considered as strings
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	150
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	151 if (!IsEnabled(tag))
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	152 {
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	153 return Action_None;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	154 }
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	155 else if (!parentTags.empty() && // Don't anonymize twice the anonymization done by "MapDicomTags()"
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	156 tag == DICOM_TAG_STUDY_INSTANCE_UID)
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	157 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	158 newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	159 return Action_Replace;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	160 }
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	161 else if (!parentTags.empty() && // Don't anonymize twice the anonymization done by "MapDicomTags()"
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	162 tag == DICOM_TAG_SERIES_INSTANCE_UID)
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	163 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	164 newValue = that_.MapDicomIdentifier(value, ResourceType_Series);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	165 return Action_Replace;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	166 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	167 else if (!parentTags.empty() && // Don't anonymize twice the anonymization done by "MapDicomTags()"
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	168 tag == DICOM_TAG_SOP_INSTANCE_UID)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	169 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	170 newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
2521 6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	171 return Action_Replace;
6db878376018 support anonymization of CurrentRequestedProcedureEvidenceSequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 2520 diff changeset	172 }
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	173 else if (that_.uids_.find(tag) != that_.uids_.end())
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	174 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	175 assert(vr == ValueRepresentation_UniqueIdentifier \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	176 vr == ValueRepresentation_NotSupported /* for older versions of DCMTK */);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	177
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	178 if (parentTags.size() == 2 &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	179 parentTags[0] == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_SEQUENCE &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	180 parentTags[1] == DICOM_TAG_RT_REFERENCED_STUDY_SEQUENCE &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	181 tag == DICOM_TAG_REFERENCED_SOP_INSTANCE_UID)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	182 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	183 // in RT-STRUCT, this ReferencedSOPInstanceUID is actually referencing a StudyInstanceUID !!
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	184 // (observed in many data sets including: https://wiki.cancerimagingarchive.net/display/Public/Lung+CT+Segmentation+Challenge+2017)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	185 // tested in test_anonymize_relationships_5
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	186 newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	187 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	188 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	189 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	190 newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	191 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	192
3344 90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	193 return Action_Replace;
90b4a5001c24 Anonymization: Preserve hierarchical relationships in (0008,1115) [] (0020,000e) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3195 diff changeset	194 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	195 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	196 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	197 return Action_None;
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 void RemoveRelationships(ParsedDicomFile& dicom) const
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	202 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	203 for (SetOfTags::const_iterator it = that_.uids_.begin(); it != that_.uids_.end(); ++it)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	204 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	205 if (*it != DICOM_TAG_STUDY_INSTANCE_UID &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	206 *it != DICOM_TAG_SERIES_INSTANCE_UID &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	207 *it != DICOM_TAG_SOP_INSTANCE_UID)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	208 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	209 RemoveIfEnabled(dicom, *it);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	210 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	211 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	212
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	213 // The only two sequences with to the "X/Z/U*" rule in the
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	214 // basic profile. They were already present in Orthanc 1.9.3.
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	215 RemoveIfEnabled(dicom, DICOM_TAG_REFERENCED_IMAGE_SEQUENCE);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	216 RemoveIfEnabled(dicom, DICOM_TAG_SOURCE_IMAGE_SEQUENCE);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	217 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	218 };
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	219
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	220
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	221 bool DicomModification::CancelReplacement(const DicomTag& tag)
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	222 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	223 Replacements::iterator it = replacements_.find(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	224
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	225 if (it != replacements_.end())
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	226 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	227 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	228 replacements_.erase(it);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	229 return true;
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	230 }
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	231 else
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	232 {
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	233 return false;
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	234 }
1698 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
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	238 void DicomModification::ReplaceInternal(const DicomTag& tag,
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	239 const Json::Value& value)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	240 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	241 Replacements::iterator it = replacements_.find(tag);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	242
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	243 if (it != replacements_.end())
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 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	246 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	247 it->second = new Json::Value(value); // Clone
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	248 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	249 else
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	250 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	251 replacements_[tag] = new Json::Value(value); // Clone
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	252 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	253 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	254
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	255
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	256 void DicomModification::ClearReplacements()
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	257 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	258 for (Replacements::iterator it = replacements_.begin();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	259 it != replacements_.end(); ++it)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	260 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	261 delete it->second;
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	262 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	263
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	264 replacements_.clear();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	265 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	266
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	267
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	268 void DicomModification::MarkNotOrthancAnonymization()
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	269 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	270 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	271
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	272 if (it != replacements_.end() &&
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	273 (it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2008 \|\|
4677 521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	274 it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2017c \|\|
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	275 it->second->asString() == ORTHANC_DEIDENTIFICATION_METHOD_2021b))
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	276 {
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	277 delete it->second;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	278 replacements_.erase(it);
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	279 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	280 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	281
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	282 void DicomModification::RegisterMappedDicomIdentifier(const std::string& original,
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	283 const std::string& mapped,
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	284 ResourceType level)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	285 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	286 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	287
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	288 if (previous == uidMap_.end())
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	289 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	290 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	291 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	292 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	293
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	294 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	295 ResourceType level)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	296 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	297 const std::string stripped = Toolbox::StripSpaces(original);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	298
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	299 std::string mapped;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	300
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	301 UidMap::const_iterator previous = uidMap_.find(std::make_pair(level, stripped));
2506 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 if (previous == uidMap_.end())
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	304 {
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	305 if (identifierGenerator_ == NULL)
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	306 {
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	307 mapped = FromDcmtkBridge::GenerateUniqueIdentifier(level);
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	308 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	309 else
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	310 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	311 if (!identifierGenerator_->Apply(mapped, stripped, level, currentSource_))
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	312 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	313 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	314 "Unable to generate an anonymized ID");
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	315 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	316 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	317
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	318 uidMap_.insert(std::make_pair(std::make_pair(level, stripped), mapped));
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	319 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	320 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	321 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	322 mapped = previous->second;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	323 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	324
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	325 return mapped;
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	326 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	327
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	328
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	329 void DicomModification::MapDicomTags(ParsedDicomFile& dicom,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	330 ResourceType level)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3709 diff changeset	332 std::unique_ptr<DicomTag> tag;
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 switch (level)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 {
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	336 case ResourceType_Study:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 tag.reset(new DicomTag(DICOM_TAG_STUDY_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	340 case ResourceType_Series:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 tag.reset(new DicomTag(DICOM_TAG_SERIES_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	344 case ResourceType_Instance:
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 tag.reset(new DicomTag(DICOM_TAG_SOP_INSTANCE_UID));
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 break;
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 default:
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 throw OrthancException(ErrorCode_InternalError);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 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	353 if (!const_cast<const ParsedDicomFile&>(dicom).GetTagValue(original, *tag))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 original = "";
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	358 std::string mapped = MapDicomIdentifier(original, level);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	360 dicom.Replace(*tag, mapped,
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	361 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	362 DicomReplaceMode_InsertIfAbsent, privateCreator_);
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	363 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	365
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	366 DicomModification::DicomModification() :
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	367 removePrivateTags_(false),
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	368 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	369 allowManualIdentifiers_(true),
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	370 keepStudyInstanceUid_(false),
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	371 keepSeriesInstanceUid_(false),
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	372 keepSopInstanceUid_(false),
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	373 updateReferencedRelationships_(true),
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	374 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	375 //privateCreator_("PrivateCreator"),
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	376 identifierGenerator_(NULL)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	380 DicomModification::~DicomModification()
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	381 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	382 ClearReplacements();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	383 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	384
787 ac18946afa74 refactoring of anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 786 diff changeset	385 void DicomModification::Keep(const DicomTag& tag)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 {
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	387 bool wasRemoved = IsRemoved(tag);
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	388 bool wasCleared = IsCleared(tag);
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	389
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 removals_.erase(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	391 clearings_.erase(tag);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	392 uids_.erase(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	393
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	394 bool wasReplaced = CancelReplacement(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	395
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	396 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	397 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	398 keepStudyInstanceUid_ = true;
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	399 }
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	400 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	401 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	402 keepSeriesInstanceUid_ = true;
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	403 }
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	404 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	405 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	406 keepSopInstanceUid_ = true;
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	407 }
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	408 else if (tag.IsPrivate())
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	409 {
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	410 privateTagsToKeep_.insert(tag);
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	411 }
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	412 else if (!wasRemoved &&
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	413 !wasReplaced &&
f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	414 !wasCleared)
2321 65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	415 {
65ffba10cace warning message in DicomModification::Keep() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2314 diff changeset	416 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	417 }
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	418
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	419 MarkNotOrthancAnonymization();
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 void DicomModification::Remove(const DicomTag& tag)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 removals_.insert(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	425 clearings_.erase(tag);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	426 uids_.erase(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	427 CancelReplacement(tag);
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	428 privateTagsToKeep_.erase(tag);
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	429
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	430 MarkNotOrthancAnonymization();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	431 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	432
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	433 void DicomModification::Clear(const DicomTag& tag)
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	434 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	435 removals_.erase(tag);
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	436 clearings_.insert(tag);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	437 uids_.erase(tag);
2323 f5fc61337bdf fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2321 diff changeset	438 CancelReplacement(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	439 privateTagsToKeep_.erase(tag);
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	440
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	441 MarkNotOrthancAnonymization();
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
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 bool DicomModification::IsRemoved(const DicomTag& tag) const
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 {
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	446 if (removals_.find(tag) != removals_.end())
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	447 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	448 return true;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	449 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	450 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	451 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	452 for (RemovedRanges::const_iterator it = removedRanges_.begin();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	453 it != removedRanges_.end(); it++)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	454 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	455 if (it->Contains(tag))
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	456 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	457 return true;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	458 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	459 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	460
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	461 return false;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	462 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	465 bool DicomModification::IsCleared(const DicomTag& tag) const
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	466 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	467 return clearings_.find(tag) != clearings_.end();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	468 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	469
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 void DicomModification::Replace(const DicomTag& tag,
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	471 const Json::Value& value,
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	472 bool safeForAnonymization)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 {
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	474 clearings_.erase(tag);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 removals_.erase(tag);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	476 uids_.erase(tag);
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	477 privateTagsToKeep_.erase(tag);
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	478 ReplaceInternal(tag, value);
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	479
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	480 if (!safeForAnonymization)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	481 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	482 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	483 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	486
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 bool DicomModification::IsReplaced(const DicomTag& tag) const
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 return replacements_.find(tag) != replacements_.end();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	492 const Json::Value& DicomModification::GetReplacement(const DicomTag& tag) const
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 Replacements::const_iterator it = replacements_.find(tag);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 if (it == replacements_.end())
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 throw OrthancException(ErrorCode_InexistentItem);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 else
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 {
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	502 return *it->second;
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	506
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	507 std::string DicomModification::GetReplacementAsString(const DicomTag& tag) const
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	508 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	509 const Json::Value& json = GetReplacement(tag);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	510
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	511 if (json.type() != Json::stringValue)
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	512 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	513 throw OrthancException(ErrorCode_BadParameterType);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	514 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	515 else
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	516 {
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	517 return json.asString();
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	518 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	519 }
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	520
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	521
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 void DicomModification::SetRemovePrivateTags(bool removed)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 removePrivateTags_ = removed;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	525
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	526 if (!removed)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	527 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	528 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	529 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	532 bool DicomModification::ArePrivateTagsRemoved() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	533 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	534 return removePrivateTags_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	535 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	536
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	537 void DicomModification::SetLevel(ResourceType level)
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 uidMap_.clear();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 level_ = level;
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	541
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	542 if (level != ResourceType_Patient)
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	543 {
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	544 MarkNotOrthancAnonymization();
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	545 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	548 ResourceType DicomModification::GetLevel() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	549 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	550 return level_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	551 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	552
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	553
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	554 static void SetupUidsFromOrthancInternal(std::set<DicomTag>& uids,
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	555 std::set<DicomTag>& removals,
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	556 const DicomTag& tag)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	557 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	558 uids.insert(tag);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	559 removals.erase(tag); // Necessary if unserializing a job from 1.9.3
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	560 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	561
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	562
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	563 void DicomModification::SetupUidsFromOrthanc_1_9_3()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	564 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	565 /**
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	566 * Values below come from the hardcoded UID of Orthanc 1.9.3
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	567 * in DicomModification::RelationshipsVisitor::VisitString() and
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	568 * DicomModification::RelationshipsVisitor::RemoveRelationships()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	569 * https://hg.orthanc-server.com/orthanc/file/Orthanc-1.9.3/OrthancFramework/Sources/DicomParsing/DicomModification.cpp#l117
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	570 **/
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	571 uids_.clear();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	572
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	573 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0008, 0x0014)); // Instance Creator UID <= from SetupAnonymization2008()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	574 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0008, 0x1155)); // Referenced SOP Instance UID <= from VisitString() + RemoveRelationships()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	575 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0020, 0x0052)); // Frame of Reference UID <= from VisitString() + RemoveRelationships()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	576 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0020, 0x0200)); // Synchronization Frame of Reference UID <= from SetupAnonymization2008()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	577 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0040, 0xa124)); // UID <= from SetupAnonymization2008()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	578 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x0088, 0x0140)); // Storage Media File-set UID <= from SetupAnonymization2008()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	579 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x3006, 0x0024)); // Referenced Frame of Reference UID <= from VisitString() + RemoveRelationships()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	580 SetupUidsFromOrthancInternal(uids_, removals_, DicomTag(0x3006, 0x00c2)); // Related Frame of Reference UID <= from VisitString() + RemoveRelationships()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	581 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	582
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	583
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	584 void DicomModification::SetupAnonymization2008()
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 {
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	586 // 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	587 // https://raw.githubusercontent.com/jodogne/dicom-specification/master/2008/08_15pu.pdf
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	588
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	589 SetupUidsFromOrthanc_1_9_3();
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	590
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	591 //uids_.insert(DicomTag(0x0008, 0x0014)); // Instance Creator UID => set in SetupUidsFromOrthanc_1_9_3()
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	592 //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	593 removals_.insert(DicomTag(0x0008, 0x0050)); // Accession Number
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	594 removals_.insert(DicomTag(0x0008, 0x0080)); // Institution Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	595 removals_.insert(DicomTag(0x0008, 0x0081)); // Institution Address
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	596 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	597 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	598 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	599 removals_.insert(DicomTag(0x0008, 0x1010)); // Station Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	600 removals_.insert(DicomTag(0x0008, 0x1030)); // Study Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	601 removals_.insert(DicomTag(0x0008, 0x103e)); // Series Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	602 removals_.insert(DicomTag(0x0008, 0x1040)); // Institutional Department Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	603 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	604 removals_.insert(DicomTag(0x0008, 0x1050)); // Performing Physicians' Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	605 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	606 removals_.insert(DicomTag(0x0008, 0x1070)); // Operators' Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	607 removals_.insert(DicomTag(0x0008, 0x1080)); // Admitting Diagnoses Description
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	608 //uids_.insert(DicomTag(0x0008, 0x1155)); // Referenced SOP Instance UID => set in SetupUidsFromOrthanc_1_9_3()
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	609 removals_.insert(DicomTag(0x0008, 0x2111)); // Derivation Description
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	610 //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	611 //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	612 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	613 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	614 removals_.insert(DicomTag(0x0010, 0x0040)); // Patient's Sex
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	615 removals_.insert(DicomTag(0x0010, 0x1000)); // Other Patient Ids
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	616 removals_.insert(DicomTag(0x0010, 0x1001)); // Other Patient Names
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	617 removals_.insert(DicomTag(0x0010, 0x1010)); // Patient's Age
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	618 removals_.insert(DicomTag(0x0010, 0x1020)); // Patient's Size
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	619 removals_.insert(DicomTag(0x0010, 0x1030)); // Patient's Weight
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	620 removals_.insert(DicomTag(0x0010, 0x1090)); // Medical Record Locator
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	621 removals_.insert(DicomTag(0x0010, 0x2160)); // Ethnic Group
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	622 removals_.insert(DicomTag(0x0010, 0x2180)); // Occupation
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	623 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	624 removals_.insert(DicomTag(0x0010, 0x4000)); // Patient Comments
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	625 removals_.insert(DicomTag(0x0018, 0x1000)); // Device Serial Number
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	626 removals_.insert(DicomTag(0x0018, 0x1030)); // Protocol Name
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	627 //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	628 //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	629 removals_.insert(DicomTag(0x0020, 0x0010)); // Study ID
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	630 //uids_.insert(DicomTag(0x0020, 0x0052)); // Frame of Reference UID => set in SetupUidsFromOrthanc_1_9_3()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	631 //uids_.insert(DicomTag(0x0020, 0x0200)); // Synchronization Frame of Reference UID => set in SetupUidsFromOrthanc_1_9_3()
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	632 removals_.insert(DicomTag(0x0020, 0x4000)); // Image Comments
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	633 removals_.insert(DicomTag(0x0040, 0x0275)); // Request Attributes Sequence
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	634 //uids_.insert(DicomTag(0x0040, 0xa124)); // UID => set in SetupUidsFromOrthanc_1_9_3()
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	635 removals_.insert(DicomTag(0x0040, 0xa730)); // Content Sequence
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	636 //uids_.insert(DicomTag(0x0088, 0x0140)); // Storage Media File-set UID => set in SetupUidsFromOrthanc_1_9_3()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	637 //uids_.insert(DicomTag(0x3006, 0x0024)); // Referenced Frame of Reference UID => set in SetupUidsFromOrthanc_1_9_3()
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	638 //uids_.insert(DicomTag(0x3006, 0x00c2)); // Related Frame of Reference UID => set in SetupUidsFromOrthanc_1_9_3()
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	640 // 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	641 removals_.insert(DicomTag(0x0010, 0x1040)); // Patient's Address
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	642 removals_.insert(DicomTag(0x0032, 0x1032)); // Requesting Physician
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	643 removals_.insert(DicomTag(0x0010, 0x2154)); // PatientTelephoneNumbers
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	644 removals_.insert(DicomTag(0x0010, 0x2000)); // Medical Alerts
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	645
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	646 // Set the DeidentificationMethod tag
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	647 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	648 }
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	649
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	650
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	651 void DicomModification::SetupAnonymization2017c()
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	652 {
2313 d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	653 /**
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	654 * 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	655 * 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	656 * generated automatically by calling:
7e4d1f2b3a8f GenerateAnonymizationProfile.py can read from URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	657 * "../../../OrthancServer/Resources/GenerateAnonymizationProfile.py
7e4d1f2b3a8f GenerateAnonymizationProfile.py can read from URL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	658 * 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	659 **/
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	660
4676 caf963ee3de9 DicomModification_Anonymization2017c.impl.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4675 diff changeset	661 #include "DicomModification_Anonymization2017c.impl.h"
2313 d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	662
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	663 // Set the DeidentificationMethod tag
d19e716b79fa switch to anonymization according to DICOM 2017c Sebastien Jodogne <s.jodogne@gmail.com> parents: 2311 diff changeset	664 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	665 }
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	666
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	667
4677 521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	668 void DicomModification::SetupAnonymization2021b()
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	669 {
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	670 /**
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	671 * This is Table E.1-1 from PS 3.15-2021b (DICOM Part 15: Security
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	672 * and System Management Profiles), "basic profile" column. It was
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	673 * generated automatically by calling:
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	674 * "../../../OrthancServer/Resources/GenerateAnonymizationProfile.py
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	675 * https://raw.githubusercontent.com/jodogne/dicom-specification/master/2021b/part15.xml"
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	676 *
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	677 * http://dicom.nema.org/medical/dicom/2021b/output/chtml/part15/chapter_E.html#table_E.1-1a
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	678 * http://dicom.nema.org/medical/dicom/2021b/output/chtml/part15/chapter_E.html#table_E.1-1
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	679 **/
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	680
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	681 #include "DicomModification_Anonymization2021b.impl.h"
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	682
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	683 // Set the DeidentificationMethod tag
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	684 ReplaceInternal(DICOM_TAG_DEIDENTIFICATION_METHOD, ORTHANC_DEIDENTIFICATION_METHOD_2021b);
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	685 }
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	686
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	687
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	688 void DicomModification::SetupAnonymization(DicomVersion version)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	689 {
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	690 isAnonymization_ = true;
062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	691
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	692 removals_.clear();
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	693 clearings_.clear();
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	694 removedRanges_.clear();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	695 uids_.clear();
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	696 ClearReplacements();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	697 removePrivateTags_ = true;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	698 level_ = ResourceType_Patient;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	699 uidMap_.clear();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	700 privateTagsToKeep_.clear();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	701
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	702 switch (version)
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	703 {
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	704 case DicomVersion_2008:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	705 SetupAnonymization2008();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	706 break;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	707
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	708 case DicomVersion_2017c:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	709 SetupAnonymization2017c();
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	710 break;
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	711
4677 521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	712 case DicomVersion_2021b:
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	713 SetupAnonymization2021b();
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	714 break;
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	715
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	716 default:
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	717 throw OrthancException(ErrorCode_ParameterOutOfRange);
4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2277 diff changeset	718 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 // Set the PatientIdentityRemoved tag
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	721 ReplaceInternal(DicomTag(0x0012, 0x0062), "YES");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 // (*) Choose a random patient name and ID
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	724 std::string patientId = FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Patient);
1698 d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	725 ReplaceInternal(DICOM_TAG_PATIENT_ID, patientId);
d78b87f93bcf DicomModification use Json::Value Sebastien Jodogne <s.jodogne@gmail.com> parents: 1695 diff changeset	726 ReplaceInternal(DICOM_TAG_PATIENT_NAME, patientId);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	727
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	728 // Sanity check
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	729 for (SetOfTags::const_iterator it = uids_.begin(); it != uids_.end(); ++it)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	730 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	731 ValueRepresentation vr = FromDcmtkBridge::LookupValueRepresentation(*it);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	732 if (vr != ValueRepresentation_UniqueIdentifier &&
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	733 vr != ValueRepresentation_NotSupported /* for older versions of DCMTK */)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	734 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	735 throw OrthancException(ErrorCode_InternalError);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	736 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	737 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 void DicomModification::Apply(ParsedDicomFile& toModify)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 // Check the request
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	743 assert(ResourceType_Patient + 1 == ResourceType_Study &&
7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	744 ResourceType_Study + 1 == ResourceType_Series &&
7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	745 ResourceType_Series + 1 == ResourceType_Instance);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 if (IsRemoved(DICOM_TAG_PATIENT_ID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 IsRemoved(DICOM_TAG_STUDY_INSTANCE_UID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 IsRemoved(DICOM_TAG_SERIES_INSTANCE_UID) \|\|
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 IsRemoved(DICOM_TAG_SOP_INSTANCE_UID))
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 throw OrthancException(ErrorCode_BadRequest);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	753 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	754
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	756 // Sanity checks at the patient level
788 7ebe4bf87196 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 787 diff changeset	757 if (level_ == ResourceType_Patient && !IsReplaced(DICOM_TAG_PATIENT_ID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	759 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	760 "When modifying a patient, her PatientID is required to be modified");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	763 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	764 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	765 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	766 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	767 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	768 "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	769 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	770
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	771 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	772 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	773 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	774 "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	775 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	776
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	777 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	778 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	779 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	780 "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	781 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	782 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	783
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	784
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	785 // Sanity checks at the study level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	786 if (level_ == ResourceType_Study && IsReplaced(DICOM_TAG_PATIENT_ID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	787 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	788 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	789 "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	790 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	791
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	792 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	793 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	794 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	795 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	796 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	797 "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	798 }
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	799
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	800 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	801 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	802 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	803 "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	804 }
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	805 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	806
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	808 // Sanity checks at the series level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	809 if (level_ == ResourceType_Series && IsReplaced(DICOM_TAG_PATIENT_ID))
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	810 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	811 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	812 "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	813 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	814
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	815 if (level_ == ResourceType_Series && IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	817 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	818 "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	819 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	820
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	821 if (!allowManualIdentifiers_)
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	822 {
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	823 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	824 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	825 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	826 "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	827 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	830
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	831 // Sanity checks at the instance level
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	832 if (level_ == ResourceType_Instance && IsReplaced(DICOM_TAG_PATIENT_ID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	834 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	835 "When modifying an instance, the parent PatientID cannot be manually modified");
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837
1160 80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	838 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	839 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	840 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	841 "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	842 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	843
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	844 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	845 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	846 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	847 "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	848 }
80671157d051 generalization of create-dicom Sebastien Jodogne <s.jodogne@gmail.com> parents: 991 diff changeset	849
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	850 // (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	851 // is provided
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	852 if (identifierGenerator_ != NULL)
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	853 {
4139 a4f28efdfccf "maxTagLength" must be explicitly given to ParsedDicomFile::ExtractDicomSummary() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	854 toModify.ExtractDicomSummary(currentSource_, ORTHANC_MAXIMUM_TAG_LENGTH);
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	855 }
d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	856
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	857 // (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	858 // 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	859 if (isAnonymization_ && updateReferencedRelationships_)
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	860 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	861 if (IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	862 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	863 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	864 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	865 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	866 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Study);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	867 }
2535 d3476d90dcb7 DicomModification::SetDicomIdentifierGenerator() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2521 diff changeset	868
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	869 if (IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	870 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	871 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	872 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	873 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	874 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Series);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	875 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	876
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	877 if (IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	878 {
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	879 std::string original;
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	880 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	881 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	882 RegisterMappedDicomIdentifier(original, replacement, ResourceType_Instance);
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	883 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	884 }
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	885
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	886
7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	887 // (2) Remove the private tags, if need be
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 if (removePrivateTags_)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889 {
991 2f76b92addd4 keep private tags during anonymization Sebastien Jodogne <s.jodogne@gmail.com> parents: 916 diff changeset	890 toModify.RemovePrivateTags(privateTagsToKeep_);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	893 // (3) Clear the tags specified by the user
2310 b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	894 for (SetOfTags::const_iterator it = clearings_.begin();
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	895 it != clearings_.end(); ++it)
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	896 {
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	897 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	898 }
b7fba68747f6 DicomModification::Clear() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2309 diff changeset	899
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	900 // (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	901 for (SetOfTags::const_iterator it = removals_.begin();
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 it != removals_.end(); ++it)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 {
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 toModify.Remove(*it);
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	907 // (5) Replace the tags
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 for (Replacements::const_iterator it = replacements_.begin();
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 it != replacements_.end(); ++it)
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 {
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	911 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	912 DicomReplaceMode_InsertIfAbsent, privateCreator_);
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	915 // (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	916 if (level_ <= ResourceType_Study &&
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	917 !IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918 {
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	919 if (keepStudyInstanceUid_)
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	920 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	921 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	922 }
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	923 else
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	924 {
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	925 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	926 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	927 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	929 if (level_ <= ResourceType_Series &&
7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	930 !IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	931 {
2194 3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	932 if (keepSeriesInstanceUid_)
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	933 {
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	934 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	935 }
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	936 else
3b40ca7470cc "Keep" option for modifications to keep original DICOM identifiers (advanced feature) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	937 {
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	938 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	939 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941
1279 7f3a65e84d4b More flexible /modify and /anonymize for single instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1160 diff changeset	942 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	943 !IsReplaced(DICOM_TAG_SOP_INSTANCE_UID))
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 {
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	945 if (keepSopInstanceUid_)
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	946 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	947 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	948 }
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	949 else
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	950 {
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	951 MapDicomTags(toModify, ResourceType_Instance);
9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	952 }
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	953 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	954
3513 7db879b014ff Fix lost relationships between CT and RT-STRUCT during anonymization amazy parents: 3344 diff changeset	955 // (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	956 if (isAnonymization_)
2506 51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	957 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	958 RelationshipsVisitor visitor(*this);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	959
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	960 if (updateReferencedRelationships_)
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	961 {
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	962 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	963 }
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	964 else
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	965 {
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	966 visitor.RemoveRelationships(toModify);
51b91ead6c38 Preservation of UID relationships while anonymizing Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	967 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 }
b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	970
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	971 void DicomModification::SetAllowManualIdentifiers(bool check)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	972 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	973 allowManualIdentifiers_ = check;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	974 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	975
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	976 bool DicomModification::AreAllowManualIdentifiers() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	977 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	978 return allowManualIdentifiers_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	979 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	980
2519 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 static bool IsDatabaseKey(const DicomTag& tag)
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 return (tag == DICOM_TAG_PATIENT_ID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	985 tag == DICOM_TAG_STUDY_INSTANCE_UID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	986 tag == DICOM_TAG_SERIES_INSTANCE_UID \|\|
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	987 tag == DICOM_TAG_SOP_INSTANCE_UID);
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
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 static void ParseListOfTags(DicomModification& target,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	992 const Json::Value& query,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	993 DicomModification::TagOperation operation,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	994 bool force)
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 if (!query.isArray())
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 throw OrthancException(ErrorCode_BadRequest);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	999 }
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 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	1002 {
2844 99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	1003 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	1004 {
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	1005 throw OrthancException(ErrorCode_BadRequest);
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	1006 }
99863d6245b2 New URI: "/studies/.../split" to split a study Sebastien Jodogne <s.jodogne@gmail.com> parents: 2721 diff changeset	1007
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1008 std::string name = query[i].asString();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1009
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1010 DicomTag tag = FromDcmtkBridge::ParseTag(name);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1011
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1012 if (!force && IsDatabaseKey(tag))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1013 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1014 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1015 "Marking tag \"" + name + "\" as to be " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1016 (operation == DicomModification::TagOperation_Keep ? "kept" : "removed") +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1017 " 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	1018 }
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 switch (operation)
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 case DicomModification::TagOperation_Keep:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1023 target.Keep(tag);
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	1024 LOG(TRACE) << "Keep: " << name << " (" << tag.Format() << ")";
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1025 break;
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 case DicomModification::TagOperation_Remove:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1028 target.Remove(tag);
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	1029 LOG(TRACE) << "Remove: " << name << " (" << tag.Format() << ")";
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1030 break;
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 default:
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1033 throw OrthancException(ErrorCode_InternalError);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1034 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1035 }
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
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 static void ParseReplacements(DicomModification& target,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1040 const Json::Value& replacements,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1041 bool force)
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 if (!replacements.isObject())
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 throw OrthancException(ErrorCode_BadRequest);
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
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1048 Json::Value::Members members = replacements.getMemberNames();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1049 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	1050 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1051 const std::string& name = members[i];
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1052 const Json::Value& value = replacements[name];
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1053
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1054 DicomTag tag = FromDcmtkBridge::ParseTag(name);
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 (!force && IsDatabaseKey(tag))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1057 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1058 throw OrthancException(ErrorCode_BadRequest,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1059 "Marking tag \"" + name + "\" as to be replaced " +
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1060 "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	1061 }
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 target.Replace(tag, value, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1064
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	1065 LOG(TRACE) << "Replace: " << name << " (" << tag.Format()
91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4297 diff changeset	1066 << ") == " << value.toStyledString();
2519 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 }
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 static bool GetBooleanValue(const std::string& member,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1072 const Json::Value& json,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1073 bool defaultValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1074 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1075 if (!json.isMember(member))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1076 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1077 return defaultValue;
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1078 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1079 else if (json[member].type() == Json::booleanValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1080 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1081 return json[member].asBool();
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1082 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1083 else
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1084 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1085 throw OrthancException(ErrorCode_BadFileFormat,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1086 "Member \"" + member + "\" should be a Boolean value");
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1087 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1088 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1089
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1090
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1091 void DicomModification::ParseModifyRequest(const Json::Value& request)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1092 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1093 if (!request.isObject())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1094 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1095 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1096 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1097
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1098 bool force = GetBooleanValue("Force", request, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1099
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1100 if (GetBooleanValue("RemovePrivateTags", request, false))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1101 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1102 SetRemovePrivateTags(true);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1103 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1104
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1105 if (request.isMember("Remove"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1106 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1107 ParseListOfTags(*this, request["Remove"], TagOperation_Remove, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1108 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1109
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1110 if (request.isMember("Replace"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1111 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1112 ParseReplacements(*this, request["Replace"], force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1113 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1114
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1115 // 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	1116 // StudyInstanceUID, SeriesInstanceUID and SOPInstanceUID. Avoid
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1117 // 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	1118 // 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	1119 // you're doing!
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1120 if (request.isMember("Keep"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1121 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1122 ParseListOfTags(*this, request["Keep"], TagOperation_Keep, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1123 }
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
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	1125 // 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	1126 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	1127 {
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	1128 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	1129 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1130 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1131
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1132
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1133 void DicomModification::ParseAnonymizationRequest(bool& patientNameReplaced,
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1134 const Json::Value& request)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1135 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1136 if (!request.isObject())
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1137 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1138 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1139 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1140
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1141 bool force = GetBooleanValue("Force", request, false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1142
4677 521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	1143 // DicomVersion version = DicomVersion_2008; // For Orthanc <= 1.2.0
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	1144 // DicomVersion version = DicomVersion_2017c; // For Orthanc between 1.3.0 and 1.9.3
521e39b3f2c0 Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b Sebastien Jodogne <s.jodogne@gmail.com> parents: 4676 diff changeset	1145 DicomVersion version = DicomVersion_2021b; // For Orthanc >= 1.9.4
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1146 if (request.isMember("DicomVersion"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1147 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1148 if (request["DicomVersion"].type() != Json::stringValue)
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1149 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1150 throw OrthancException(ErrorCode_BadFileFormat);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1151 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1152 else
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1153 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1154 version = StringToDicomVersion(request["DicomVersion"].asString());
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1155 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1156 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1157
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1158 SetupAnonymization(version);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1159
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1160 std::string patientName = GetReplacementAsString(DICOM_TAG_PATIENT_NAME);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1161
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1162 if (GetBooleanValue("KeepPrivateTags", request, false))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1163 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1164 SetRemovePrivateTags(false);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1165 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1166
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1167 if (request.isMember("Remove"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1168 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1169 ParseListOfTags(*this, request["Remove"], TagOperation_Remove, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1170 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1171
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1172 if (request.isMember("Replace"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1173 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1174 ParseReplacements(*this, request["Replace"], force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1175 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1176
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1177 if (request.isMember("Keep"))
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1178 {
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1179 ParseListOfTags(*this, request["Keep"], TagOperation_Keep, force);
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1180 }
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1181
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1182 patientNameReplaced = (IsReplaced(DICOM_TAG_PATIENT_NAME) &&
2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1183 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	1184
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1185 // 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	1186 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	1187 {
1f4910999fe7 Fix issue #168 (Plugins can't read private tags from the configuration file) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1188 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	1189 }
2519 2e6b7862ccf2 ParseAnonymizationRequest/ParseModifyRequest now in DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2506 diff changeset	1190 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1191
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1192 void DicomModification::SetDicomIdentifierGenerator(DicomModification::IDicomIdentifierGenerator &generator)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1193 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1194 identifierGenerator_ = &generator;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1195 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1196
2662 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
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 static const char* REMOVE_PRIVATE_TAGS = "RemovePrivateTags";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1201 static const char* LEVEL = "Level";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1202 static const char* ALLOW_MANUAL_IDENTIFIERS = "AllowManualIdentifiers";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1203 static const char* KEEP_STUDY_INSTANCE_UID = "KeepStudyInstanceUID";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1204 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	1205 static const char* KEEP_SOP_INSTANCE_UID = "KeepSOPInstanceUID";
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1206 static const char* UPDATE_REFERENCED_RELATIONSHIPS = "UpdateReferencedRelationships";
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1207 static const char* IS_ANONYMIZATION = "IsAnonymization";
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1208 static const char* REMOVALS = "Removals";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1209 static const char* CLEARINGS = "Clearings";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1210 static const char* PRIVATE_TAGS_TO_KEEP = "PrivateTagsToKeep";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1211 static const char* REPLACEMENTS = "Replacements";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1212 static const char* MAP_PATIENTS = "MapPatients";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1213 static const char* MAP_STUDIES = "MapStudies";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1214 static const char* MAP_SERIES = "MapSeries";
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1215 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	1216 static const char* PRIVATE_CREATOR = "PrivateCreator"; // New in Orthanc 1.6.0
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1217 static const char* UIDS = "Uids"; // New in Orthanc 1.9.4
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1218 static const char* REMOVED_RANGES = "RemovedRanges"; // New in Orthanc 1.9.4
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1219
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1220 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	1221 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1222 if (identifierGenerator_ != NULL)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1223 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1224 throw OrthancException(ErrorCode_InternalError,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2844 diff changeset	1225 "Cannot serialize a DicomModification with a custom identifier generator");
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1226 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1227
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1228 value = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1229 value[REMOVE_PRIVATE_TAGS] = removePrivateTags_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1230 value[LEVEL] = EnumerationToString(level_);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1231 value[ALLOW_MANUAL_IDENTIFIERS] = allowManualIdentifiers_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1232 value[KEEP_STUDY_INSTANCE_UID] = keepStudyInstanceUid_;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1233 value[KEEP_SERIES_INSTANCE_UID] = keepSeriesInstanceUid_;
3860 9ccbbd55bc23 allow Keeping the SOPInstanceUID in /instances/../modify Alain Mazy <alain@mazy.be> parents: 3712 diff changeset	1234 value[KEEP_SOP_INSTANCE_UID] = keepSopInstanceUid_;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1235 value[UPDATE_REFERENCED_RELATIONSHIPS] = updateReferencedRelationships_;
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1236 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	1237 value[PRIVATE_CREATOR] = privateCreator_;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1238
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1239 SerializationToolbox::WriteSetOfTags(value, removals_, REMOVALS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1240 SerializationToolbox::WriteSetOfTags(value, clearings_, CLEARINGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1241 SerializationToolbox::WriteSetOfTags(value, privateTagsToKeep_, PRIVATE_TAGS_TO_KEEP);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1242
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1243 Json::Value& tmp = value[REPLACEMENTS];
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 tmp = Json::objectValue;
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 for (Replacements::const_iterator it = replacements_.begin();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1248 it != replacements_.end(); ++it)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1249 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1250 assert(it->second != NULL);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1251 tmp[it->first.Format()] = *it->second;
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 Json::Value& mapPatients = value[MAP_PATIENTS];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1255 Json::Value& mapStudies = value[MAP_STUDIES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1256 Json::Value& mapSeries = value[MAP_SERIES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1257 Json::Value& mapInstances = value[MAP_INSTANCES];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1258
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1259 mapPatients = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1260 mapStudies = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1261 mapSeries = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1262 mapInstances = Json::objectValue;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1263
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1264 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	1265 {
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1266 Json::Value* tmp2 = NULL;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1267
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1268 switch (it->first.first)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1269 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1270 case ResourceType_Patient:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1271 tmp2 = &mapPatients;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1272 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1273
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1274 case ResourceType_Study:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1275 tmp2 = &mapStudies;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1276 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1277
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1278 case ResourceType_Series:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1279 tmp2 = &mapSeries;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1280 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1281
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1282 case ResourceType_Instance:
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1283 tmp2 = &mapInstances;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1284 break;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1285
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1286 default:
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1287 throw OrthancException(ErrorCode_InternalError);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1288 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1289
4200 7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1290 assert(tmp2 != NULL);
7112a8af0b63 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	1291 (*tmp2) [it->first.second] = it->second;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1292 }
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1293
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1294 // New in Orthanc 1.9.4
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1295 SerializationToolbox::WriteSetOfTags(value, uids_, UIDS);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1296
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1297 // New in Orthanc 1.9.4
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1298 Json::Value ranges = Json::arrayValue;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1299
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1300 for (RemovedRanges::const_iterator it = removedRanges_.begin(); it != removedRanges_.end(); ++it)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1301 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1302 Json::Value item = Json::arrayValue;
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1303 item.append(it->GetGroupFrom());
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1304 item.append(it->GetGroupTo());
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1305 item.append(it->GetElementFrom());
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1306 item.append(it->GetElementTo());
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1307 ranges.append(item);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1308 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1309
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1310 value[REMOVED_RANGES] = ranges;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1311 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1312
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1313 void DicomModification::UnserializeUidMap(ResourceType level,
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1314 const Json::Value& serialized,
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1315 const char* field)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1316 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1317 if (!serialized.isMember(field) \|\|
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1318 serialized[field].type() != Json::objectValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1319 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1320 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1321 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1322
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1323 Json::Value::Members names = serialized[field].getMemberNames();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1324
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1325 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	1326 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1327 const Json::Value& value = serialized[field][*it];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1328
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1329 if (value.type() != Json::stringValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1330 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1331 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1332 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1333 else
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1334 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1335 uidMap_[std::make_pair(level, *it)] = value.asString();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1336 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1337 }
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1338 }
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1339
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1340
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1341 DicomModification::DicomModification(const Json::Value& serialized) :
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	1342 identifierGenerator_(NULL)
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	1343 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1344 removePrivateTags_ = SerializationToolbox::ReadBoolean(serialized, REMOVE_PRIVATE_TAGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1345 level_ = StringToResourceType(SerializationToolbox::ReadString(serialized, LEVEL).c_str());
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1346 allowManualIdentifiers_ = SerializationToolbox::ReadBoolean(serialized, ALLOW_MANUAL_IDENTIFIERS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1347 keepStudyInstanceUid_ = SerializationToolbox::ReadBoolean(serialized, KEEP_STUDY_INSTANCE_UID);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1348 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	1349 keepSopInstanceUid_ = SerializationToolbox::ReadBoolean(serialized, KEEP_SOP_INSTANCE_UID);
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1350 updateReferencedRelationships_ = SerializationToolbox::ReadBoolean
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1351 (serialized, UPDATE_REFERENCED_RELATIONSHIPS);
2721 062776ab4a21 fix issue #94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1352 isAnonymization_ = SerializationToolbox::ReadBoolean(serialized, IS_ANONYMIZATION);
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1353
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	1354 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	1355 {
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	1356 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	1357 }
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	1358
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1359 SerializationToolbox::ReadSetOfTags(removals_, serialized, REMOVALS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1360 SerializationToolbox::ReadSetOfTags(clearings_, serialized, CLEARINGS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1361 SerializationToolbox::ReadSetOfTags(privateTagsToKeep_, serialized, PRIVATE_TAGS_TO_KEEP);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1362
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1363 if (!serialized.isMember(REPLACEMENTS) \|\|
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1364 serialized[REPLACEMENTS].type() != Json::objectValue)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1365 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1366 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1367 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1368
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1369 Json::Value::Members names = serialized[REPLACEMENTS].getMemberNames();
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1370
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1371 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	1372 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1373 DicomTag tag(0, 0);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1374 if (!DicomTag::ParseHexadecimal(tag, it->c_str()))
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1375 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1376 throw OrthancException(ErrorCode_BadFileFormat);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1377 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1378 else
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1379 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1380 const Json::Value& value = serialized[REPLACEMENTS][*it];
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1381 replacements_.insert(std::make_pair(tag, new Json::Value(value)));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1382 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1383 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1384
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1385 UnserializeUidMap(ResourceType_Patient, serialized, MAP_PATIENTS);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1386 UnserializeUidMap(ResourceType_Study, serialized, MAP_STUDIES);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1387 UnserializeUidMap(ResourceType_Series, serialized, MAP_SERIES);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	1388 UnserializeUidMap(ResourceType_Instance, serialized, MAP_INSTANCES);
4678 2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1389
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1390 // New in Orthanc 1.9.4
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1391 if (serialized.isMember(UIDS)) // Backward compatibility with Orthanc <= 1.9.3
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1392 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1393 SerializationToolbox::ReadSetOfTags(uids_, serialized, UIDS);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1394 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1395 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1396 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1397 SetupUidsFromOrthanc_1_9_3();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1398 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1399
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1400 // New in Orthanc 1.9.4
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1401 removedRanges_.clear();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1402 if (serialized.isMember(REMOVED_RANGES)) // Backward compatibility with Orthanc <= 1.9.3
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1403 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1404 const Json::Value& ranges = serialized[REMOVED_RANGES];
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1405
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1406 if (ranges.type() != Json::arrayValue)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1407 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1408 throw OrthancException(ErrorCode_BadFileFormat);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1409 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1410 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1411 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1412 for (Json::Value::ArrayIndex i = 0; i < ranges.size(); i++)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1413 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1414 if (ranges[i].type() != Json::arrayValue \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1415 ranges[i].size() != 4 \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1416 !ranges[i][0].isUInt() \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1417 !ranges[i][1].isUInt() \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1418 !ranges[i][2].isUInt() \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1419 !ranges[i][3].isUInt())
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1420 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1421 throw OrthancException(ErrorCode_BadFileFormat);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1422 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1423 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1424 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1425 Json::LargestUInt groupFrom = ranges[i][0].asUInt();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1426 Json::LargestUInt groupTo = ranges[i][1].asUInt();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1427 Json::LargestUInt elementFrom = ranges[i][2].asUInt();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1428 Json::LargestUInt elementTo = ranges[i][3].asUInt();
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1429
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1430 if (groupFrom > groupTo \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1431 elementFrom > elementTo \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1432 groupTo > 0xffffu \|\|
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1433 elementTo > 0xffffu)
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1434 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1435 throw OrthancException(ErrorCode_BadFileFormat);
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1436 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1437 else
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1438 {
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1439 removedRanges_.push_back(DicomTagRange(groupFrom, groupTo, elementFrom, elementTo));
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1440 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1441 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1442 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1443 }
2e850edf03d6 Full support for the anonymization of subsequences containing tags whose VR is UI Sebastien Jodogne <s.jodogne@gmail.com> parents: 4677 diff changeset	1444 }
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2535 diff changeset	1445 }
4297 785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1446
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1447
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1448 void DicomModification::SetPrivateCreator(const std::string &privateCreator)
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1449 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1450 privateCreator_ = privateCreator;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1451 }
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1452
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1453 const std::string &DicomModification::GetPrivateCreator() const
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1454 {
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1455 return privateCreator_;
785a2713323e abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4273 diff changeset	1456 }
786 b6d6b65142e8 DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1457 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4678:2e850edf03d6