diff Plugin/ViewerPrefetchPolicy.cpp @ 99:46ec13a1177c refactoring

use of ordered-slices
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 27 Nov 2015 21:39:41 +0100
parents 02f7a0400a91
children 2932473a9b19
line wrap: on
line diff
--- a/Plugin/ViewerPrefetchPolicy.cpp	Fri Nov 27 18:30:46 2015 +0100
+++ b/Plugin/ViewerPrefetchPolicy.cpp	Fri Nov 27 21:39:41 2015 +0100
@@ -42,12 +42,12 @@
     Json::Value json;
     Json::Reader reader;
     if (!reader.parse(content, json) ||
-        !json.isMember("SortedInstances"))
+        !json.isMember("Slices"))
     {
       return;
     }
 
-    const Json::Value& instances = json["SortedInstances"];
+    const Json::Value& instances = json["Slices"];
     if (instances.type() != Json::arrayValue)
     {
       return;
@@ -76,6 +76,8 @@
     std::string compression = path.substr(0, separator + 1);
     std::string instanceId = path.substr(separator + 1);
 
+    instanceId = instanceId.substr(0, instanceId.find('_'));
+
     Json::Value instance;
     if (!GetJsonFromOrthanc(instance, context_, "/instances/" + instanceId) ||
         !instance.isMember("ParentSeries"))
@@ -92,12 +94,12 @@
     Json::Value series;
     Json::Reader reader;
     if (!reader.parse(tmp, series) ||
-        !series.isMember("SortedInstances"))
+        !series.isMember("Slices"))
     {
       return;
     }
 
-    const Json::Value& instances = series["SortedInstances"];
+    const Json::Value& instances = series["Slices"];
     if (instances.type() != Json::arrayValue)
     {
       return;