diff Framework/Widgets/SliceViewerWidget.h @ 726:4f2416d519b4

moving layers, widgets and loaders to Deprecated namespace
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 May 2019 11:43:25 +0200
parents d2c0e347ddc2
children
line wrap: on
line diff
--- a/Framework/Widgets/SliceViewerWidget.h	Mon May 20 16:26:34 2019 +0200
+++ b/Framework/Widgets/SliceViewerWidget.h	Tue May 21 11:43:25 2019 +0200
@@ -28,12 +28,12 @@
 
 #include <map>
 
-namespace OrthancStone
+namespace Deprecated
 {
   class SliceViewerWidget :
     public WorldSceneWidget,
-    public IObserver,
-    public IObservable
+    public OrthancStone::IObserver,
+    public OrthancStone::IObservable
   {
   public:
     ORTHANC_STONE_DEFINE_ORIGIN_MESSAGE(__FILE__, __LINE__, GeometryChangedMessage, SliceViewerWidget);
@@ -41,7 +41,7 @@
 
 
     // TODO - Use this message in ReferenceLineSource
-    class DisplayedSliceMessage : public OriginMessage<SliceViewerWidget>
+    class DisplayedSliceMessage : public OrthancStone::OriginMessage<SliceViewerWidget>
     {
       ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
       
@@ -74,7 +74,7 @@
     LayersIndex                  layersIndex_;
     std::vector<IVolumeSlicer*>  layers_;
     std::vector<RenderStyle>     styles_;
-    CoordinateSystem3D           plane_;
+    OrthancStone::CoordinateSystem3D           plane_;
     std::auto_ptr<Scene>         currentScene_;
     std::auto_ptr<Scene>         pendingScene_;
     std::vector<bool>            changedLayers_;
@@ -82,7 +82,7 @@
     bool LookupLayer(size_t& index /* out */,
                      const IVolumeSlicer& layer) const;
 
-    void GetLayerExtent(Extent2D& extent,
+    void GetLayerExtent(OrthancStone::Extent2D& extent,
                         IVolumeSlicer& source) const;
 
     void OnGeometryReady(const IVolumeSlicer::GeometryReadyMessage& message);
@@ -100,20 +100,20 @@
     void ResetChangedLayers();
 
   public:
-    SliceViewerWidget(MessageBroker& broker, 
+    SliceViewerWidget(OrthancStone::MessageBroker& broker, 
                       const std::string& name);
 
-    virtual Extent2D GetSceneExtent();
+    virtual OrthancStone::Extent2D GetSceneExtent();
 
   protected:
-    virtual bool RenderScene(CairoContext& context,
+    virtual bool RenderScene(OrthancStone::CairoContext& context,
                              const ViewportGeometry& view);
 
     void ResetPendingScene();
 
     void UpdateLayer(size_t index,
                      ILayerRenderer* renderer,
-                     const CoordinateSystem3D& plane);
+                     const OrthancStone::CoordinateSystem3D& plane);
 
     void InvalidateAllLayers();
 
@@ -138,9 +138,9 @@
     void SetLayerStyle(size_t layer,
                        const RenderStyle& style);
 
-    void SetSlice(const CoordinateSystem3D& plane);
+    void SetSlice(const OrthancStone::CoordinateSystem3D& plane);
 
-    const CoordinateSystem3D& GetSlice() const
+    const OrthancStone::CoordinateSystem3D& GetSlice() const
     {
       return plane_;
     }