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

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4734:b51c08bd5c38

added ITagVisitor::Action_Remove

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 05 Jul 2021 16:12:10 +0200
parents	569d9ef165b1
children	979ae3ea3381

comparison

equal deleted inserted replaced

-:1db3b79d97bd
+:b51c08bd5c38
 }
 // Forward declaration
-static void ApplyVisitorToElement(DcmElement& element,
+static bool ApplyVisitorToElement(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 Encoding encoding,
 bool hasCodeExtensions);
 Encoding encoding,
 bool hasCodeExtensions)
 {
 assert(parentTags.size() == parentIndexes.size());
+std::set<DcmTagKey> toRemove;
 for (unsigned long i = 0; i < dataset.card(); i++)
 {
 DcmElement* element = dataset.getElement(i);
 if (element == NULL)
 {
 throw OrthancException(ErrorCode_InternalError);
 }
 else
 {
-ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
+if (!ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions))
+{
+toRemove.insert(element->getTag());
+}
 }
 }
-}
+// Remove all the tags that were planned for removal (cf. ITagVisitor::Action_Remove)
+for (std::set<DcmTagKey>::const_iterator
-static void ApplyVisitorToLeaf(DcmElement& element,
+it = toRemove.begin(); it != toRemove.end(); ++it)
+{
+std::unique_ptr<DcmElement> tmp(dataset.remove(*it));
+}
+}
+// Returns "true" iff the element must be kept. If "false" is
+// returned, the element will be removed.
+static bool ApplyVisitorToLeaf(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
 Encoding encoding,
 evr == EVR_UN)    // unknown value representation
 {
 Uint16* data16 = NULL;
 Uint8* data = NULL;
+ITagVisitor::Action action;
 if ((element.getTag() == DCM_PixelData ||  // (*) New in Orthanc 1.9.1
 evr == EVR_OW) &&
 element.getUint16Array(data16) == EC_Normal)
 {
-visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data16, element.getLength());
+action = visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data16, element.getLength());
 }
 else if (evr != EVR_OW &&
 element.getUint8Array(data) == EC_Normal)
 {
 /**
 * to pixel data, during the call to "swapIfNecessary()" in
 * "DcmPolymorphOBOW::getUint8Array()" (this method is not
 * reimplemented in derived class "DcmPixelData"). However,
 * "getUint16Array()" works correctly, hence (*).
 **/
-visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data, element.getLength());
+action = visitor.VisitBinary(parentTags, parentIndexes, tag, vr, data, element.getLength());
 }
 else
 {
-visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
+action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
 }
-return;  // We're done
+switch (action)
+{
+case ITagVisitor::Action_None:
+return true;  // We're done
+case ITagVisitor::Action_Remove:
+return false;
+case ITagVisitor::Action_Replace:
+throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace binary data");
+default:
+throw OrthancException(ErrorCode_ParameterOutOfRange);
+}
 }
 /**
 * Deal with plain strings (and convert them to UTF-8)
 (newValue, parentTags, parentIndexes, tag, vr, utf8);
 switch (action)
 {
 case ITagVisitor::Action_None:
-break;
+return true;
+case ITagVisitor::Action_Remove:
+return false;
 case ITagVisitor::Action_Replace:
 {
 std::string s = Toolbox::ConvertFromUtf8(newValue, encoding);
 if (element.putString(s.c_str()) != EC_Normal)
 {
 throw OrthancException(ErrorCode_InternalError,
-"Cannot replace value of tag: " + tag.Format());
+"Iterator cannot replace value of tag: " + tag.Format());
 }
-break;
+return true;
 }
 default:
 throw OrthancException(ErrorCode_InternalError);
 }
+}
-return;  // We're done
-}
+ITagVisitor::Action action;
 try
 {
 // http://support.dcmtk.org/docs/dcvr_8h-source.html
 switch (evr)
 {
 case EVR_UT:  // unlimited text
 case EVR_PN:  // person name
 case EVR_UI:  // unique identifier
 {
 Uint8* data = NULL;
 if (element.getUint8Array(data) == EC_Normal)
 {
 const Uint32 length = element.getLength();
 Uint32 l = 0;
 while (l < length &&
 }
 if (l == length)
 {
 // Not a null-terminated plain string
-visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
+action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
 }
 else
 {
 std::string ignored;
 std::string s(reinterpret_cast<const char*>(data), l);
-ITagVisitor::Action action = visitor.VisitString
+action = visitor.VisitString(ignored, parentTags, parentIndexes, tag, vr,
-(ignored, parentTags, parentIndexes, tag, vr,
+Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions));
-Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions));
-if (action != ITagVisitor::Action_None)
-{
-LOG(WARNING) << "Cannot replace this string tag: "
-<< FromDcmtkBridge::GetTagName(element)
-<< " (" << tag.Format() << ")";
-}
 }
 }
 else
 {
-visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
+action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
 }
-return;
+if (action == ITagVisitor::Action_Replace)
+{
+LOG(WARNING) << "Iterator cannot replace this string tag: "
+<< FromDcmtkBridge::GetTagName(element)
+<< " (" << tag.Format() << ")";
+return true;
+}
+break;
 }
 /**
 * Numeric types
 **/
 {
 values.push_back(f);
 }
 }
-visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 case EVR_SS:  // signed short
 {
 {
 values.push_back(f);
 }
 }
-visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 case EVR_UL:  // unsigned long
 #if DCMTK_VERSION_NUMBER >= 362
 {
 values.push_back(f);
 }
 }
-visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 case EVR_US:  // unsigned short
 {
 {
 values.push_back(f);
 }
 }
-visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitIntegers(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 case EVR_FL:  // float single-precision
 case EVR_OF:
 {
 values.push_back(f);
 }
 }
-visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 case EVR_FD:  // float double-precision
 #if DCMTK_VERSION_NUMBER >= 361
 {
 values.push_back(f);
 }
 }
-visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
+action = visitor.VisitDoubles(parentTags, parentIndexes, tag, vr, values);
 break;
 }
 /**
 values.push_back(t);
 }
 }
 assert(vr == ValueRepresentation_AttributeTag);
-visitor.VisitAttributes(parentTags, parentIndexes, tag, values);
+action = visitor.VisitAttributes(parentTags, parentIndexes, tag, values);
 break;
 }
 /**
 * "element.isLeaf()".
 **/
 case EVR_SQ:  // sequence of items
 {
-return;
+return true;
 }
 /**
 * Internal to DCMTK.
 case EVR_pixelSQ:  // used internally for pixel sequences in a compressed image
 case EVR_pixelItem:  // used internally for pixel items in a compressed image
 case EVR_PixelData:  // used internally for uncompressed pixeld data
 case EVR_OverlayData:  // used internally for overlay data
 {
-visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
+action = visitor.VisitNotSupported(parentTags, parentIndexes, tag, vr);
-return;
+break;
 }
 /**
 * Default case.
 **/
 default:
-return;
+return true;
+}
+switch (action)
+{
+case ITagVisitor::Action_None:
+return true;  // We're done
+case ITagVisitor::Action_Remove:
+return false;
+case ITagVisitor::Action_Replace:
+throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace non-string-like data");
+default:
+throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 }
 catch (boost::bad_lexical_cast&)
 {
-return;
+return true;
 }
 catch (std::bad_cast&)
 {
-return;
+return true;
 }
 }
-static void ApplyVisitorToElement(DcmElement& element,
+// Returns "true" iff the element must be kept. If "false" is
+// returned, the element will be removed.
+static bool ApplyVisitorToElement(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 Encoding encoding,
 bool hasCodeExtensions)
 DicomTag tag(FromDcmtkBridge::Convert(element.getTag()));
 if (element.isLeaf())
 {
-ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding, hasCodeExtensions);
+return ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding, hasCodeExtensions);
 }
 else
 {
 // "All subclasses of DcmElement except for DcmSequenceOfItems
 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
 // etc. are not." The following dynamic_cast is thus OK.
 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(element);
 if (sequence.card() == 0)
 {
-visitor.VisitEmptySequence(parentTags, parentIndexes, tag);
+ITagVisitor::Action action = visitor.VisitEmptySequence(parentTags, parentIndexes, tag);
+switch (action)
+{
+case ITagVisitor::Action_None:
+return true;
+case ITagVisitor::Action_Remove:
+return false;
+case ITagVisitor::Action_Replace:
+throw OrthancException(ErrorCode_NotImplemented, "Iterator cannot replace sequences");
+default:
+throw OrthancException(ErrorCode_ParameterOutOfRange);
+}
 }
 else
 {
 std::vector<DicomTag> tags = parentTags;
 std::vector<size_t> indexes = parentIndexes;
 {
 indexes.back() = static_cast<size_t>(i);
 DcmItem* child = sequence.getItem(i);
 ApplyVisitorToDataset(*child, visitor, tags, indexes, encoding, hasCodeExtensions);
 }
+return true;  // Keep
 }
 }
 }

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4734:b51c08bd5c38