diff Framework/Toolbox/OrthancSlicesLoader.cpp @ 267:89d02de83c03 am-2

added declaretion of messages handled/emitted
author am@osimis.io
date Wed, 22 Aug 2018 14:59:20 +0200
parents c9cf95b49a86
children 5bd4161bf11b
line wrap: on
line diff
--- a/Framework/Toolbox/OrthancSlicesLoader.cpp	Tue Aug 21 18:14:22 2018 +0200
+++ b/Framework/Toolbox/OrthancSlicesLoader.cpp	Wed Aug 22 14:59:20 2018 +0200
@@ -253,7 +253,7 @@
       {
       case Mode_FrameGeometry:
       case Mode_SeriesGeometry:
-        that_.EmitMessage(IMessage(MessageType_SliceGeometryError));
+        that_.EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
         that_.state_ = State_Error;
         break;
         
@@ -321,12 +321,12 @@
     if (ok)
     {
       LOG(INFO) << "Loaded a series with " << slices_.GetSliceCount() << " slice(s)";
-      EmitMessage(IMessage(MessageType_SliceGeometryReady));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryReady));
     }
     else
     {
       LOG(ERROR) << "This series is empty";
-      EmitMessage(IMessage(MessageType_SliceGeometryError));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
     }
   }
   
@@ -338,7 +338,7 @@
     if (!MessagingToolbox::ParseJson(series, answer, size) ||
         series.type() != Json::objectValue)
     {
-      EmitMessage(IMessage(MessageType_SliceGeometryError));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
       return;
     }
     
@@ -385,7 +385,7 @@
     if (!MessagingToolbox::ParseJson(tags, answer, size) ||
         tags.type() != Json::objectValue)
     {
-      EmitMessage(IMessage(MessageType_SliceGeometryError));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
       return;
     }
     
@@ -412,7 +412,7 @@
       else
       {
         LOG(WARNING) << "Skipping invalid multi-frame instance " << instanceId;
-        EmitMessage(IMessage(MessageType_SliceGeometryError));
+        EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
         return;
       }
     }
@@ -430,7 +430,7 @@
     if (!MessagingToolbox::ParseJson(tags, answer, size) ||
         tags.type() != Json::objectValue)
     {
-      EmitMessage(IMessage(MessageType_SliceGeometryError));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
       return;
     }
     
@@ -446,12 +446,12 @@
     {
       LOG(INFO) << "Loaded instance geometry " << instanceId;
       slices_.AddSlice(slice.release());
-      EmitMessage(IMessage(MessageType_SliceGeometryReady));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryReady));
     }
     else
     {
       LOG(WARNING) << "Skipping invalid instance " << instanceId;
-      EmitMessage(IMessage(MessageType_SliceGeometryError));
+      EmitMessage(IMessage(MessageType_SliceLoader_GeometryError));
     }
   }
   
@@ -784,6 +784,10 @@
     orthanc_(orthanc),
     state_(State_Initialization)
   {
+    DeclareEmittableMessage(MessageType_SliceLoader_GeometryReady);
+    DeclareEmittableMessage(MessageType_SliceLoader_GeometryError);
+    DeclareEmittableMessage(MessageType_SliceLoader_ImageError);
+    DeclareEmittableMessage(MessageType_SliceLoader_ImageReady);
   }