diff OrthancServer/ParsedDicomFile.cpp @ 1686:14a32b2fa63e

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 07 Oct 2015 13:57:26 +0200
parents 09be34b2f30e
children 26083d84d237
line wrap: on
line diff
--- a/OrthancServer/ParsedDicomFile.cpp	Wed Oct 07 10:13:42 2015 +0200
+++ b/OrthancServer/ParsedDicomFile.cpp	Wed Oct 07 13:57:26 2015 +0200
@@ -1364,18 +1364,11 @@
     Replace(DICOM_TAG_SPECIFIC_CHARACTER_SET, s, DicomReplaceMode_InsertIfAbsent);
   }
 
-  void ParsedDicomFile::ToJson(Json::Value& target, bool simplify)
+  void ParsedDicomFile::ToJson(Json::Value& target, 
+                               DicomToJsonFormat format,
+                               unsigned int maxStringLength)
   {
-    if (simplify)
-    {
-      Json::Value tmp;
-      FromDcmtkBridge::ToJson(tmp, *pimpl_->file_->getDataset());
-      SimplifyTags(target, tmp);
-    }
-    else
-    {
-      FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset());
-    }
+    FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(), format, maxStringLength);
   }