Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp @ 4140:0ddc5297a8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a4f28efdfccf
children 7112a8af0b63
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp	Thu Aug 06 18:25:47 2020 +0200
+++ b/OrthancFramework/Sources/DicomParsing/ParsedDicomFile.cpp	Fri Aug 07 10:46:50 2020 +0200
@@ -1428,8 +1428,7 @@
   {
     std::set<DicomTag> ignoreTagLength;
     FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(),
-                                        format, flags, maxStringLength,
-                                        GetDefaultDicomEncoding(), ignoreTagLength);
+                                        format, flags, maxStringLength, ignoreTagLength);
   }
 
 
@@ -1440,22 +1439,7 @@
                                       const std::set<DicomTag>& ignoreTagLength)
   {
     FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(),
-                                        format, flags, maxStringLength,
-                                        GetDefaultDicomEncoding(), ignoreTagLength);
-  }
-
-
-  void ParsedDicomFile::DatasetToJson(Json::Value& target,
-                                      const std::set<DicomTag>& ignoreTagLength)
-  {
-    FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), ignoreTagLength);
-  }
-
-
-  void ParsedDicomFile::DatasetToJson(Json::Value& target)
-  {
-    const std::set<DicomTag> ignoreTagLength;
-    FromDcmtkBridge::ExtractDicomAsJson(target, *GetDcmtkObject().getDataset(), ignoreTagLength);
+                                        format, flags, maxStringLength, ignoreTagLength);
   }