Mercurial > hg > orthanc-stone
diff Framework/SmartLoader.cpp @ 299:3897f9f28cfa am-callable-and-promise
backup work in progress: updated messaging framework with ICallable
| author | am@osimis.io |
|---|---|
| date | Fri, 14 Sep 2018 16:44:01 +0200 |
| parents | b04b13810540 |
| children | b4abaeb783b1 |
line wrap: on
line diff
--- a/Framework/SmartLoader.cpp Mon Sep 10 12:22:26 2018 +0200 +++ b/Framework/SmartLoader.cpp Fri Sep 14 16:44:01 2018 +0200 @@ -31,11 +31,11 @@ webService_(webService), orthancApiClient_(broker, webService) { - DeclareHandledMessage(MessageType_LayerSource_GeometryReady); - DeclareHandledMessage(MessageType_LayerSource_LayerReady); - DeclareIgnoredMessage(MessageType_LayerSource_GeometryError); - DeclareIgnoredMessage(MessageType_LayerSource_ContentChanged); - DeclareIgnoredMessage(MessageType_LayerSource_SliceChanged); +// DeclareHandledMessage(MessageType_LayerSource_GeometryReady); +// DeclareHandledMessage(MessageType_LayerSource_LayerReady); +// DeclareIgnoredMessage(MessageType_LayerSource_GeometryError); +// DeclareIgnoredMessage(MessageType_LayerSource_ContentChanged); +// DeclareIgnoredMessage(MessageType_LayerSource_SliceChanged); // DeclareHandledMessage(MessageType_OrthancApi_InternalGetJsonResponseReady); // DeclareIgnoredMessage(MessageType_OrthancApi_InternalGetJsonResponseError); @@ -65,7 +65,7 @@ } // forward messages to its own observers - IObservable::broker_.EmitMessage(from, IObservable::observers_, message); + // TODO TODO TODO IObservable::broker_.EmitMessage(from, IObservable::observers_, message); } ILayerSource* SmartLoader::GetFrame(const std::string& instanceId, unsigned int frame) @@ -78,7 +78,7 @@ // in both cases, we must be carefull about objects lifecycle !!! std::auto_ptr<OrthancFrameLayerSource> layerSource (new OrthancFrameLayerSource(IObserver::broker_, webService_)); layerSource->SetImageQuality(imageQuality_); - layerSource->RegisterObserver(*this); + //layerSource->RegisterObserverCallback(new Callable<SmartLoader, ILayerSource::GeometryReadyMessage>(*this, &SmartLoader::....)); layerSource->LoadFrame(instanceId, frame); return layerSource.release();