orthanc: Core/DicomParsing/FromDcmtkBridge.cpp comparison

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3217:cf8cbeb35f33

preliminary support of Korean character set

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 13 Feb 2019 17:46:12 +0100
parents	f6374c36a671
children	8ed445e94486

comparison

equal deleted inserted replaced

-:c9a71eb4edcf
+:cf8cbeb35f33
 locker->addEntry(entry.release());
 }
 }
-Encoding FromDcmtkBridge::DetectEncoding(DcmItem& dataset,
+Encoding FromDcmtkBridge::DetectEncoding(bool& hasCodeExtensions,
+DcmItem& dataset,
 Encoding defaultEncoding)
 {
-Encoding encoding = defaultEncoding;
+// http://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_C.12.html#sect_C.12.1.1.2
 OFString tmp;
-if (dataset.findAndGetOFString(DCM_SpecificCharacterSet, tmp).good())
+if (dataset.findAndGetOFStringArray(DCM_SpecificCharacterSet, tmp).good())
 {
-std::string characterSet = Toolbox::StripSpaces(std::string(tmp.c_str()));
+std::vector<std::string> tokens;
+Toolbox::TokenizeString(tokens, std::string(tmp.c_str()), '\\');
-if (characterSet.empty())
-{
+hasCodeExtensions = (tokens.size() > 1);
-// Empty specific character set tag: Use the default encoding
-}
+for (size_t i = 0; i < tokens.size(); i++)
-else if (GetDicomEncoding(encoding, characterSet.c_str()))
+{
-{
+std::string characterSet = Toolbox::StripSpaces(tokens[i]);
-// The specific character set is supported by the Orthanc core
-}
+if (!characterSet.empty())
-else
+{
-{
+Encoding encoding;
-LOG(WARNING) << "Value of Specific Character Set (0008,0005) is not supported: " << characterSet
-<< ", fallback to ASCII (remove all special characters)";
+if (GetDicomEncoding(encoding, characterSet.c_str()))
-encoding = Encoding_Ascii;
+{
+// The specific character set is supported by the Orthanc core
+return encoding;
+}
+else
+{
+LOG(WARNING) << "Value of Specific Character Set (0008,0005) is not supported: " << characterSet
+<< ", fallback to ASCII (remove all special characters)";
+return Encoding_Ascii;
+}
+}
 }
 }
 else
 {
-// No specific character set tag: Use the default encoding
+hasCodeExtensions = false;
 }
-return encoding;
+// No specific character set tag: Use the default encoding
+return defaultEncoding;
 }
 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target,
 DcmItem& dataset,
 unsigned int maxStringLength,
 Encoding defaultEncoding)
 {
 std::set<DicomTag> ignoreTagLength;
-Encoding encoding = DetectEncoding(dataset, defaultEncoding);
+bool hasCodeExtensions;
+Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
 target.Clear();
 for (unsigned long i = 0; i < dataset.card(); i++)
 {
 DcmElement* element = dataset.getElement(i);
 if (element && element->isLeaf())
 {
 target.SetValue(element->getTag().getGTag(),
 element->getTag().getETag(),
 ConvertLeafElement(*element, DicomToJsonFlags_Default,
-maxStringLength, encoding, ignoreTagLength));
+maxStringLength, encoding, hasCodeExtensions, ignoreTagLength));
 }
 }
 }
 DicomValue* FromDcmtkBridge::ConvertLeafElement(DcmElement& element,
 DicomToJsonFlags flags,
 unsigned int maxStringLength,
 Encoding encoding,
+bool hasCodeExtensions,
 const std::set<DicomTag>& ignoreTagLength)
 {
 if (!element.isLeaf())
 {
 // This function is only applicable to leaf elements
 return new DicomValue("", false);
 }
 else
 {
 std::string s(c);
-std::string utf8 = Toolbox::ConvertToUtf8(s, encoding);
+std::string utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
 if (maxStringLength != 0 &&
 utf8.size() > maxStringLength &&
 ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
 {
 DcmElement& element,
 DicomToJsonFormat format,
 DicomToJsonFlags flags,
 unsigned int maxStringLength,
 Encoding encoding,
+bool hasCodeExtensions,
 const std::set<DicomTag>& ignoreTagLength)
 {
 if (parent.type() == Json::nullValue)
 {
 parent = Json::objectValue;
 if (element.isLeaf())
 {
 // The "0" below lets "LeafValueToJson()" take care of "TooLong" values
 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement
-(element, flags, 0, encoding, ignoreTagLength));
+(element, flags, 0, encoding, hasCodeExtensions, ignoreTagLength));
 if (ignoreTagLength.find(GetTag(element)) == ignoreTagLength.end())
 {
 LeafValueToJson(target, *v, format, flags, maxStringLength);
 }
 for (unsigned long i = 0; i < sequence.card(); i++)
 {
 DcmItem* child = sequence.getItem(i);
 Json::Value& v = target.append(Json::objectValue);
-DatasetToJson(v, *child, format, flags, maxStringLength, encoding, ignoreTagLength);
+DatasetToJson(v, *child, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
 }
 }
 }
 DcmItem& item,
 DicomToJsonFormat format,
 DicomToJsonFlags flags,
 unsigned int maxStringLength,
 Encoding encoding,
+bool hasCodeExtensions,
 const std::set<DicomTag>& ignoreTagLength)
 {
 assert(parent.type() == Json::objectValue);
 for (unsigned long i = 0; i < item.card(); i++)
 continue;
 }
 }
 FromDcmtkBridge::ElementToJson(parent, *element, format, flags,
-maxStringLength, encoding, ignoreTagLength);
+maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
 }
 }
 void FromDcmtkBridge::ExtractDicomAsJson(Json::Value& target,
 DicomToJsonFlags flags,
 unsigned int maxStringLength,
 Encoding defaultEncoding,
 const std::set<DicomTag>& ignoreTagLength)
 {
-Encoding encoding = DetectEncoding(dataset, defaultEncoding);
+bool hasCodeExtensions;
+Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
 target = Json::objectValue;
-DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, ignoreTagLength);
+DatasetToJson(target, dataset, format, flags, maxStringLength, encoding, hasCodeExtensions, ignoreTagLength);
 }
 void FromDcmtkBridge::ExtractHeaderAsJson(Json::Value& target,
 DcmMetaInfo& dataset,
 DicomToJsonFlags flags,
 unsigned int maxStringLength)
 {
 std::set<DicomTag> ignoreTagLength;
 target = Json::objectValue;
-DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii, ignoreTagLength);
+DatasetToJson(target, dataset, format, flags, maxStringLength, Encoding_Ascii, false, ignoreTagLength);
 }
 static std::string GetTagNameInternal(DcmTag& tag)
 }
 void FromDcmtkBridge::ChangeStringEncoding(DcmItem& dataset,
 Encoding source,
+bool hasSourceCodeExtensions,
 Encoding target)
 {
 // Recursive exploration of a dataset to change the encoding of
 // each string-like element
 char *c = NULL;
 if (element->isaString() &&
 element->getString(c).good() &&
 c != NULL)
 {
-std::string a = Toolbox::ConvertToUtf8(c, source);
+std::string a = Toolbox::ConvertToUtf8(c, source, hasSourceCodeExtensions);
 std::string b = Toolbox::ConvertFromUtf8(a, target);
 element->putString(b.c_str());
 }
 }
 else
 // etc. are not." The following dynamic_cast is thus OK.
 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element);
 for (unsigned long j = 0; j < sequence.card(); j++)
 {
-ChangeStringEncoding(*sequence.getItem(j), source, target);
+ChangeStringEncoding(*sequence.getItem(j), source, hasSourceCodeExtensions, target);
 }
 }
 }
 }
 }
 // Forward declaration
 static void ApplyVisitorToElement(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
-Encoding encoding);
+Encoding encoding,
+bool hasCodeExtensions);
 static void ApplyVisitorToDataset(DcmItem& dataset,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
-Encoding encoding)
+Encoding encoding,
+bool hasCodeExtensions)
 {
 assert(parentTags.size() == parentIndexes.size());
 for (unsigned long i = 0; i < dataset.card(); i++)
 {
 {
 throw OrthancException(ErrorCode_InternalError);
 }
 else
 {
-ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding);
+ApplyVisitorToElement(*element, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
 }
 }
 }
 static void ApplyVisitorToLeaf(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
 const DicomTag& tag,
-Encoding encoding)
+Encoding encoding,
+bool hasCodeExtensions)
 {
 // TODO - Merge this function, that is more recent, with ConvertLeafElement()
 assert(element.isLeaf());
 std::string utf8;
 if (c != NULL)  // This case corresponds to the empty string
 {
 std::string s(c);
-utf8 = Toolbox::ConvertToUtf8(s, encoding);
+utf8 = Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions);
 }
 std::string newValue;
 ITagVisitor::Action action = visitor.VisitString
 (newValue, parentTags, parentIndexes, tag, vr, utf8);
 {
 std::string ignored;
 std::string s(reinterpret_cast<const char*>(data), l);
 ITagVisitor::Action action = visitor.VisitString
 (ignored, parentTags, parentIndexes, tag, vr,
-Toolbox::ConvertToUtf8(s, encoding));
+Toolbox::ConvertToUtf8(s, encoding, hasCodeExtensions));
 if (action != ITagVisitor::Action_None)
 {
 LOG(WARNING) << "Cannot replace this string tag: "
 << FromDcmtkBridge::GetTagName(element)
 static void ApplyVisitorToElement(DcmElement& element,
 ITagVisitor& visitor,
 const std::vector<DicomTag>& parentTags,
 const std::vector<size_t>& parentIndexes,
-Encoding encoding)
+Encoding encoding,
+bool hasCodeExtensions)
 {
 assert(parentTags.size() == parentIndexes.size());
 DicomTag tag(FromDcmtkBridge::Convert(element.getTag()));
 if (element.isLeaf())
 {
-ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding);
+ApplyVisitorToLeaf(element, visitor, parentTags, parentIndexes, tag, encoding, hasCodeExtensions);
 }
 else
 {
 // "All subclasses of DcmElement except for DcmSequenceOfItems
 // are leaf nodes, while DcmSequenceOfItems, DcmItem, DcmDataset
 for (unsigned long i = 0; i < sequence.card(); i++)
 {
 indexes.back() = static_cast<size_t>(i);
 DcmItem* child = sequence.getItem(i);
-ApplyVisitorToDataset(*child, visitor, tags, indexes, encoding);
+ApplyVisitorToDataset(*child, visitor, tags, indexes, encoding, hasCodeExtensions);
 }
 }
 }
 }
 ITagVisitor& visitor,
 Encoding defaultEncoding)
 {
 std::vector<DicomTag> parentTags;
 std::vector<size_t> parentIndexes;
-Encoding encoding = DetectEncoding(dataset, defaultEncoding);
+bool hasCodeExtensions;
-ApplyVisitorToDataset(dataset, visitor, parentTags, parentIndexes, encoding);
+Encoding encoding = DetectEncoding(hasCodeExtensions, dataset, defaultEncoding);
+ApplyVisitorToDataset(dataset, visitor, parentTags, parentIndexes, encoding, hasCodeExtensions);
 }
 }

Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3217:cf8cbeb35f33