Mercurial > hg > orthanc-stone

diff Framework/Widgets/SliceViewerWidget.cpp @ 396:ed7146fa2c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename ILayerSource as IVolumeSlicer, and OrthancFrameLayerSource as as DicomSeriesVolumeSlicer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 10 Nov 2018 09:29:08 +0100
parents 17d54c028805
children 885e1ebd315c
line wrap: on
line diff
--- a/Framework/Widgets/SliceViewerWidget.cpp	Sat Nov 10 09:14:12 2018 +0100
+++ b/Framework/Widgets/SliceViewerWidget.cpp	Sat Nov 10 09:29:08 2018 +0100
@@ -237,7 +237,7 @@
 
   
   bool SliceViewerWidget::LookupLayer(size_t& index /* out */,
-                                      const ILayerSource& layer) const
+                                      const IVolumeSlicer& layer) const
   {
     LayersIndex::const_iterator found = layersIndex_.find(&layer);
 
@@ -256,7 +256,7 @@
 
 
   void SliceViewerWidget::GetLayerExtent(Extent2D& extent,
-                                         ILayerSource& source) const
+                                         IVolumeSlicer& source) const
   {
     extent.Reset();
 
@@ -382,23 +382,23 @@
     }
   }
   
-  void SliceViewerWidget::ObserveLayer(ILayerSource& layer)
+  void SliceViewerWidget::ObserveLayer(IVolumeSlicer& layer)
   {
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::GeometryReadyMessage>
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::GeometryReadyMessage>
                                    (*this, &SliceViewerWidget::OnGeometryReady));
-    // currently ignore errors layer->RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::GeometryErrorMessage>(*this, &SliceViewerWidget::...));
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::SliceChangedMessage>
+    // currently ignore errors layer->RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::GeometryErrorMessage>(*this, &SliceViewerWidget::...));
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::SliceChangedMessage>
                                    (*this, &SliceViewerWidget::OnSliceChanged));
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::ContentChangedMessage>
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::ContentChangedMessage>
                                    (*this, &SliceViewerWidget::OnContentChanged));
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::LayerReadyMessage>
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::LayerReadyMessage>
                                    (*this, &SliceViewerWidget::OnLayerReady));
-    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, ILayerSource::LayerErrorMessage>
+    layer.RegisterObserverCallback(new Callable<SliceViewerWidget, IVolumeSlicer::LayerErrorMessage>
                                    (*this, &SliceViewerWidget::OnLayerError));
   }
 
 
-  size_t SliceViewerWidget::AddLayer(ILayerSource* layer)  // Takes ownership
+  size_t SliceViewerWidget::AddLayer(IVolumeSlicer* layer)  // Takes ownership
   {
     if (layer == NULL)
     {
@@ -420,7 +420,7 @@
   }
 
 
-  void SliceViewerWidget::ReplaceLayer(size_t index, ILayerSource* layer)  // Takes ownership
+  void SliceViewerWidget::ReplaceLayer(size_t index, IVolumeSlicer* layer)  // Takes ownership
   {
     if (layer == NULL)
     {
@@ -451,7 +451,7 @@
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }
 
-    ILayerSource* previousLayer = layers_[index];
+    IVolumeSlicer* previousLayer = layers_[index];
     layersIndex_.erase(layersIndex_.find(previousLayer));
     layers_.erase(layers_.begin() + index);
     changedLayers_.erase(changedLayers_.begin() + index);
@@ -528,7 +528,7 @@
   }
 
 
-  void SliceViewerWidget::OnGeometryReady(const ILayerSource::GeometryReadyMessage& message)
+  void SliceViewerWidget::OnGeometryReady(const IVolumeSlicer::GeometryReadyMessage& message)
   {
     size_t i;
     if (LookupLayer(i, message.GetOrigin()))
@@ -568,7 +568,7 @@
   }
 
 
-  void SliceViewerWidget::OnContentChanged(const ILayerSource::ContentChangedMessage& message)
+  void SliceViewerWidget::OnContentChanged(const IVolumeSlicer::ContentChangedMessage& message)
   {
     size_t index;
     if (LookupLayer(index, message.GetOrigin()))
@@ -580,7 +580,7 @@
   }
   
 
-  void SliceViewerWidget::OnSliceChanged(const ILayerSource::SliceChangedMessage& message)
+  void SliceViewerWidget::OnSliceChanged(const IVolumeSlicer::SliceChangedMessage& message)
   {
     if (message.GetSlice().ContainsPlane(plane_))
     {
@@ -595,7 +595,7 @@
   }
   
   
-  void SliceViewerWidget::OnLayerReady(const ILayerSource::LayerReadyMessage& message)
+  void SliceViewerWidget::OnLayerReady(const IVolumeSlicer::LayerReadyMessage& message)
   {
     size_t index;
     if (LookupLayer(index, message.GetOrigin()))
@@ -608,7 +608,7 @@
   }
 
 
-  void SliceViewerWidget::OnLayerError(const ILayerSource::LayerErrorMessage& message)
+  void SliceViewerWidget::OnLayerError(const IVolumeSlicer::LayerErrorMessage& message)
   {
     size_t index;
     if (LookupLayer(index, message.GetOrigin()))