Mercurial > hg > orthanc-stone
annotate Framework/Widgets/LayerWidget.cpp @ 89:f244018a4e4b wasm
BUGGY- trying to remove IVolumeSlicesObserver
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 26 May 2017 18:27:59 +0200 |
parents | 4a541cd4fa83 |
children | 64e60018943f |
rev | line source |
---|---|
66 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017 Osimis, Belgium | |
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 "LayerWidget.h" | |
23 | |
24 #include "../../Resources/Orthanc/Core/Logging.h" | |
85 | 25 #include "../Layers/MissingLayerRenderer.h" |
26 | |
27 static const double THIN_SLICE_THICKNESS = 100.0 * std::numeric_limits<double>::epsilon(); | |
66 | 28 |
29 namespace OrthancStone | |
30 { | |
31 class LayerWidget::Scene : public boost::noncopyable | |
32 { | |
33 private: | |
34 SliceGeometry slice_; | |
35 size_t countMissing_; | |
36 std::vector<ILayerRenderer*> renderers_; | |
37 | |
38 void DeleteLayer(size_t index) | |
39 { | |
40 if (index >= renderers_.size()) | |
41 { | |
42 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
43 } | |
44 | |
45 assert(countMissing_ <= renderers_.size()); | |
46 | |
47 if (renderers_[index] != NULL) | |
48 { | |
49 assert(countMissing_ < renderers_.size()); | |
50 delete renderers_[index]; | |
51 renderers_[index] = NULL; | |
52 countMissing_++; | |
53 } | |
54 } | |
55 | |
56 public: | |
57 Scene(const SliceGeometry& slice, | |
58 size_t countLayers) : | |
59 slice_(slice), | |
60 countMissing_(countLayers), | |
61 renderers_(countLayers, NULL) | |
62 { | |
63 } | |
64 | |
65 ~Scene() | |
66 { | |
67 for (size_t i = 0; i < renderers_.size(); i++) | |
68 { | |
69 DeleteLayer(i); | |
70 } | |
71 } | |
72 | |
73 void SetLayer(size_t index, | |
74 ILayerRenderer* renderer) // Takes ownership | |
75 { | |
76 if (renderer == NULL) | |
77 { | |
78 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
79 } | |
80 | |
81 DeleteLayer(index); | |
82 | |
83 renderers_[index] = renderer; | |
84 countMissing_--; | |
85 } | |
86 | |
87 const SliceGeometry& GetSlice() const | |
88 { | |
89 return slice_; | |
90 } | |
91 | |
92 bool IsComplete() const | |
93 { | |
94 return countMissing_ == 0; | |
95 } | |
96 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
97 unsigned int GetCountMissing() const |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
98 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
99 return countMissing_; |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
100 } |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
101 |
66 | 102 bool RenderScene(CairoContext& context, |
103 const ViewportGeometry& view) | |
104 { | |
105 bool fullQuality = true; | |
106 | |
107 for (size_t i = 0; i < renderers_.size(); i++) | |
108 { | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
109 if (renderers_[i] != NULL) |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
110 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
111 LOG(ERROR) << "..............."; |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
112 } |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
113 |
66 | 114 if (renderers_[i] != NULL && |
77 | 115 !renderers_[i]->RenderLayer(context, view, slice_)) |
66 | 116 { |
117 return false; | |
118 } | |
119 | |
120 if (renderers_[i] != NULL && | |
121 !renderers_[i]->IsFullQuality()) | |
122 { | |
123 fullQuality = false; | |
124 } | |
125 } | |
126 | |
127 if (!fullQuality) | |
128 { | |
129 double x, y; | |
130 view.MapDisplayToScene(x, y, static_cast<double>(view.GetDisplayWidth()) / 2.0, 10); | |
131 | |
132 cairo_t *cr = context.GetObject(); | |
133 cairo_translate(cr, x, y); | |
134 cairo_arc(cr, 0, 0, 5.0 / view.GetZoom(), 0, 2 * M_PI); | |
135 cairo_set_line_width(cr, 2.0 / view.GetZoom()); | |
136 cairo_set_source_rgb(cr, 1, 1, 1); | |
137 cairo_stroke_preserve(cr); | |
138 cairo_set_source_rgb(cr, 1, 0, 0); | |
139 cairo_fill(cr); | |
140 } | |
141 | |
142 return true; | |
143 } | |
144 | |
145 void SetLayerStyle(size_t index, | |
146 const RenderStyle& style) | |
147 { | |
148 if (renderers_[index] != NULL) | |
149 { | |
150 renderers_[index]->SetLayerStyle(style); | |
151 } | |
152 } | |
153 }; | |
154 | |
155 | |
156 bool LayerWidget::LookupLayer(size_t& index /* out */, | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
157 const ILayerSource& layer) const |
66 | 158 { |
159 LayersIndex::const_iterator found = layersIndex_.find(&layer); | |
160 | |
161 if (found == layersIndex_.end()) | |
162 { | |
163 return false; | |
164 } | |
165 else | |
166 { | |
167 index = found->second; | |
168 assert(index < layers_.size() && | |
169 layers_[index] == &layer); | |
170 return true; | |
171 } | |
172 } | |
173 | |
85 | 174 |
175 bool LayerWidget::GetAndFixExtent(double& x1, | |
176 double& y1, | |
177 double& x2, | |
178 double& y2, | |
179 ILayerSource& source) const | |
180 { | |
181 if (source.GetExtent(x1, y1, x2, y2, slice_)) | |
182 { | |
183 if (x1 > x2) | |
184 { | |
185 std::swap(x1, x2); | |
186 } | |
187 | |
188 if (y1 > y2) | |
189 { | |
190 std::swap(y1, y2); | |
191 } | |
192 | |
193 return true; | |
194 } | |
195 else | |
196 { | |
197 return false; | |
198 } | |
199 } | |
200 | |
66 | 201 |
202 void LayerWidget::GetSceneExtent(double& x1, | |
203 double& y1, | |
204 double& x2, | |
205 double& y2) | |
206 { | |
207 bool first = true; | |
208 | |
209 for (size_t i = 0; i < layers_.size(); i++) | |
210 { | |
211 double ax, ay, bx, by; | |
212 | |
213 assert(layers_[i] != NULL); | |
85 | 214 if (GetAndFixExtent(ax, ay, bx, by, *layers_[i])) |
66 | 215 { |
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
216 LOG(INFO) << "Extent of layer " << i << ": (" << ax << "," << ay << ")->(" << bx << "," << by << ")"; |
66 | 217 |
218 if (first) | |
219 { | |
220 x1 = ax; | |
221 y1 = ay; | |
222 x2 = bx; | |
223 y2 = by; | |
224 first = false; | |
225 } | |
226 else | |
227 { | |
228 x1 = std::min(x1, ax); | |
229 y1 = std::min(y1, ay); | |
230 x2 = std::max(x2, bx); | |
231 y2 = std::max(y2, by); | |
232 } | |
233 } | |
234 } | |
235 | |
236 if (first) | |
237 { | |
238 // Set a default extent of (-1,-1) -> (0,0) | |
239 x1 = -1; | |
240 y1 = -1; | |
241 x2 = 1; | |
242 y2 = 1; | |
243 } | |
244 | |
245 // Ensure the extent is non-empty | |
246 if (x1 >= x2) | |
247 { | |
248 double tmp = x1; | |
249 x1 = tmp - 0.5; | |
250 x2 = tmp + 0.5; | |
251 } | |
252 | |
253 if (y1 >= y2) | |
254 { | |
255 double tmp = y1; | |
256 y1 = tmp - 0.5; | |
257 y2 = tmp + 0.5; | |
258 } | |
259 } | |
260 | |
261 | |
262 bool LayerWidget::RenderScene(CairoContext& context, | |
263 const ViewportGeometry& view) | |
264 { | |
265 if (currentScene_.get() != NULL) | |
266 { | |
267 return currentScene_->RenderScene(context, view); | |
268 } | |
269 else | |
270 { | |
271 return true; | |
272 } | |
273 } | |
274 | |
275 | |
276 void LayerWidget::ResetPendingScene() | |
277 { | |
278 pendingScene_.reset(new Scene(slice_, layers_.size())); | |
279 } | |
280 | |
281 | |
282 void LayerWidget::UpdateLayer(size_t index, | |
283 ILayerRenderer* renderer, | |
77 | 284 const Slice& slice) |
66 | 285 { |
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
286 LOG(INFO) << "Updating layer " << index; |
66 | 287 |
288 std::auto_ptr<ILayerRenderer> tmp(renderer); | |
289 | |
290 if (renderer == NULL) | |
291 { | |
292 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
293 } | |
294 | |
295 if (index >= layers_.size()) | |
296 { | |
297 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
298 } | |
299 | |
300 assert(layers_.size() == styles_.size()); | |
301 renderer->SetLayerStyle(styles_[index]); | |
302 | |
303 if (currentScene_.get() != NULL && | |
78 | 304 slice.ContainsPlane(currentScene_->GetSlice())) |
66 | 305 { |
306 currentScene_->SetLayer(index, tmp.release()); | |
307 NotifyChange(); | |
308 } | |
309 else if (pendingScene_.get() != NULL && | |
78 | 310 slice.ContainsPlane(pendingScene_->GetSlice())) |
66 | 311 { |
312 pendingScene_->SetLayer(index, tmp.release()); | |
313 | |
314 if (currentScene_.get() == NULL || | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
315 !currentScene_->IsComplete() || |
66 | 316 pendingScene_->IsComplete()) |
317 { | |
318 currentScene_ = pendingScene_; | |
319 NotifyChange(); | |
320 } | |
321 } | |
322 } | |
323 | |
324 | |
325 LayerWidget::LayerWidget() : | |
78 | 326 started_(false) |
66 | 327 { |
328 SetBackgroundCleared(true); | |
329 } | |
330 | |
331 | |
332 LayerWidget::~LayerWidget() | |
333 { | |
334 for (size_t i = 0; i < layers_.size(); i++) | |
335 { | |
336 delete layers_[i]; | |
337 } | |
338 } | |
339 | |
340 | |
341 size_t LayerWidget::AddLayer(ILayerSource* layer) // Takes ownership | |
342 { | |
343 if (layer == NULL) | |
344 { | |
345 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
346 } | |
347 | |
348 size_t index = layers_.size(); | |
349 layers_.push_back(layer); | |
350 styles_.push_back(RenderStyle()); | |
351 layersIndex_[layer] = index; | |
352 | |
353 ResetPendingScene(); | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
354 LOG(ERROR) << "*****************************"; |
66 | 355 layer->SetObserver(*this); |
356 | |
357 return index; | |
358 } | |
359 | |
360 | |
361 void LayerWidget::SetLayerStyle(size_t layer, | |
362 const RenderStyle& style) | |
363 { | |
364 if (layer >= layers_.size()) | |
365 { | |
366 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
367 } | |
368 | |
369 assert(layers_.size() == styles_.size()); | |
370 styles_[layer] = style; | |
371 | |
372 if (currentScene_.get() != NULL) | |
373 { | |
374 currentScene_->SetLayerStyle(layer, style); | |
375 } | |
376 | |
377 if (pendingScene_.get() != NULL) | |
378 { | |
379 pendingScene_->SetLayerStyle(layer, style); | |
380 } | |
381 | |
382 NotifyChange(); | |
383 } | |
384 | |
385 | |
78 | 386 void LayerWidget::SetSlice(const SliceGeometry& slice) |
66 | 387 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
388 if (currentScene_.get() == NULL || |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
389 (pendingScene_.get() != NULL && |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
390 pendingScene_->IsComplete())) |
66 | 391 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
392 currentScene_ = pendingScene_; |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
393 } |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
394 |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
395 slice_ = slice; |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
396 ResetPendingScene(); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
397 } |
66 | 398 |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
399 |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
400 void LayerWidget::InvalidateAllLayers() |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
401 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
402 for (size_t i = 0; i < layers_.size(); i++) |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
403 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
404 assert(layers_[i] != NULL); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
405 layers_[i]->ScheduleLayerCreation(slice_); |
66 | 406 } |
407 } | |
408 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
409 |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
410 void LayerWidget::InvalidateLayer(size_t layer) |
66 | 411 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
412 if (layer >= layers_.size()) |
83 | 413 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
414 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
83 | 415 } |
66 | 416 |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
417 assert(layers_[layer] != NULL); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
418 layers_[layer]->ScheduleLayerCreation(slice_); |
77 | 419 } |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
420 |
77 | 421 |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
422 void LayerWidget::NotifyContentChange(const ILayerSource& source) |
66 | 423 { |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
424 size_t index; |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
425 if (LookupLayer(index, source)) |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
426 { |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
427 layers_[index]->ScheduleLayerCreation(slice_); |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
428 } |
66 | 429 } |
430 | |
431 | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
432 void LayerWidget::NotifySliceChange(const ILayerSource& source, |
77 | 433 const Slice& slice) |
66 | 434 { |
77 | 435 if (slice.ContainsPlane(slice_)) |
66 | 436 { |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
437 size_t index; |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
438 if (LookupLayer(index, source)) |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
439 { |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
440 layers_[index]->ScheduleLayerCreation(slice_); |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
441 } |
66 | 442 } |
443 } | |
444 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
445 |
66 | 446 void LayerWidget::NotifyLayerReady(ILayerRenderer* renderer, |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
447 const ILayerSource& source, |
77 | 448 const Slice& slice) |
66 | 449 { |
450 std::auto_ptr<ILayerRenderer> tmp(renderer); | |
451 | |
452 size_t index; | |
85 | 453 if (LookupLayer(index, source) && |
454 slice.ContainsPlane(slice_)) // Whether the slice comes from an older request | |
66 | 455 { |
77 | 456 LOG(INFO) << "Renderer ready for layer " << index; |
457 UpdateLayer(index, tmp.release(), slice); | |
66 | 458 } |
459 } | |
460 | |
461 | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
462 void LayerWidget::NotifyLayerError(const ILayerSource& source, |
85 | 463 const SliceGeometry& slice) |
66 | 464 { |
85 | 465 size_t index; |
466 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
467 Slice expected(slice_, THIN_SLICE_THICKNESS); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
468 |
85 | 469 if (LookupLayer(index, source) && |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
470 expected.ContainsPlane(slice)) // Whether the slice comes from an older request |
85 | 471 { |
86
02c3a7a4938f
removing of the Start() mechanism
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
85
diff
changeset
|
472 LOG(INFO) << "Unable to load a slice from layer " << index; |
85 | 473 |
474 double x1, y1, x2, y2; | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
475 if (GetAndFixExtent(x1, y1, x2, y2, *layers_[index])) |
85 | 476 { |
477 UpdateLayer(index, new MissingLayerRenderer(x1, y1, x2, y2), Slice(slice, THIN_SLICE_THICKNESS)); | |
478 } | |
479 } | |
66 | 480 } |
481 } |