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

comparison OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4684:e3810750dc9d

simplified DicomModification::RelationshipsVisitor

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 08 Jun 2021 14:42:09 +0200
parents	2e850edf03d6
children	693f049729ba

comparison

equal deleted inserted replaced

-:7182f5732480
+:e3810750dc9d
 class DicomModification::RelationshipsVisitor : public ITagVisitor
 {
 private:
 DicomModification&  that_;
-bool IsEnabled(const DicomTag& tag) const
+// This method is only applicable to first-level tags
-{
+bool IsManuallyModified(const DicomTag& tag) const
-return (!that_.IsCleared(tag) &&
+{
-!that_.IsRemoved(tag) &&
+return (that_.IsCleared(tag) ||
-!that_.IsReplaced(tag));
+that_.IsRemoved(tag) ||
-}
+that_.IsReplaced(tag));
+}
-void RemoveIfEnabled(ParsedDicomFile& dicom,
-const DicomTag& tag) const
-{
-if (IsEnabled(tag))
-{
-dicom.Remove(tag);
-}
-}
 public:
 explicit RelationshipsVisitor(DicomModification& that) :
 that_(that)
 {
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 ValueRepresentation vr,
 const std::string& value)
 {
-// Note that all the tags in "uids_" have the VR UI (unique
+/**
-// identifier), and are considered as strings
+* Note that all the tags in "uids_" have the VR UI (unique
+* identifier), and are considered as strings.
-if (!IsEnabled(tag))
+*
-{
+* Also, the tags "SOP Instance UID", "Series Instance UID" and
-return Action_None;
+* "Study Instance UID" are *never* included in "uids_", as they
-}
+* are separately handed by "MapDicomTags()".
-else if (!parentTags.empty() &&  // Don't anonymize twice the anonymization done by "MapDicomTags()"
+**/
-tag == DICOM_TAG_STUDY_INSTANCE_UID)
-{
+assert(that_.uids_.find(DICOM_TAG_STUDY_INSTANCE_UID) == that_.uids_.end());
-newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
+assert(that_.uids_.find(DICOM_TAG_SERIES_INSTANCE_UID) == that_.uids_.end());
-return Action_Replace;
+assert(that_.uids_.find(DICOM_TAG_SOP_INSTANCE_UID) == that_.uids_.end());
-}
-else if (!parentTags.empty() &&  // Don't anonymize twice the anonymization done by "MapDicomTags()"
+if (parentTags.empty())
-tag == DICOM_TAG_SERIES_INSTANCE_UID)
+{
-{
+// We are on a first-level tag
-newValue = that_.MapDicomIdentifier(value, ResourceType_Series);
+if (that_.uids_.find(tag) != that_.uids_.end() &&
-return Action_Replace;
+!IsManuallyModified(tag))
-}
-else if (!parentTags.empty() &&  // Don't anonymize twice the anonymization done by "MapDicomTags()"
-tag == DICOM_TAG_SOP_INSTANCE_UID)
-{
-newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
-return Action_Replace;
-}
-else if (that_.uids_.find(tag) != that_.uids_.end())
-{
-assert(vr == ValueRepresentation_UniqueIdentifier ||
-vr == ValueRepresentation_NotSupported /* for older versions of DCMTK */);
-if (parentTags.size() == 2 &&
-parentTags[0] == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_SEQUENCE &&
-parentTags[1] == DICOM_TAG_RT_REFERENCED_STUDY_SEQUENCE &&
-tag == DICOM_TAG_REFERENCED_SOP_INSTANCE_UID)
 {
-// in RT-STRUCT, this ReferencedSOPInstanceUID is actually referencing a StudyInstanceUID !!
+// This is a first-level UID tag that must be anonymized
-// (observed in many data sets including: https://wiki.cancerimagingarchive.net/display/Public/Lung+CT+Segmentation+Challenge+2017)
+assert(vr == ValueRepresentation_UniqueIdentifier ||
-// tested in test_anonymize_relationships_5
+vr == ValueRepresentation_NotSupported /* for older versions of DCMTK */);
-newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
+newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
+return Action_Replace;
 }
 else
 {
+return Action_None;
+}
+}
+else
+{
+// We are within a sequence
+if (tag == DICOM_TAG_STUDY_INSTANCE_UID)
+{
+newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
+return Action_Replace;
+}
+else if (tag == DICOM_TAG_SERIES_INSTANCE_UID)
+{
+newValue = that_.MapDicomIdentifier(value, ResourceType_Series);
+return Action_Replace;
+}
+else if (tag == DICOM_TAG_SOP_INSTANCE_UID)
+{
 newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
+return Action_Replace;
 }
+else if (that_.uids_.find(tag) != that_.uids_.end())
-return Action_Replace;
+{
-}
+assert(vr == ValueRepresentation_UniqueIdentifier ||
-else
+vr == ValueRepresentation_NotSupported /* for older versions of DCMTK */);
-{
-return Action_None;
+if (parentTags.size() == 2 &&
+parentTags[0] == DICOM_TAG_REFERENCED_FRAME_OF_REFERENCE_SEQUENCE &&
+parentTags[1] == DICOM_TAG_RT_REFERENCED_STUDY_SEQUENCE &&
+tag == DICOM_TAG_REFERENCED_SOP_INSTANCE_UID)
+{
+/**
+* In RT-STRUCT, this ReferencedSOPInstanceUID is actually
+* referencing a StudyInstanceUID !! (observed in many
+* data sets including:
+* https://wiki.cancerimagingarchive.net/display/Public/Lung+CT+Segmentation+Challenge+2017)
+* Tested in "test_anonymize_relationships_5". Introduced
+* in: https://hg.orthanc-server.com/orthanc/rev/3513
+**/
+newValue = that_.MapDicomIdentifier(value, ResourceType_Study);
+}
+else
+{
+newValue = that_.MapDicomIdentifier(value, ResourceType_Instance);
+}
+return Action_Replace;
+}
+else
+{
+return Action_None;
+}
 }
 }
 void RemoveRelationships(ParsedDicomFile& dicom) const
 {
 for (SetOfTags::const_iterator it = that_.uids_.begin(); it != that_.uids_.end(); ++it)
 {
-if (*it != DICOM_TAG_STUDY_INSTANCE_UID &&
+assert(*it != DICOM_TAG_STUDY_INSTANCE_UID &&
 *it != DICOM_TAG_SERIES_INSTANCE_UID &&
-*it != DICOM_TAG_SOP_INSTANCE_UID)
+*it != DICOM_TAG_SOP_INSTANCE_UID);
+if (!IsManuallyModified(*it))
 {
-RemoveIfEnabled(dicom, *it);
+dicom.Remove(*it);
 }
 }
 // The only two sequences with to the "X/Z/U*" rule in the
 // basic profile. They were already present in Orthanc 1.9.3.
-RemoveIfEnabled(dicom, DICOM_TAG_REFERENCED_IMAGE_SEQUENCE);
+if (!IsManuallyModified(DICOM_TAG_REFERENCED_IMAGE_SEQUENCE))
-RemoveIfEnabled(dicom, DICOM_TAG_SOURCE_IMAGE_SEQUENCE);
+{
+dicom.Remove(DICOM_TAG_REFERENCED_IMAGE_SEQUENCE);
+}
+if (!IsManuallyModified(DICOM_TAG_SOURCE_IMAGE_SEQUENCE))
+{
+dicom.Remove(DICOM_TAG_SOURCE_IMAGE_SEQUENCE);
+}
 }
 };
 bool DicomModification::CancelReplacement(const DicomTag& tag)

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4684:e3810750dc9d