Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomFormat/DicomMap.h @ 5040:1c08cd68250a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed the 'name' of MainDicomTags to simplify code -> DicomMap::ParseMainDicomTags has been deprecated and one should use DicomMap::FromDicomAsJson on 'full' formatted tags
author Alain Mazy <am@osimis.io>
date Mon, 27 Jun 2022 12:39:51 +0200
parents f8bea9c1c0fc
children 6fed78e13233
comparison
equal deleted inserted replaced
5039:28db9663fc2d 5040:1c08cd68250a
162 162
163 static const std::set<DicomTag>& GetAllMainDicomTags(); 163 static const std::set<DicomTag>& GetAllMainDicomTags();
164 164
165 // adds a main dicom tag to the definition of main dicom tags for each level. 165 // adds a main dicom tag to the definition of main dicom tags for each level.
166 // this should be done once at startup before you use MainDicomTags methods 166 // this should be done once at startup before you use MainDicomTags methods
167 static void AddMainDicomTag(const DicomTag& tag, const std::string& name, ResourceType level); 167 static void AddMainDicomTag(const DicomTag& tag, ResourceType level);
168 168
169 void GetTags(std::set<DicomTag>& tags) const; 169 void GetTags(std::set<DicomTag>& tags) const;
170 170
171 static bool IsDicomFile(const void* dicom, 171 static bool IsDicomFile(const void* dicom,
172 size_t size); 172 size_t size);
205 const DicomTag& tag) const; 205 const DicomTag& tag) const;
206 206
207 bool ParseDouble(double& result, 207 bool ParseDouble(double& result,
208 const DicomTag& tag) const; 208 const DicomTag& tag) const;
209 209
210 void FromDicomAsJson(const Json::Value& dicomAsJson); 210 void FromDicomAsJson(const Json::Value& dicomAsJson,
211 bool append = false);
211 212
212 void Merge(const DicomMap& other); 213 void Merge(const DicomMap& other);
213 214
214 void MergeMainDicomTags(const DicomMap& other, 215 void MergeMainDicomTags(const DicomMap& other,
215 ResourceType level); 216 ResourceType level);
231 void RemoveBinaryTags(); 232 void RemoveBinaryTags();
232 233
233 void DumpMainDicomTags(Json::Value& target, 234 void DumpMainDicomTags(Json::Value& target,
234 ResourceType level) const; 235 ResourceType level) const;
235 236
236 void ParseMainDicomTags(const Json::Value& source,
237 ResourceType level);
238
239 void Print(FILE* fp) const; // For debugging only 237 void Print(FILE* fp) const; // For debugging only
240 }; 238 };
241 } 239 }