comparison Core/DicomFormat/DicomMap.h @ 3681:9dac85e807c2 storage-commitment

integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Feb 2020 20:36:47 +0100
parents 26c6d47467a9
children a9ce35d67c3c
comparison
equal deleted inserted replaced
3675:340bdcc298e9 3681:9dac85e807c2
61 DicomValue* value); 61 DicomValue* value);
62 62
63 static void GetMainDicomTagsInternal(std::set<DicomTag>& result, 63 static void GetMainDicomTagsInternal(std::set<DicomTag>& result,
64 ResourceType level); 64 ResourceType level);
65 65
66 void ExtractMainDicomTagsInternal(const DicomMap& other,
67 ResourceType level);
68
69 public: 66 public:
70 DicomMap() 67 DicomMap()
71 { 68 {
72 } 69 }
73 70
213 210
214 void FromDicomAsJson(const Json::Value& dicomAsJson); 211 void FromDicomAsJson(const Json::Value& dicomAsJson);
215 212
216 void Merge(const DicomMap& other); 213 void Merge(const DicomMap& other);
217 214
215 void MergeMainDicomTags(const DicomMap& other,
216 ResourceType level);
217
218 void ExtractMainDicomTags(const DicomMap& other); 218 void ExtractMainDicomTags(const DicomMap& other);
219 219
220 bool HasOnlyMainDicomTags() const; 220 bool HasOnlyMainDicomTags() const;
221 221
222 void Serialize(Json::Value& target) const; 222 void Serialize(Json::Value& target) const;