diff OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp @ 4297:785a2713323e

abi continued
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 05 Nov 2020 17:20:49 +0100
parents 7112a8af0b63
children 50b0c69b653a
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp	Thu Nov 05 15:52:28 2020 +0100
+++ b/OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.cpp	Thu Nov 05 17:20:49 2020 +0100
@@ -336,6 +336,27 @@
     }
   }
 
+  DicomWebJsonVisitor::DicomWebJsonVisitor() :
+    formatter_(NULL)
+  {
+    Clear();
+  }
+
+  void DicomWebJsonVisitor::SetFormatter(DicomWebJsonVisitor::IBinaryFormatter &formatter)
+  {
+    formatter_ = &formatter;
+  }
+
+  void DicomWebJsonVisitor::Clear()
+  {
+    result_ = Json::objectValue;
+  }
+
+  const Json::Value &DicomWebJsonVisitor::GetResult() const
+  {
+    return result_;
+  }
+
 
 #if ORTHANC_ENABLE_PUGIXML == 1
   void DicomWebJsonVisitor::FormatXml(std::string& target) const
@@ -347,6 +368,14 @@
 #endif
 
 
+  void DicomWebJsonVisitor::VisitNotSupported(const std::vector<DicomTag> &parentTags,
+                                              const std::vector<size_t> &parentIndexes,
+                                              const DicomTag &tag,
+                                              ValueRepresentation vr)
+  {
+  }
+
+
   void DicomWebJsonVisitor::VisitEmptySequence(const std::vector<DicomTag>& parentTags,
                                                const std::vector<size_t>& parentIndexes,
                                                const DicomTag& tag)
@@ -597,7 +626,7 @@
                    * https://groups.google.com/d/msg/orthanc-users/T32FovWPcCE/-hKFbfRJBgAJ
                    **/
 
-                  std::string t = Orthanc::Toolbox::StripSpaces(tokens[i]);
+                  std::string t = Toolbox::StripSpaces(tokens[i]);
                   if (t.empty())
                   {
                     node[KEY_VALUE].append(Json::nullValue);
@@ -613,7 +642,7 @@
               
                 case ValueRepresentation_DecimalString:
                 {
-                  std::string t = Orthanc::Toolbox::StripSpaces(tokens[i]);
+                  std::string t = Toolbox::StripSpaces(tokens[i]);
                   if (t.empty())
                   {
                     node[KEY_VALUE].append(Json::nullValue);