diff Core/DicomNetworking/RemoteModalityParameters.cpp @ 2659:c27f7ecf9b54 jobs

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 07 Jun 2018 12:24:17 +0200
parents c196d76cb8fa
children 73bc0c32547c
line wrap: on
line diff
--- a/Core/DicomNetworking/RemoteModalityParameters.cpp	Wed Jun 06 18:37:43 2018 +0200
+++ b/Core/DicomNetworking/RemoteModalityParameters.cpp	Thu Jun 07 12:24:17 2018 +0200
@@ -36,6 +36,7 @@
 
 #include "../Logging.h"
 #include "../OrthancException.h"
+#include "../SerializationToolbox.h"
 
 #include <boost/lexical_cast.hpp>
 #include <stdexcept>
@@ -130,12 +131,21 @@
   
   void RemoteModalityParameters::Serialize(Json::Value& target) const
   {
-    throw OrthancException(ErrorCode_NotImplemented);
+    target = Json::objectValue;
+    target["AET"] = aet_;
+    target["Host"] = host_;
+    target["Port"] = port_;
+    target["Manufacturer"] = EnumerationToString(manufacturer_);
   }
 
   
   RemoteModalityParameters::RemoteModalityParameters(const Json::Value& serialized)
   {
-    throw OrthancException(ErrorCode_NotImplemented);
+    aet_ = SerializationToolbox::ReadString(serialized, "AET");
+    host_ = SerializationToolbox::ReadString(serialized, "Host");
+    port_ = static_cast<uint16_t>
+      (SerializationToolbox::ReadUnsignedInteger(serialized, "Port"));
+    manufacturer_ = StringToModalityManufacturer
+      (SerializationToolbox::ReadString(serialized, "Manufacturer"));
   }
 }