Mercurial > hg > orthanc
comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h @ 4297:785a2713323e
abi continued
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 05 Nov 2020 17:20:49 +0100 |
parents | 0ddc5297a8ab |
children | b2366bc023f8 |
comparison
equal
deleted
inserted
replaced
4296:3b70a2e6a06c | 4297:785a2713323e |
---|---|
97 | 97 |
98 static Encoding DetectEncoding(bool& hasCodeExtensions, | 98 static Encoding DetectEncoding(bool& hasCodeExtensions, |
99 DcmItem& dataset, | 99 DcmItem& dataset, |
100 Encoding defaultEncoding); | 100 Encoding defaultEncoding); |
101 | 101 |
102 // Compatibility wrapper for Orthanc <= 1.5.4 | |
102 static Encoding DetectEncoding(DcmItem& dataset, | 103 static Encoding DetectEncoding(DcmItem& dataset, |
103 Encoding defaultEncoding) | 104 Encoding defaultEncoding); |
104 { | |
105 // Compatibility wrapper for Orthanc <= 1.5.4 | |
106 bool hasCodeExtensions; // ignored | |
107 return DetectEncoding(hasCodeExtensions, dataset, defaultEncoding); | |
108 } | |
109 | 105 |
110 static DicomTag Convert(const DcmTag& tag); | 106 static DicomTag Convert(const DcmTag& tag); |
111 | 107 |
112 static DicomTag GetTag(const DcmElement& element); | 108 static DicomTag GetTag(const DcmElement& element); |
113 | 109 |
129 static std::string GetTagName(const DicomTag& tag, | 125 static std::string GetTagName(const DicomTag& tag, |
130 const std::string& privateCreator); | 126 const std::string& privateCreator); |
131 | 127 |
132 static std::string GetTagName(const DcmElement& element); | 128 static std::string GetTagName(const DcmElement& element); |
133 | 129 |
134 static std::string GetTagName(const DicomElement& element) | 130 static std::string GetTagName(const DicomElement& element); |
135 { | |
136 return GetTagName(element.GetTag(), ""); | |
137 } | |
138 | 131 |
139 static DicomTag ParseTag(const char* name); | 132 static DicomTag ParseTag(const char* name); |
140 | 133 |
141 static DicomTag ParseTag(const std::string& name) | 134 static DicomTag ParseTag(const std::string& name); |
142 { | |
143 return ParseTag(name.c_str()); | |
144 } | |
145 | 135 |
146 static bool HasTag(const DicomMap& fields, | 136 static bool HasTag(const DicomMap& fields, |
147 const std::string& tagName) | 137 const std::string& tagName); |
148 { | |
149 return fields.HasTag(ParseTag(tagName)); | |
150 } | |
151 | 138 |
152 static const DicomValue& GetValue(const DicomMap& fields, | 139 static const DicomValue& GetValue(const DicomMap& fields, |
153 const std::string& tagName) | 140 const std::string& tagName); |
154 { | |
155 return fields.GetValue(ParseTag(tagName)); | |
156 } | |
157 | 141 |
158 static void SetValue(DicomMap& target, | 142 static void SetValue(DicomMap& target, |
159 const std::string& tagName, | 143 const std::string& tagName, |
160 DicomValue* value) | 144 DicomValue* value); |
161 { | |
162 const DicomTag tag = ParseTag(tagName); | |
163 target.SetValueInternal(tag.GetGroup(), tag.GetElement(), value); | |
164 } | |
165 | 145 |
166 static void ToJson(Json::Value& result, | 146 static void ToJson(Json::Value& result, |
167 const DicomMap& values, | 147 const DicomMap& values, |
168 bool simplify); | 148 bool simplify); |
169 | 149 |