Mercurial > hg > orthanc-stone

diff Framework/Toolbox/OrthancSlicesLoader.h @ 299:3897f9f28cfa am-callable-and-promise

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backup work in progress: updated messaging framework with ICallable
author am@osimis.io
date Fri, 14 Sep 2018 16:44:01 +0200
parents 5bd4161bf11b
children b4abaeb783b1
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancSlicesLoader.h	Mon Sep 10 12:22:26 2018 +0200
+++ b/Framework/Toolbox/OrthancSlicesLoader.h	Fri Sep 14 16:44:01 2018 +0200
@@ -32,7 +32,11 @@
   class OrthancSlicesLoader : public IObservable
   {
   public:
-    struct SliceImageReadyMessage : public IMessage
+
+    typedef OriginMessage<MessageType_SliceLoader_GeometryReady, OrthancSlicesLoader> SliceGeometryReadyMessage;
+    typedef OriginMessage<MessageType_SliceLoader_GeometryError, OrthancSlicesLoader> SliceGeometryErrorMessage;
+
+    struct SliceImageReadyMessage : public BaseMessage<MessageType_SliceLoader_ImageReady>
     {
       unsigned int sliceIndex_;
       const Slice& slice_;
@@ -43,7 +47,7 @@
                         const Slice& slice,
                         std::auto_ptr<Orthanc::ImageAccessor>& image,
                         SliceImageQuality effectiveQuality)
-        : IMessage(MessageType_SliceLoader_ImageReady),
+        : BaseMessage(),
           sliceIndex_(sliceIndex),
           slice_(slice),
           image_(image),
@@ -52,7 +56,7 @@
       }
     };
 
-    struct SliceImageErrorMessage : public IMessage
+    struct SliceImageErrorMessage : public BaseMessage<MessageType_SliceLoader_ImageError>
     {
       const Slice& slice_;
       unsigned int sliceIndex_;
@@ -61,7 +65,7 @@
       SliceImageErrorMessage(unsigned int sliceIndex,
                         const Slice& slice,
                         SliceImageQuality effectiveQuality)
-        : IMessage(MessageType_SliceLoader_ImageError),
+        : BaseMessage(),
           slice_(slice),
           sliceIndex_(sliceIndex),
           effectiveQuality_(effectiveQuality)
@@ -166,6 +170,6 @@
     void ScheduleLoadSliceImage(size_t index,
                                 SliceImageQuality requestedQuality);
 
-    virtual void HandleMessage(IObservable& from, const IMessage& message);
+//    virtual void HandleMessage(IObservable& from, const IMessage& message);
   };
 }