Mercurial > hg > orthanc-webviewer

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use of ordered-slices
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 27 Nov 2015 21:39:41 +0100
parents 02f7a0400a91
children 2932473a9b19
comparison
equal deleted inserted replaced
98:745cc19aa32b 99:46ec13a1177c
40 const std::string& content) 40 const std::string& content)
41 { 41 {
42 Json::Value json; 42 Json::Value json;
43 Json::Reader reader; 43 Json::Reader reader;
44 if (!reader.parse(content, json) || 44 if (!reader.parse(content, json) ||
45 !json.isMember("SortedInstances")) 45 !json.isMember("Slices"))
46 { 46 {
47 return; 47 return;
48 } 48 }
49 49
50 const Json::Value& instances = json["SortedInstances"]; 50 const Json::Value& instances = json["Slices"];
51 if (instances.type() != Json::arrayValue) 51 if (instances.type() != Json::arrayValue)
52 { 52 {
53 return; 53 return;
54 } 54 }
55 55
74 } 74 }
75 75
76 std::string compression = path.substr(0, separator + 1); 76 std::string compression = path.substr(0, separator + 1);
77 std::string instanceId = path.substr(separator + 1); 77 std::string instanceId = path.substr(separator + 1);
78 78
79 instanceId = instanceId.substr(0, instanceId.find('_'));
80
79 Json::Value instance; 81 Json::Value instance;
80 if (!GetJsonFromOrthanc(instance, context_, "/instances/" + instanceId) || 82 if (!GetJsonFromOrthanc(instance, context_, "/instances/" + instanceId) ||
81 !instance.isMember("ParentSeries")) 83 !instance.isMember("ParentSeries"))
82 { 84 {
83 return; 85 return;
90 } 92 }
91 93
92 Json::Value series; 94 Json::Value series;
93 Json::Reader reader; 95 Json::Reader reader;
94 if (!reader.parse(tmp, series) || 96 if (!reader.parse(tmp, series) ||
95 !series.isMember("SortedInstances")) 97 !series.isMember("Slices"))
96 { 98 {
97 return; 99 return;
98 } 100 }
99 101
100 const Json::Value& instances = series["SortedInstances"]; 102 const Json::Value& instances = series["Slices"];
101 if (instances.type() != Json::arrayValue) 103 if (instances.type() != Json::arrayValue)
102 { 104 {
103 return; 105 return;
104 } 106 }
105 107