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

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4527:31f940334496

Handle public tags with "UN" value representation and containing a string (cf. DICOM CP 246)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 24 Feb 2021 12:39:35 +0100
parents	671ee7c1fd46
children	93a51d228d80

comparison

equal deleted inserted replaced

-:59b667dd58a8
+:31f940334496
 {
 return DicomTag(element.getGTag(), element.getETag());
 }
+static DicomValue* CreateValueFromUtf8String(const DicomTag& tag,
+const std::string& utf8,
+unsigned int maxStringLength,
+const std::set<DicomTag>& ignoreTagLength)
+{
+if (maxStringLength != 0 &&
+utf8.size() > maxStringLength &&
+ignoreTagLength.find(tag) == ignoreTagLength.end())
+{
+return new DicomValue;  // Too long, create a NULL value
+}
+else
+{
+return new DicomValue(utf8, false);
+}
+}
 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
 DicomToJsonFlags flags,
 unsigned int maxStringLength,
 Encoding encoding,
 bool hasCodeExtensions,
 {
 // This function is only applicable to leaf elements
 throw OrthancException(ErrorCode_BadParameterType);
 }
-char *c = NULL;
+{
-if (element.isaString() &&
+char *c = NULL;
-element.getString(c).good())
+if (element.isaString() &&
-{
+element.getString(c).good())
-if (c == NULL)  // This case corresponds to the empty string
+{
-{
+if (c == NULL)  // This case corresponds to the empty string
-return new DicomValue("", false);
+{
-}
+return new DicomValue("", false);
-else
-{
-std::string s(c);
-std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
-if (maxStringLength != 0 &&
-utf8.size() > maxStringLength &&
-ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
-{
-return new DicomValue;  // Too long, create a NULL value
 }
 else
 {
-return new DicomValue(utf8, false);
+const std::string s(c);
+const std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
+return CreateValueFromUtf8String(GetTag(element), utf8, maxStringLength, ignoreTagLength);
 }
 }
 }
 if (element.getVR() == EVR_UN)
 {
-// Unknown value representation: Lookup in the dictionary. This
+/**
-// is notably the case for private tags registered with the
+* Unknown value representation: Lookup in the dictionary. This
-// "Dictionary" configuration option.
+* is notably the case for private tags registered with the
+* "Dictionary" configuration option, or for public tags with
+* "EVR_UN" in the case of Little Endian Implicit transfer
+* syntax (cf. DICOM CP 246).
+* ftp://medical.nema.org/medical/dicom/final/cp246_ft.pdf
+**/
 DictionaryLocker locker;
 const DcmDictEntry* entry = locker->findEntry(element.getTag().getXTag(),
 element.getTag().getPrivateCreator());
 if (entry != NULL &&
 entry->getVR().isaString())
 {
 Uint8* data = NULL;
-// At (*), we do not try and convert to UTF-8, as nothing says
+if (element.getUint8Array(data) == EC_Normal)
-// the encoding of the private tag is the same as that of the
+{
-// remaining of the DICOM dataset. Only go for ASCII strings.
+Uint32 length = element.getLength();
-if (element.getUint8Array(data) == EC_Normal &&
+if (data == NULL ||
-Toolbox::IsAsciiString(data, element.getLength()))   // (*)
+length == 0)
-{
-if (data == NULL)
 {
 return new DicomValue("", false);   // Empty string
 }
-else if (maxStringLength != 0 &&
-element.getLength() > maxStringLength &&
+// Remove the trailing padding, if any
-ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
+if (length > 0 &&
+length % 2 == 0 &&
+data[length - 1] == '\0')
 {
-return new DicomValue;  // Too long, create a NULL value
+length = length - 1;
+}
+if (element.getTag().isPrivate())
+{
+// For private tags, we do not try and convert to UTF-8,
+// as nothing ensures that the encoding of the private tag
+// is the same as that of the remaining of the DICOM
+// dataset. Only go for ASCII strings.
+if (Toolbox::IsAsciiString(data, length))
+{
+const std::string s(reinterpret_cast<const char*>(data), length);
+return CreateValueFromUtf8String(GetTag(element), s, maxStringLength, ignoreTagLength);
+}
+else
+{
+// Not a plain ASCII string: Consider it as a binary
+// value that is handled in the switch-case below
+}
 }
 else
 {
-std::string s(reinterpret_cast<const char*>(data), element.getLength());
+// For public tags, convert to UTF-8 by using the
-return new DicomValue(s, false);
+// "SpecificCharacterSet" tag, if present. This branch is
+// new in Orthanc 1.9.1 (cf. DICOM CP 246).
+const std::string s(reinterpret_cast<const char*>(data), length);
+const std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
+return CreateValueFromUtf8String(GetTag(element), utf8, maxStringLength, ignoreTagLength);
 }
 }
 }
 }

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4527:31f940334496