Mercurial > hg > orthanc-stone

comparison Framework/Layers/OrthancFrameLayerSource.cpp @ 96:f8bce1bebe01 wasm

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of the NotifyLayerError callback
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 30 May 2017 10:30:57 +0200
parents 5945e81734a3
children d18dcc963930
comparison
equal deleted inserted replaced
95:f47349f4815c 96:f8bce1bebe01
53 const Slice& slice, 53 const Slice& slice,
54 Orthanc::ImageAccessor* image, 54 Orthanc::ImageAccessor* image,
55 SliceImageQuality quality) 55 SliceImageQuality quality)
56 { 56 {
57 bool isFull = (quality == SliceImageQuality_Full); 57 bool isFull = (quality == SliceImageQuality_Full);
58 LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(image, slice, isFull), slice); 58 LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(image, slice, isFull), slice, false);
59 } 59 }
60 60
61 void OrthancFrameLayerSource::NotifySliceImageError(const OrthancSlicesLoader& loader, 61 void OrthancFrameLayerSource::NotifySliceImageError(const OrthancSlicesLoader& loader,
62 unsigned int sliceIndex, 62 unsigned int sliceIndex,
63 const Slice& slice, 63 const Slice& slice,
64 SliceImageQuality quality) 64 SliceImageQuality quality)
65 { 65 {
66 LayerSourceBase::NotifyLayerError(slice.GetGeometry()); 66 LayerSourceBase::NotifyLayerReady(NULL, slice, true);
67 } 67 }
68 68
69 OrthancFrameLayerSource::OrthancFrameLayerSource(IWebService& orthanc, 69 OrthancFrameLayerSource::OrthancFrameLayerSource(IWebService& orthanc,
70 const std::string& instanceId, 70 const std::string& instanceId,
71 unsigned int frame) : 71 unsigned int frame) :
128 //loader_.ScheduleLoadSliceImage(index, SliceImageQuality_Full); 128 //loader_.ScheduleLoadSliceImage(index, SliceImageQuality_Full);
129 loader_.ScheduleLoadSliceImage(index, SliceImageQuality_Jpeg50); 129 loader_.ScheduleLoadSliceImage(index, SliceImageQuality_Jpeg50);
130 } 130 }
131 else 131 else
132 { 132 {
133 LayerSourceBase::NotifyLayerError(viewportSlice); 133 Slice slice;
134 LayerSourceBase::NotifyLayerReady(NULL, slice, true);
134 } 135 }
135 } 136 }
136 } 137 }
137 } 138 }