Mercurial > hg > orthanc

diff OrthancServer/FromDcmtkBridge.h @ 2115:a657f7772e69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handling of private tags/creators in the "Dictionary" configuration option
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 31 Oct 2016 15:23:32 +0100
parents 6301bbcbcaed
children b9bd52c72ba2
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h	Thu Oct 27 12:37:30 2016 +0200
+++ b/OrthancServer/FromDcmtkBridge.h	Mon Oct 31 15:23:32 2016 +0100
@@ -34,6 +34,7 @@
 
 #include "ServerEnumerations.h"
 
+#include "../Core/DicomFormat/DicomElement.h"
 #include "../Core/DicomFormat/DicomMap.h"
 
 #include <dcmtk/dcmdata/dcdatset.h>
@@ -53,7 +54,8 @@
                                       ValueRepresentation vr,
                                       const std::string& name,
                                       unsigned int minMultiplicity,
-                                      unsigned int maxMultiplicity);
+                                      unsigned int maxMultiplicity,
+                                      const std::string& privateCreator);
 
     static Encoding DetectEncoding(DcmItem& dataset,
                                    Encoding defaultEncoding);
@@ -94,7 +96,15 @@
                        DicomToJsonFlags flags,
                        unsigned int maxStringLength);
 
-    static std::string GetName(const DicomTag& tag);
+    static std::string GetTagName(const DicomTag& tag,
+                                  const std::string& privateCreator);
+
+    static std::string GetTagName(const DcmElement& element);
+
+    static std::string GetTagName(const DicomElement& element)
+    {
+      return GetTagName(element.GetTag(), "");
+    }
 
     static DicomTag ParseTag(const char* name);