Mercurial > hg > orthanc-stone

changeset 397:1d9dd542adfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 10 Nov 2018 09:33:50 +0100
parents ed7146fa2c98
children d257ea56b7be
files Applications/Samples/SingleVolumeApplication.h Framework/Layers/IVolumeSlicer.h Framework/Messages/IMessage.h Framework/StoneEnumerations.h UnitTestsSources/TestMessageBroker.cpp
diffstat 5 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/SingleVolumeApplication.h	Sat Nov 10 09:29:08 2018 +0100
+++ b/Applications/Samples/SingleVolumeApplication.h	Sat Nov 10 09:33:50 2018 +0100
@@ -23,7 +23,6 @@
 
 #include "SampleApplicationBase.h"
 #include "../../Framework/dev.h"
-#include "../../Framework/Layers/ILayerSource.h"
 #include "../../Framework/Layers/LineMeasureTracker.h"
 #include "../../Framework/Layers/CircleMeasureTracker.h"
 
--- a/Framework/Layers/IVolumeSlicer.h	Sat Nov 10 09:29:08 2018 +0100
+++ b/Framework/Layers/IVolumeSlicer.h	Sat Nov 10 09:33:50 2018 +0100
@@ -33,11 +33,11 @@
   class IVolumeSlicer : public IObservable
   {
   public:
-    typedef OriginMessage<MessageType_LayerSource_GeometryReady, IVolumeSlicer>  GeometryReadyMessage;
-    typedef OriginMessage<MessageType_LayerSource_GeometryError, IVolumeSlicer>  GeometryErrorMessage;
-    typedef OriginMessage<MessageType_LayerSource_ContentChanged, IVolumeSlicer> ContentChangedMessage;
+    typedef OriginMessage<MessageType_VolumeSlicer_GeometryReady, IVolumeSlicer>  GeometryReadyMessage;
+    typedef OriginMessage<MessageType_VolumeSlicer_GeometryError, IVolumeSlicer>  GeometryErrorMessage;
+    typedef OriginMessage<MessageType_VolumeSlicer_ContentChanged, IVolumeSlicer> ContentChangedMessage;
 
-    class SliceChangedMessage : public OriginMessage<MessageType_LayerSource_SliceChanged, IVolumeSlicer>
+    class SliceChangedMessage : public OriginMessage<MessageType_VolumeSlicer_SliceChanged, IVolumeSlicer>
     {
     private:
       const Slice& slice_;
@@ -57,7 +57,7 @@
     };
     
 
-    class LayerReadyMessage : public OriginMessage<MessageType_LayerSource_LayerReady, IVolumeSlicer>
+    class LayerReadyMessage : public OriginMessage<MessageType_VolumeSlicer_LayerReady, IVolumeSlicer>
     {
     public:
       class IRendererFactory : public boost::noncopyable
@@ -96,7 +96,7 @@
     };
 
 
-    class LayerErrorMessage : public OriginMessage<MessageType_LayerSource_LayerError, IVolumeSlicer>
+    class LayerErrorMessage : public OriginMessage<MessageType_VolumeSlicer_LayerError, IVolumeSlicer>
     {
     private:
       const CoordinateSystem3D&  slice_;
--- a/Framework/Messages/IMessage.h	Sat Nov 10 09:29:08 2018 +0100
+++ b/Framework/Messages/IMessage.h	Sat Nov 10 09:33:50 2018 +0100
@@ -71,7 +71,7 @@
 
   // simple message implementation when no payload is needed
   // sample usage:
-  // typedef NoPayloadMessage<MessageType_LayerSource_GeometryReady> GeometryReadyMessage;
+  // typedef NoPayloadMessage<MessageType_VolumeSlicer_GeometryReady> GeometryReadyMessage;
   template <int type>
   class NoPayloadMessage : public BaseMessage<type>
   {
--- a/Framework/StoneEnumerations.h	Sat Nov 10 09:29:08 2018 +0100
+++ b/Framework/StoneEnumerations.h	Sat Nov 10 09:33:50 2018 +0100
@@ -120,12 +120,12 @@
     MessageType_Widget_GeometryChanged,
     MessageType_Widget_ContentChanged,
 
-    MessageType_LayerSource_GeometryReady,   // instance tags have been loaded
-    MessageType_LayerSource_GeometryError,
-    MessageType_LayerSource_ContentChanged,
-    MessageType_LayerSource_SliceChanged,
-    MessageType_LayerSource_LayerReady,      // layer is ready to be rendered
-    MessageType_LayerSource_LayerError,
+    MessageType_VolumeSlicer_GeometryReady,   // instance tags have been loaded
+    MessageType_VolumeSlicer_GeometryError,
+    MessageType_VolumeSlicer_ContentChanged,
+    MessageType_VolumeSlicer_SliceChanged,
+    MessageType_VolumeSlicer_LayerReady,      // layer is ready to be rendered
+    MessageType_VolumeSlicer_LayerError,
 
     MessageType_DicomSeriesVolumeSlicer_FrameReady,      // pixels data of the frame have been loaded
 
--- a/UnitTestsSources/TestMessageBroker.cpp	Sat Nov 10 09:29:08 2018 +0100
+++ b/UnitTestsSources/TestMessageBroker.cpp	Sat Nov 10 09:33:50 2018 +0100
@@ -126,7 +126,7 @@
 //  ASSERT_THROW(observable.RegisterObserver(partialObserver), OrthancStone::MessageNotDeclaredException);
 
 //  // check an exception is thrown when the observable emits an undeclared message
-//  ASSERT_THROW(observable.EmitMessage(OrthancStone::IMessage(OrthancStone::MessageType_LayerSource_GeometryReady)), OrthancStone::MessageNotDeclaredException);
+//  ASSERT_THROW(observable.EmitMessage(OrthancStone::IMessage(OrthancStone::MessageType_VolumeSlicer_GeometryReady)), OrthancStone::MessageNotDeclaredException);
 
 //  // unregister the observer, make sure nothing happens afterwards
 //  observable.UnregisterObserver(fullObserver);