Mercurial > hg > orthanc-stone
annotate Framework/Widgets/LayerWidget.cpp @ 96:f8bce1bebe01 wasm
removal of the NotifyLayerError callback
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 May 2017 10:30:57 +0200 |
parents | f47349f4815c |
children | d18dcc963930 |
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 | |
93
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
92 bool HasRenderer(size_t index) |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
93 { |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
94 return renderers_[index] != NULL; |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
95 } |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
96 |
66 | 97 bool IsComplete() const |
98 { | |
99 return countMissing_ == 0; | |
100 } | |
101 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
102 unsigned int GetCountMissing() const |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
103 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
104 return countMissing_; |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
105 } |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
106 |
66 | 107 bool RenderScene(CairoContext& context, |
108 const ViewportGeometry& view) | |
109 { | |
110 bool fullQuality = true; | |
111 | |
112 for (size_t i = 0; i < renderers_.size(); i++) | |
113 { | |
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); | |
95 | 134 |
135 #if 1 | |
136 double s = 5.0 / view.GetZoom(); | |
137 cairo_rectangle(cr, -s, -s, 2.0 * s, 2.0 * s); | |
138 #else | |
139 // TODO Drawing circles makes WebAssembly crash! | |
66 | 140 cairo_arc(cr, 0, 0, 5.0 / view.GetZoom(), 0, 2 * M_PI); |
95 | 141 #endif |
142 | |
66 | 143 cairo_set_line_width(cr, 2.0 / view.GetZoom()); |
144 cairo_set_source_rgb(cr, 1, 1, 1); | |
145 cairo_stroke_preserve(cr); | |
95 | 146 cairo_set_source_rgb(cr, 1, 0, 0); |
66 | 147 cairo_fill(cr); |
148 } | |
149 | |
150 return true; | |
151 } | |
152 | |
153 void SetLayerStyle(size_t index, | |
154 const RenderStyle& style) | |
155 { | |
156 if (renderers_[index] != NULL) | |
157 { | |
158 renderers_[index]->SetLayerStyle(style); | |
159 } | |
160 } | |
161 }; | |
162 | |
163 | |
164 bool LayerWidget::LookupLayer(size_t& index /* out */, | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
165 const ILayerSource& layer) const |
66 | 166 { |
167 LayersIndex::const_iterator found = layersIndex_.find(&layer); | |
168 | |
169 if (found == layersIndex_.end()) | |
170 { | |
171 return false; | |
172 } | |
173 else | |
174 { | |
175 index = found->second; | |
176 assert(index < layers_.size() && | |
177 layers_[index] == &layer); | |
178 return true; | |
179 } | |
180 } | |
181 | |
85 | 182 |
183 bool LayerWidget::GetAndFixExtent(double& x1, | |
184 double& y1, | |
185 double& x2, | |
186 double& y2, | |
187 ILayerSource& source) const | |
188 { | |
189 if (source.GetExtent(x1, y1, x2, y2, slice_)) | |
190 { | |
191 if (x1 > x2) | |
192 { | |
193 std::swap(x1, x2); | |
194 } | |
195 | |
196 if (y1 > y2) | |
197 { | |
198 std::swap(y1, y2); | |
199 } | |
200 | |
201 return true; | |
202 } | |
203 else | |
204 { | |
205 return false; | |
206 } | |
207 } | |
208 | |
66 | 209 |
210 void LayerWidget::GetSceneExtent(double& x1, | |
211 double& y1, | |
212 double& x2, | |
213 double& y2) | |
214 { | |
215 bool first = true; | |
216 | |
217 for (size_t i = 0; i < layers_.size(); i++) | |
218 { | |
219 double ax, ay, bx, by; | |
220 | |
221 assert(layers_[i] != NULL); | |
85 | 222 if (GetAndFixExtent(ax, ay, bx, by, *layers_[i])) |
66 | 223 { |
93
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
224 LOG(INFO) << "Extent of layer " << i << ": (" << ax << "," << ay |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
225 << ")->(" << bx << "," << by << ")"; |
66 | 226 |
227 if (first) | |
228 { | |
229 x1 = ax; | |
230 y1 = ay; | |
231 x2 = bx; | |
232 y2 = by; | |
233 first = false; | |
234 } | |
235 else | |
236 { | |
237 x1 = std::min(x1, ax); | |
238 y1 = std::min(y1, ay); | |
239 x2 = std::max(x2, bx); | |
240 y2 = std::max(y2, by); | |
241 } | |
242 } | |
243 } | |
244 | |
245 if (first) | |
246 { | |
247 // Set a default extent of (-1,-1) -> (0,0) | |
248 x1 = -1; | |
249 y1 = -1; | |
250 x2 = 1; | |
251 y2 = 1; | |
252 } | |
253 | |
254 // Ensure the extent is non-empty | |
255 if (x1 >= x2) | |
256 { | |
257 double tmp = x1; | |
258 x1 = tmp - 0.5; | |
259 x2 = tmp + 0.5; | |
260 } | |
261 | |
262 if (y1 >= y2) | |
263 { | |
264 double tmp = y1; | |
265 y1 = tmp - 0.5; | |
266 y2 = tmp + 0.5; | |
267 } | |
268 } | |
269 | |
270 | |
271 bool LayerWidget::RenderScene(CairoContext& context, | |
272 const ViewportGeometry& view) | |
273 { | |
274 if (currentScene_.get() != NULL) | |
275 { | |
276 return currentScene_->RenderScene(context, view); | |
277 } | |
278 else | |
279 { | |
280 return true; | |
281 } | |
282 } | |
283 | |
284 | |
285 void LayerWidget::ResetPendingScene() | |
286 { | |
287 pendingScene_.reset(new Scene(slice_, layers_.size())); | |
288 } | |
289 | |
290 | |
291 void LayerWidget::UpdateLayer(size_t index, | |
292 ILayerRenderer* renderer, | |
77 | 293 const Slice& slice) |
66 | 294 { |
71
30c768873d47
OrthancSliceLoader::ScheduleLoadInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
66
diff
changeset
|
295 LOG(INFO) << "Updating layer " << index; |
66 | 296 |
297 std::auto_ptr<ILayerRenderer> tmp(renderer); | |
298 | |
299 if (renderer == NULL) | |
300 { | |
301 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
302 } | |
303 | |
304 if (index >= layers_.size()) | |
305 { | |
306 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
307 } | |
308 | |
309 assert(layers_.size() == styles_.size()); | |
310 renderer->SetLayerStyle(styles_[index]); | |
311 | |
312 if (currentScene_.get() != NULL && | |
78 | 313 slice.ContainsPlane(currentScene_->GetSlice())) |
66 | 314 { |
315 currentScene_->SetLayer(index, tmp.release()); | |
316 NotifyChange(); | |
317 } | |
318 else if (pendingScene_.get() != NULL && | |
78 | 319 slice.ContainsPlane(pendingScene_->GetSlice())) |
66 | 320 { |
321 pendingScene_->SetLayer(index, tmp.release()); | |
322 | |
323 if (currentScene_.get() == NULL || | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
324 !currentScene_->IsComplete() || |
66 | 325 pendingScene_->IsComplete()) |
326 { | |
327 currentScene_ = pendingScene_; | |
328 NotifyChange(); | |
329 } | |
330 } | |
331 } | |
332 | |
333 | |
334 LayerWidget::LayerWidget() : | |
78 | 335 started_(false) |
66 | 336 { |
337 SetBackgroundCleared(true); | |
338 } | |
339 | |
340 | |
341 LayerWidget::~LayerWidget() | |
342 { | |
343 for (size_t i = 0; i < layers_.size(); i++) | |
344 { | |
345 delete layers_[i]; | |
346 } | |
347 } | |
348 | |
349 | |
350 size_t LayerWidget::AddLayer(ILayerSource* layer) // Takes ownership | |
351 { | |
352 if (layer == NULL) | |
353 { | |
354 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
355 } | |
356 | |
357 size_t index = layers_.size(); | |
358 layers_.push_back(layer); | |
359 styles_.push_back(RenderStyle()); | |
360 layersIndex_[layer] = index; | |
361 | |
362 ResetPendingScene(); | |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
363 layer->Register(*this); |
66 | 364 |
365 return index; | |
366 } | |
367 | |
368 | |
369 void LayerWidget::SetLayerStyle(size_t layer, | |
370 const RenderStyle& style) | |
371 { | |
372 if (layer >= layers_.size()) | |
373 { | |
374 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
375 } | |
376 | |
377 assert(layers_.size() == styles_.size()); | |
378 styles_[layer] = style; | |
379 | |
380 if (currentScene_.get() != NULL) | |
381 { | |
382 currentScene_->SetLayerStyle(layer, style); | |
383 } | |
384 | |
385 if (pendingScene_.get() != NULL) | |
386 { | |
387 pendingScene_->SetLayerStyle(layer, style); | |
388 } | |
389 | |
390 NotifyChange(); | |
391 } | |
392 | |
393 | |
78 | 394 void LayerWidget::SetSlice(const SliceGeometry& slice) |
66 | 395 { |
93
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
396 LOG(INFO) << "Setting slice origin: (" << slice.GetOrigin()[0] |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
397 << "," << slice.GetOrigin()[1] |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
398 << "," << slice.GetOrigin()[2] << ")"; |
5945e81734a3
decoding of JPEG images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
92
diff
changeset
|
399 |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
400 Slice displayedSlice(slice_, THIN_SLICE_THICKNESS); |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
401 |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
402 if (!displayedSlice.ContainsPlane(slice)) |
66 | 403 { |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
404 if (currentScene_.get() == NULL || |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
405 (pendingScene_.get() != NULL && |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
406 pendingScene_->IsComplete())) |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
407 { |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
408 currentScene_ = pendingScene_; |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
409 } |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
410 |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
411 slice_ = slice; |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
412 ResetPendingScene(); |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
413 |
92 | 414 InvalidateAllLayers(); // TODO Removing this line avoid loading twice the image in WASM |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
415 } |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
416 } |
66 | 417 |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
418 |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
419 void LayerWidget::NotifyGeometryReady(const ILayerSource& source) |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
420 { |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
421 size_t i; |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
422 if (LookupLayer(i, source)) |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
423 { |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
424 LOG(INFO) << "Geometry ready for layer " << i; |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
425 layers_[i]->ScheduleLayerCreation(slice_); |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
426 } |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
427 } |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
428 |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
429 |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
430 void LayerWidget::NotifyGeometryError(const ILayerSource& source) |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
431 { |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
432 LOG(ERROR) << "Cannot get geometry"; |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
433 } |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
434 |
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
435 |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
436 void LayerWidget::InvalidateAllLayers() |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
437 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
438 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
|
439 { |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
440 assert(layers_[i] != NULL); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
441 layers_[i]->ScheduleLayerCreation(slice_); |
66 | 442 } |
443 } | |
444 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
445 |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
446 void LayerWidget::InvalidateLayer(size_t layer) |
66 | 447 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
448 if (layer >= layers_.size()) |
83 | 449 { |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
450 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
83 | 451 } |
66 | 452 |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
453 assert(layers_[layer] != NULL); |
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
454 layers_[layer]->ScheduleLayerCreation(slice_); |
77 | 455 } |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
456 |
77 | 457 |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
458 void LayerWidget::NotifyContentChange(const ILayerSource& source) |
66 | 459 { |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
460 size_t index; |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
461 if (LookupLayer(index, source)) |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
462 { |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
463 layers_[index]->ScheduleLayerCreation(slice_); |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
464 } |
66 | 465 } |
466 | |
467 | |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
468 void LayerWidget::NotifySliceChange(const ILayerSource& source, |
77 | 469 const Slice& slice) |
66 | 470 { |
77 | 471 if (slice.ContainsPlane(slice_)) |
66 | 472 { |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
473 size_t index; |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
474 if (LookupLayer(index, source)) |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
475 { |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
476 layers_[index]->ScheduleLayerCreation(slice_); |
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
477 } |
66 | 478 } |
479 } | |
480 | |
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
87
diff
changeset
|
481 |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
482 void LayerWidget::NotifyLayerReady(std::auto_ptr<ILayerRenderer>& renderer, |
87
4a541cd4fa83
OrthancVolumeImageLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
483 const ILayerSource& source, |
96
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
484 const Slice& slice, |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
485 bool isError) |
66 | 486 { |
487 size_t index; | |
96
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
488 if (renderer.get() != NULL && |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
489 LookupLayer(index, source) && |
85 | 490 slice.ContainsPlane(slice_)) // Whether the slice comes from an older request |
66 | 491 { |
96
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
492 if (isError) |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
493 { |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
494 LOG(ERROR) << "Using error renderer on layer " << index; |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
495 } |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
496 else |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
497 { |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
498 LOG(INFO) << "Renderer ready for layer " << index; |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
499 } |
f8bce1bebe01
removal of the NotifyLayerError callback
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
95
diff
changeset
|
500 |
90
64e60018943f
fix and observer refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
89
diff
changeset
|
501 UpdateLayer(index, renderer.release(), slice); |
66 | 502 } |
503 } | |
504 } |