comparison Framework/SmartLoader.cpp @ 623:42dadae61fa9

renamed IObservable::EmitMessage() as BroadcastMessage()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 07 May 2019 14:16:08 +0200
parents b70e9be013e4
children d2c0e347ddc2
comparison
equal deleted inserted replaced
622:8a3a25f2d42c 623:42dadae61fa9
93 if (status_ == CachedSliceStatus_ImageLoaded) 93 if (status_ == CachedSliceStatus_ImageLoaded)
94 { 94 {
95 LOG(WARNING) << "ScheduleLayerCreation for CachedSlice (image is loaded): " << slice_->GetOrthancInstanceId(); 95 LOG(WARNING) << "ScheduleLayerCreation for CachedSlice (image is loaded): " << slice_->GetOrthancInstanceId();
96 96
97 RendererFactory factory(*this); 97 RendererFactory factory(*this);
98 EmitMessage(IVolumeSlicer::LayerReadyMessage(*this, factory, slice_->GetGeometry())); 98 BroadcastMessage(IVolumeSlicer::LayerReadyMessage(*this, factory, slice_->GetGeometry()));
99 } 99 }
100 else 100 else
101 { 101 {
102 LOG(WARNING) << "ScheduleLayerCreation for CachedSlice (image is not loaded yet): " << slice_->GetOrthancInstanceId(); 102 LOG(WARNING) << "ScheduleLayerCreation for CachedSlice (image is not loaded yet): " << slice_->GetOrthancInstanceId();
103 } 103 }
172 throw StoneException(ErrorCode_CanOnlyAddOneLayerAtATime); 172 throw StoneException(ErrorCode_CanOnlyAddOneLayerAtATime);
173 } 173 }
174 174
175 if (cachedSlice != NULL) 175 if (cachedSlice != NULL)
176 { 176 {
177 EmitMessage(IVolumeSlicer::GeometryReadyMessage(*cachedSlice)); 177 BroadcastMessage(IVolumeSlicer::GeometryReadyMessage(*cachedSlice));
178 } 178 }
179 179
180 } 180 }
181 181
182 void SmartLoader::PreloadSlice(const std::string instanceId, 182 void SmartLoader::PreloadSlice(const std::string instanceId,
240 cachedSlice->status_ = CachedSliceStatus_GeometryLoaded; 240 cachedSlice->status_ = CachedSliceStatus_GeometryLoaded;
241 241
242 cachedSlices_[sliceKeyId] = boost::shared_ptr<CachedSlice>(cachedSlice); 242 cachedSlices_[sliceKeyId] = boost::shared_ptr<CachedSlice>(cachedSlice);
243 243
244 // re-emit original Layer message to observers 244 // re-emit original Layer message to observers
245 EmitMessage(message); 245 BroadcastMessage(message);
246 } 246 }
247 247
248 248
249 void SmartLoader::OnFrameReady(const DicomSeriesVolumeSlicer::FrameReadyMessage& message) 249 void SmartLoader::OnFrameReady(const DicomSeriesVolumeSlicer::FrameReadyMessage& message)
250 { 250 {
262 cachedSlice->status_ = CachedSliceStatus_ImageLoaded; 262 cachedSlice->status_ = CachedSliceStatus_ImageLoaded;
263 263
264 cachedSlices_[sliceKeyId] = cachedSlice; 264 cachedSlices_[sliceKeyId] = cachedSlice;
265 265
266 // re-emit original Layer message to observers 266 // re-emit original Layer message to observers
267 EmitMessage(message); 267 BroadcastMessage(message);
268 } 268 }
269 269
270 270
271 void SmartLoader::OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message) 271 void SmartLoader::OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message)
272 { 272 {
284 { 284 {
285 preloadingInstances_.erase(sliceKeyId); 285 preloadingInstances_.erase(sliceKeyId);
286 } 286 }
287 287
288 // re-emit original Layer message to observers 288 // re-emit original Layer message to observers
289 EmitMessage(message); 289 BroadcastMessage(message);
290 } 290 }
291 } 291 }