Mercurial > hg > orthanc-stone

changeset 399:885e1ebd315c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename SliceChange as SliceContentChange
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 10 Nov 2018 09:50:30 +0100
parents d257ea56b7be
children 518f680dbf2e
files Applications/Samples/LayoutPetCtFusionApplication.h Applications/Samples/SingleVolumeApplication.h Framework/Layers/IVolumeSlicer.h Framework/Layers/VolumeSlicerBase.cpp Framework/Layers/VolumeSlicerBase.h Framework/Volumes/ISlicedVolume.h Framework/Volumes/SlicedVolumeBase.cpp Framework/Volumes/SlicedVolumeBase.h Framework/Widgets/SliceViewerWidget.cpp Framework/Widgets/SliceViewerWidget.h Framework/dev.h Resources/Graveyard/ReferenceLineFactory.cpp Resources/Graveyard/ReferenceLineFactory.h
diffstat 13 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/LayoutPetCtFusionApplication.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Applications/Samples/LayoutPetCtFusionApplication.h	Sat Nov 10 09:50:30 2018 +0100
@@ -379,7 +379,7 @@
         }
       }
 
-      virtual void NotifySliceChange(const LayeredSceneWidget& source,
+      virtual void NotifySliceContentChange(const LayeredSceneWidget& source,
                                      const SliceGeometry& slice)
       {
         if (!processingEvent_)  // Avoid reentrant calls
--- a/Applications/Samples/SingleVolumeApplication.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Applications/Samples/SingleVolumeApplication.h	Sat Nov 10 09:50:30 2018 +0100
@@ -47,7 +47,7 @@
         size_t        layer_;
         
       protected:
-        virtual void NotifySliceChange(const ISlicedVolume& volume,
+        virtual void NotifySliceContentChange(const ISlicedVolume& volume,
                                        const size_t& sliceIndex,
                                        const Slice& slice)
         {
--- a/Framework/Layers/IVolumeSlicer.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Layers/IVolumeSlicer.h	Sat Nov 10 09:50:30 2018 +0100
@@ -37,13 +37,13 @@
     typedef OriginMessage<MessageType_VolumeSlicer_GeometryError, IVolumeSlicer>  GeometryErrorMessage;
     typedef OriginMessage<MessageType_VolumeSlicer_ContentChanged, IVolumeSlicer> ContentChangedMessage;
 
-    class SliceChangedMessage : public OriginMessage<MessageType_VolumeSlicer_SliceChanged, IVolumeSlicer>
+    class SliceContentChangedMessage : public OriginMessage<MessageType_VolumeSlicer_SliceChanged, IVolumeSlicer>
     {
     private:
       const Slice& slice_;
 
     public:
-      SliceChangedMessage(IVolumeSlicer& origin,
+      SliceContentChangedMessage(IVolumeSlicer& origin,
                           const Slice& slice) :
         OriginMessage(origin),
         slice_(slice)
--- a/Framework/Layers/VolumeSlicerBase.cpp	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Layers/VolumeSlicerBase.cpp	Sat Nov 10 09:50:30 2018 +0100
@@ -40,9 +40,9 @@
     EmitMessage(IVolumeSlicer::ContentChangedMessage(*this));
   }
 
-  void VolumeSlicerBase::NotifySliceChange(const Slice& slice)
+  void VolumeSlicerBase::NotifySliceContentChange(const Slice& slice)
   {
-    EmitMessage(IVolumeSlicer::SliceChangedMessage(*this, slice));
+    EmitMessage(IVolumeSlicer::SliceContentChangedMessage(*this, slice));
   }
 
   void VolumeSlicerBase::NotifyLayerReady(const LayerReadyMessage::IRendererFactory& factory,
--- a/Framework/Layers/VolumeSlicerBase.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Layers/VolumeSlicerBase.h	Sat Nov 10 09:50:30 2018 +0100
@@ -37,7 +37,7 @@
 
     void NotifyContentChange();
 
-    void NotifySliceChange(const Slice& slice);
+    void NotifySliceContentChange(const Slice& slice);
 
     void NotifyLayerReady(const LayerReadyMessage::IRendererFactory& factory,
                           const CoordinateSystem3D& slice);
--- a/Framework/Volumes/ISlicedVolume.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Volumes/ISlicedVolume.h	Sat Nov 10 09:50:30 2018 +0100
@@ -45,7 +45,7 @@
 
       // Triggered if the content of some individual slice in the
       // source volume has changed
-      virtual void NotifySliceChange(const ISlicedVolume& volume,
+      virtual void NotifySliceContentChange(const ISlicedVolume& volume,
                                      const size_t& sliceIndex,
                                      const Slice& slice) = 0;
 
--- a/Framework/Volumes/SlicedVolumeBase.cpp	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Volumes/SlicedVolumeBase.cpp	Sat Nov 10 09:50:30 2018 +0100
@@ -38,10 +38,10 @@
     observers_.Apply(*this, &IObserver::NotifyContentChange);
   }
 
-  void SlicedVolumeBase::NotifySliceChange(const size_t& sliceIndex,
+  void SlicedVolumeBase::NotifySliceContentChange(const size_t& sliceIndex,
                                            const Slice& slice)
   {
-    observers_.Apply(*this, &IObserver::NotifySliceChange, sliceIndex, slice);
+    observers_.Apply(*this, &IObserver::NotifySliceContentChange, sliceIndex, slice);
   }
 
   void SlicedVolumeBase::NotifyVolumeReady()
--- a/Framework/Volumes/SlicedVolumeBase.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Volumes/SlicedVolumeBase.h	Sat Nov 10 09:50:30 2018 +0100
@@ -40,7 +40,7 @@
     
     virtual void NotifyContentChange();
 
-    virtual void NotifySliceChange(const size_t& sliceIndex,
+    virtual void NotifySliceContentChange(const size_t& sliceIndex,
                                    const Slice& slice);
 
     virtual void NotifyVolumeReady();
--- a/Framework/Widgets/SliceViewerWidget.cpp	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Widgets/SliceViewerWidget.cpp	Sat Nov 10 09:50:30 2018 +0100
@@ -387,7 +387,7 @@
     layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::GeometryReadyMessage>
                                    (*this, &SliceViewerWidget::OnGeometryReady));
     // currently ignore errors layer->RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::GeometryErrorMessage>(*this, &SliceViewerWidget::...));
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::SliceChangedMessage>
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::SliceContentChangedMessage>
                                    (*this, &SliceViewerWidget::OnSliceChanged));
     layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::ContentChangedMessage>
                                    (*this, &SliceViewerWidget::OnContentChanged));
@@ -580,7 +580,7 @@
   }
   
 
-  void SliceViewerWidget::OnSliceChanged(const IVolumeSlicer::SliceChangedMessage& message)
+  void SliceViewerWidget::OnSliceChanged(const IVolumeSlicer::SliceContentChangedMessage& message)
   {
     if (message.GetSlice().ContainsPlane(plane_))
     {
--- a/Framework/Widgets/SliceViewerWidget.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/Widgets/SliceViewerWidget.h	Sat Nov 10 09:50:30 2018 +0100
@@ -63,7 +63,7 @@
 
     virtual void OnContentChanged(const IVolumeSlicer::ContentChangedMessage& message);
 
-    virtual void OnSliceChanged(const IVolumeSlicer::SliceChangedMessage& message);
+    virtual void OnSliceChanged(const IVolumeSlicer::SliceContentChangedMessage& message);
 
     virtual void OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message);
 
--- a/Framework/dev.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Framework/dev.h	Sat Nov 10 09:50:30 2018 +0100
@@ -184,7 +184,7 @@
         Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
       }
 
-      SlicedVolumeBase::NotifySliceChange(sliceIndex, slice);
+      SlicedVolumeBase::NotifySliceContentChange(sliceIndex, slice);
 
       if (pendingSlices_ == 1)
       {
@@ -555,11 +555,11 @@
       VolumeSlicerBase::NotifyContentChange();
     }
 
-    virtual void NotifySliceChange(const ISlicedVolume& volume,
+    virtual void NotifySliceContentChange(const ISlicedVolume& volume,
                                    const size_t& sliceIndex,
                                    const Slice& slice)
     {
-      //VolumeSlicerBase::NotifySliceChange(slice);
+      //VolumeSlicerBase::NotifySliceContentChange(slice);
 
       // TODO Improve this?
       VolumeSlicerBase::NotifyContentChange();
@@ -730,7 +730,7 @@
     {
     }
 
-    virtual void NotifySliceChange(const ISlicedVolume& volume,
+    virtual void NotifySliceContentChange(const ISlicedVolume& volume,
                                    const size_t& sliceIndex,
                                    const Slice& slice)
     {
--- a/Resources/Graveyard/ReferenceLineFactory.cpp	Sat Nov 10 09:41:59 2018 +0100
+++ b/Resources/Graveyard/ReferenceLineFactory.cpp	Sat Nov 10 09:50:30 2018 +0100
@@ -37,7 +37,7 @@
   }
 
 
-  void ReferenceLineFactory::NotifySliceChange(const SliceViewerWidget& source,
+  void ReferenceLineFactory::NotifySliceContentChange(const SliceViewerWidget& source,
                                                const SliceGeometry& slice)
   {
     if (&source == &sibling_)
--- a/Resources/Graveyard/ReferenceLineFactory.h	Sat Nov 10 09:41:59 2018 +0100
+++ b/Resources/Graveyard/ReferenceLineFactory.h	Sat Nov 10 09:50:30 2018 +0100
@@ -42,7 +42,7 @@
     ReferenceLineFactory(SliceViewerWidget& owner,
                          SliceViewerWidget& sibling);
 
-    virtual void NotifySliceChange(const SliceViewerWidget& source,
+    virtual void NotifySliceContentChange(const SliceViewerWidget& source,
                                    const SliceGeometry& slice);
 
     void SetLayerIndex(size_t layerIndex);