Mercurial > hg > orthanc

diff Core/DicomFormat/DicomMap.h @ 3006:0e1755e5efd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DicomMap::ExtractMainDicomTags()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 13 Dec 2018 12:37:10 +0100
parents 8265a6b56100
children abe49ca61cd5
line wrap: on
line diff
--- a/Core/DicomFormat/DicomMap.h	Wed Dec 12 15:42:33 2018 +0100
+++ b/Core/DicomFormat/DicomMap.h	Thu Dec 13 12:37:10 2018 +0100
@@ -59,7 +59,7 @@
                   uint16_t element, 
                   DicomValue* value);
 
-    void SetValue(DicomTag tag, 
+    void SetValue(DicomTag tag,
                   DicomValue* value);
 
     void ExtractTags(DicomMap& source,
@@ -68,6 +68,9 @@
    
     static void GetMainDicomTagsInternal(std::set<DicomTag>& result, ResourceType level);
 
+    void ExtractMainDicomTagsInternal(const DicomMap& other,
+                                      ResourceType level);
+
   public:
     DicomMap()
     {
@@ -218,6 +221,10 @@
                      const DicomTag& tag) const;
 
     void FromDicomAsJson(const Json::Value& dicomAsJson);
+
+    void Merge(const DicomMap& other);
+
+    void ExtractMainDicomTags(const DicomMap& other); 
     
     void Serialize(Json::Value& target) const;