Mercurial > hg > orthanc
comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp @ 4297:785a2713323e
abi continued
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 05 Nov 2020 17:20:49 +0100 |
parents | 7112a8af0b63 |
children | 91554aecff9a |
comparison
equal
deleted
inserted
replaced
4296:3b70a2e6a06c | 4297:785a2713323e |
---|---|
465 // No specific character set tag: Use the default encoding | 465 // No specific character set tag: Use the default encoding |
466 return defaultEncoding; | 466 return defaultEncoding; |
467 } | 467 } |
468 | 468 |
469 | 469 |
470 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, | 470 Encoding FromDcmtkBridge::DetectEncoding(DcmItem &dataset, |
471 Encoding defaultEncoding) | |
472 { | |
473 bool hasCodeExtensions; // ignored | |
474 return DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); | |
475 } | |
476 | |
477 | |
478 void FromDcmtkBridge::ExtractDicomSummary(DicomMap& target, | |
471 DcmItem& dataset, | 479 DcmItem& dataset, |
472 unsigned int maxStringLength, | 480 unsigned int maxStringLength, |
473 const std::set<DicomTag>& ignoreTagLength) | 481 const std::set<DicomTag>& ignoreTagLength) |
474 { | 482 { |
475 const Encoding defaultEncoding = GetDefaultDicomEncoding(); | 483 const Encoding defaultEncoding = GetDefaultDicomEncoding(); |
1067 DcmTag tag(element.getTag()); | 1075 DcmTag tag(element.getTag()); |
1068 | 1076 |
1069 return GetTagNameInternal(tag); | 1077 return GetTagNameInternal(tag); |
1070 } | 1078 } |
1071 | 1079 |
1080 std::string FromDcmtkBridge::GetTagName(const DicomElement &element) | |
1081 { | |
1082 return GetTagName(element.GetTag(), ""); | |
1083 } | |
1084 | |
1072 | 1085 |
1073 | 1086 |
1074 DicomTag FromDcmtkBridge::ParseTag(const char* name) | 1087 DicomTag FromDcmtkBridge::ParseTag(const char* name) |
1075 { | 1088 { |
1076 DicomTag parsed(0, 0); | 1089 DicomTag parsed(0, 0); |
1105 { | 1118 { |
1106 LOG(INFO) << "Unknown DICOM tag: \"" << name << "\""; | 1119 LOG(INFO) << "Unknown DICOM tag: \"" << name << "\""; |
1107 throw OrthancException(ErrorCode_UnknownDicomTag); | 1120 throw OrthancException(ErrorCode_UnknownDicomTag); |
1108 } | 1121 } |
1109 #endif | 1122 #endif |
1123 } | |
1124 | |
1125 DicomTag FromDcmtkBridge::ParseTag(const std::string &name) | |
1126 { | |
1127 return ParseTag(name.c_str()); | |
1128 } | |
1129 | |
1130 bool FromDcmtkBridge::HasTag(const DicomMap &fields, const std::string &tagName) | |
1131 { | |
1132 return fields.HasTag(ParseTag(tagName)); | |
1133 } | |
1134 | |
1135 const DicomValue &FromDcmtkBridge::GetValue(const DicomMap &fields, | |
1136 const std::string &tagName) | |
1137 { | |
1138 return fields.GetValue(ParseTag(tagName)); | |
1139 } | |
1140 | |
1141 void FromDcmtkBridge::SetValue(DicomMap &target, | |
1142 const std::string &tagName, | |
1143 DicomValue *value) | |
1144 { | |
1145 const DicomTag tag = ParseTag(tagName); | |
1146 target.SetValueInternal(tag.GetGroup(), tag.GetElement(), value); | |
1110 } | 1147 } |
1111 | 1148 |
1112 | 1149 |
1113 bool FromDcmtkBridge::IsUnknownTag(const DicomTag& tag) | 1150 bool FromDcmtkBridge::IsUnknownTag(const DicomTag& tag) |
1114 { | 1151 { |