Mercurial > hg > orthanc

diff OrthancServer/FromDcmtkBridge.h @ 2128:9329ba17a069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Possibility to DELETE "dicom-as-json" attachments to reconstruct them
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Nov 2016 15:13:16 +0100
parents 03b065778fc3
children bb199bccdc45
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h	Mon Nov 07 13:59:36 2016 +0100
+++ b/OrthancServer/FromDcmtkBridge.h	Mon Nov 07 15:13:16 2016 +0100
@@ -57,6 +57,8 @@
     FRIEND_TEST(FromDcmtkBridge, FromJson);
 #endif
 
+    friend class ParsedDicomFile;
+
   private:
     FromDcmtkBridge();  // Pure static class
 
@@ -79,6 +81,12 @@
                               unsigned int maxStringLength,
                               Encoding dicomEncoding);
 
+    static void ExtractDicomAsJson(Json::Value& target, 
+                                   DcmDataset& dataset,
+                                   DicomToJsonFormat format,
+                                   DicomToJsonFlags flags,
+                                   unsigned int maxStringLength);
+
   public:
     static void InitializeDictionary();
 
@@ -110,10 +118,10 @@
                                           Encoding encoding);
 
     static void ExtractDicomAsJson(Json::Value& target, 
-                                   DcmDataset& dataset,
-                                   DicomToJsonFormat format,
-                                   DicomToJsonFlags flags,
-                                   unsigned int maxStringLength);
+                                   DcmDataset& dataset)
+    {
+      ExtractDicomAsJson(target, dataset, DicomToJsonFormat_Full, DicomToJsonFlags_Default, ORTHANC_MAXIMUM_TAG_LENGTH);
+    }
 
     static void ExtractHeaderAsJson(Json::Value& target, 
                                     DcmMetaInfo& header,