diff Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp @ 2621:83ac5a05ce84 jobs

primitives for unserializing jobs
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 May 2018 17:37:16 +0200
parents 1232922c8793
children e1893d31652a
line wrap: on
line diff
--- a/Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Tue May 22 14:08:57 2018 +0200
+++ b/Core/JobsEngine/Operations/SequenceOfOperationsJob.cpp	Tue May 22 17:37:16 2018 +0200
@@ -365,12 +365,17 @@
   {
     boost::mutex::scoped_lock lock(mutex_);
 
-    value = Json::arrayValue;
+    Json::Value tmp = Json::arrayValue;
     for (size_t i = 0; i < operations_.size(); i++)
     {
       Json::Value operation = Json::objectValue;
       operations_[i]->Serialize(operation);
-      value.append(operation);
+      tmp.append(operation);
     }
+
+    value["Operations"] = tmp;
+    value["TrailingTimeout"] = static_cast<unsigned int>(trailingTimeout_.total_milliseconds());
+    value["DicomTimeout"] = connectionManager_.GetTimeout();
+    value["Current"] = static_cast<unsigned int>(current_);
   }
 }