Mercurial > hg > orthanc

diff 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
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomFormat/DicomMap.h	Mon Jun 27 10:48:46 2022 +0200
+++ b/OrthancFramework/Sources/DicomFormat/DicomMap.h	Mon Jun 27 12:39:51 2022 +0200
@@ -164,7 +164,7 @@
 
     // adds a main dicom tag to the definition of main dicom tags for each level.
     // this should be done once at startup before you use MainDicomTags methods
-    static void AddMainDicomTag(const DicomTag& tag, const std::string& name, ResourceType level);
+    static void AddMainDicomTag(const DicomTag& tag, ResourceType level);
 
     void GetTags(std::set<DicomTag>& tags) const;
 
@@ -207,7 +207,8 @@
     bool ParseDouble(double& result,
                      const DicomTag& tag) const;
 
-    void FromDicomAsJson(const Json::Value& dicomAsJson);
+    void FromDicomAsJson(const Json::Value& dicomAsJson, 
+                         bool append = false);
 
     void Merge(const DicomMap& other);
 
@@ -233,9 +234,6 @@
     void DumpMainDicomTags(Json::Value& target,
                            ResourceType level) const;
 
-    void ParseMainDicomTags(const Json::Value& source,
-                            ResourceType level);
-
     void Print(FILE* fp) const;  // For debugging only
   };
 }