Mercurial > hg > orthanc-webviewer
annotate Plugin/ViewerPrefetchPolicy.cpp @ 292:aadbffcee805
remove calls to deprecated classes of JsonCpp
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 22 Dec 2020 09:03:24 +0100 |
| parents | aee499712ac4 |
| children | e376158e2dbb |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 122 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
| 0 | 4 * Department, University Hospital of Liege, Belgium |
|
226
aee499712ac4
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "ViewerPrefetchPolicy.h" | |
| 23 | |
| 24 #include "ViewerToolbox.h" | |
| 25 #include "Cache/CacheScheduler.h" | |
| 26 | |
|
292
aadbffcee805
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
27 #include <Toolbox.h> |
| 0 | 28 |
| 29 | |
| 30 static const Json::Value::ArrayIndex PREFETCH_FORWARD = 10; | |
| 31 static const Json::Value::ArrayIndex PREFETCH_BACKWARD = 3; | |
| 32 | |
| 33 | |
| 34 namespace OrthancPlugins | |
| 35 { | |
| 36 void ViewerPrefetchPolicy::ApplySeries(std::list<CacheIndex>& toPrefetch, | |
| 37 CacheScheduler& cache, | |
| 38 const std::string& series, | |
| 39 const std::string& content) | |
| 40 { | |
| 41 Json::Value json; | |
|
292
aadbffcee805
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
42 if (!Orthanc::Toolbox::ReadJson(json, content) || |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
43 !json.isMember("Slices")) |
| 0 | 44 { |
| 45 return; | |
| 46 } | |
| 47 | |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
48 const Json::Value& instances = json["Slices"]; |
| 0 | 49 if (instances.type() != Json::arrayValue) |
| 50 { | |
| 51 return; | |
| 52 } | |
| 53 | |
| 54 for (Json::Value::ArrayIndex i = 0; | |
| 55 i < instances.size() && i < PREFETCH_FORWARD; | |
| 56 i++) | |
| 57 { | |
| 58 std::string item = "jpeg95-" + instances[i].asString(); | |
| 59 toPrefetch.push_back(CacheIndex(CacheBundle_DecodedImage, item)); | |
| 60 } | |
| 61 } | |
| 62 | |
| 63 | |
| 64 void ViewerPrefetchPolicy::ApplyInstance(std::list<CacheIndex>& toPrefetch, | |
| 65 CacheScheduler& cache, | |
| 66 const std::string& path) | |
| 67 { | |
| 68 size_t separator = path.find('-'); | |
| 69 if (separator == std::string::npos) | |
| 70 { | |
| 71 return; | |
| 72 } | |
| 73 | |
| 74 std::string compression = path.substr(0, separator + 1); | |
| 101 | 75 std::string instanceAndFrame = path.substr(separator + 1); |
| 0 | 76 |
| 101 | 77 std::string instanceId = instanceAndFrame.substr(0, instanceAndFrame.find('_')); |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
78 |
| 0 | 79 Json::Value instance; |
| 80 if (!GetJsonFromOrthanc(instance, context_, "/instances/" + instanceId) || | |
| 81 !instance.isMember("ParentSeries")) | |
| 82 { | |
| 83 return; | |
| 84 } | |
| 85 | |
| 86 std::string tmp; | |
| 87 if (!cache.Access(tmp, CacheBundle_SeriesInformation, instance["ParentSeries"].asString())) | |
| 88 { | |
| 89 return; | |
| 90 } | |
| 91 | |
| 92 Json::Value series; | |
|
292
aadbffcee805
remove calls to deprecated classes of JsonCpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
93 if (!Orthanc::Toolbox::ReadJson(series, tmp) || |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
94 !series.isMember("Slices")) |
| 0 | 95 { |
| 96 return; | |
| 97 } | |
| 98 | |
|
99
46ec13a1177c
use of ordered-slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
99 const Json::Value& instances = series["Slices"]; |
| 101 | 100 |
| 0 | 101 if (instances.type() != Json::arrayValue) |
| 102 { | |
| 103 return; | |
| 104 } | |
| 105 | |
| 106 Json::Value::ArrayIndex position = 0; | |
| 107 while (position < instances.size()) | |
| 108 { | |
| 101 | 109 if (instances[position] == instanceAndFrame) |
| 0 | 110 { |
| 111 break; | |
| 112 } | |
| 113 | |
| 114 position++; | |
| 115 } | |
| 116 | |
| 117 if (position == instances.size()) | |
| 118 { | |
| 119 return; | |
| 120 } | |
| 121 | |
| 122 for (Json::Value::ArrayIndex i = position; | |
| 123 i < instances.size() && i < position + PREFETCH_FORWARD; | |
| 124 i++) | |
| 125 { | |
| 126 std::string item = compression + instances[i].asString(); | |
| 127 toPrefetch.push_back(CacheIndex(CacheBundle_DecodedImage, item)); | |
| 128 } | |
| 129 | |
| 130 for (Json::Value::ArrayIndex i = position; | |
| 131 i >= 0 && i > position - PREFETCH_BACKWARD; ) | |
| 132 { | |
| 133 i--; | |
| 134 std::string item = compression + instances[i].asString(); | |
| 135 toPrefetch.push_back(CacheIndex(CacheBundle_DecodedImage, item)); | |
| 136 } | |
| 137 } | |
| 138 | |
| 139 | |
| 140 void ViewerPrefetchPolicy::Apply(std::list<CacheIndex>& toPrefetch, | |
| 141 CacheScheduler& cache, | |
| 142 const CacheIndex& accessed, | |
| 143 const std::string& content) | |
| 144 { | |
| 145 switch (accessed.GetBundle()) | |
| 146 { | |
| 147 case CacheBundle_SeriesInformation: | |
| 148 ApplySeries(toPrefetch, cache, accessed.GetItem(), content); | |
| 149 return; | |
| 150 | |
| 151 case CacheBundle_DecodedImage: | |
| 152 ApplyInstance(toPrefetch, cache, accessed.GetItem()); | |
| 153 return; | |
| 154 | |
| 155 default: | |
| 156 return; | |
| 157 } | |
| 158 } | |
| 159 } | |
| 160 |