diff Framework/Toolbox/OrthancSlicesLoader.h @ 406:5d359b115b29

use of callables in OrthancVolumeImage
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 11 Nov 2018 18:17:50 +0100
parents dd4c7e82b4be
children f87f28624b96 b70e9be013e4
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancSlicesLoader.h	Sun Nov 11 17:50:11 2018 +0100
+++ b/Framework/Toolbox/OrthancSlicesLoader.h	Sun Nov 11 18:17:50 2018 +0100
@@ -39,7 +39,8 @@
     typedef OriginMessage<MessageType_SliceLoader_GeometryReady, OrthancSlicesLoader> SliceGeometryReadyMessage;
     typedef OriginMessage<MessageType_SliceLoader_GeometryError, OrthancSlicesLoader> SliceGeometryErrorMessage;
 
-    class SliceImageReadyMessage : public BaseMessage<MessageType_SliceLoader_ImageReady>
+    class SliceImageReadyMessage :
+      public OriginMessage<MessageType_SliceLoader_ImageReady, OrthancSlicesLoader>
     {
     private:
       unsigned int                   sliceIndex_;
@@ -48,10 +49,12 @@
       SliceImageQuality              effectiveQuality_;
 
     public:
-      SliceImageReadyMessage(unsigned int sliceIndex,
+      SliceImageReadyMessage(const OrthancSlicesLoader& origin,
+                             unsigned int sliceIndex,
                              const Slice& slice,
                              const Orthanc::ImageAccessor& image,
                              SliceImageQuality effectiveQuality) :
+        OriginMessage(origin),
         sliceIndex_(sliceIndex),
         slice_(slice),
         image_(image),
@@ -81,7 +84,8 @@
     };
     
 
-    class SliceImageErrorMessage : public BaseMessage<MessageType_SliceLoader_ImageError>
+    class SliceImageErrorMessage : 
+      public OriginMessage<MessageType_SliceLoader_ImageError, OrthancSlicesLoader>
     {
     private:
       const Slice&       slice_;
@@ -89,9 +93,11 @@
       SliceImageQuality  effectiveQuality_;
 
     public:
-      SliceImageErrorMessage(unsigned int sliceIndex,
+      SliceImageErrorMessage(const OrthancSlicesLoader& origin,
+                             unsigned int sliceIndex,
                              const Slice& slice,
                              SliceImageQuality effectiveQuality) :
+        OriginMessage(origin),
         slice_(slice),
         sliceIndex_(sliceIndex),
         effectiveQuality_(effectiveQuality)