diff OrthancServer/Sources/OrthancConfiguration.cpp @ 4140:0ddc5297a8ab

centralization of default parameters for JSON/DicomMap conversions from DCMTK
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Aug 2020 10:46:50 +0200
parents 05b8fd21089c
children b3c5418109a9
line wrap: on
line diff
--- a/OrthancServer/Sources/OrthancConfiguration.cpp	Thu Aug 06 18:25:47 2020 +0200
+++ b/OrthancServer/Sources/OrthancConfiguration.cpp	Fri Aug 07 10:46:50 2020 +0200
@@ -34,6 +34,7 @@
 #include "PrecompiledHeadersServer.h"
 #include "OrthancConfiguration.h"
 
+#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
 #include "../../OrthancFramework/Sources/HttpServer/HttpServer.h"
 #include "../../OrthancFramework/Sources/Logging.h"
 #include "../../OrthancFramework/Sources/OrthancException.h"
@@ -896,4 +897,37 @@
     // New configuration option in Orthanc 1.6.0
     return GetStringParameter("DefaultPrivateCreator", "");
   }
+
+
+  void OrthancConfiguration::DefaultExtractDicomSummary(DicomMap& target,
+                                                        ParsedDicomFile& dicom)
+  {
+    std::set<DicomTag> ignoreTagLength;
+    dicom.ExtractDicomSummary(target, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
+  }
+  
+    
+  void OrthancConfiguration::DefaultDicomDatasetToJson(Json::Value& target,
+                                                       ParsedDicomFile& dicom)
+  {
+    std::set<DicomTag> ignoreTagLength;
+    DefaultDicomDatasetToJson(target, dicom, ignoreTagLength);
+  }
+  
+    
+  void OrthancConfiguration::DefaultDicomDatasetToJson(Json::Value& target,
+                                                       ParsedDicomFile& dicom,
+                                                       const std::set<DicomTag>& ignoreTagLength)
+  {
+    dicom.DatasetToJson(target, DicomToJsonFormat_Full, DicomToJsonFlags_Default, 
+                        ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
+  }
+  
+
+  void OrthancConfiguration::DefaultDicomHeaderToJson(Json::Value& target,
+                                                      ParsedDicomFile& dicom)
+  {
+    std::set<DicomTag> ignoreTagLength;
+    dicom.HeaderToJson(target, DicomToJsonFormat_Full);
+  }
 }