# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1494408846 -7200
# Node ID d2adc6189a95a7390a273e8869ad1a31906e5199
# Parent  468c48eaa01c9280bc06c234dc6ab5c648c70974
refactoring

diff -r 468c48eaa01c -r d2adc6189a95 Applications/Samples/SampleInteractor.h
--- a/Applications/Samples/SampleInteractor.h	Wed May 03 17:35:52 2017 +0200
+++ b/Applications/Samples/SampleInteractor.h	Wed May 10 11:34:06 2017 +0200
@@ -82,7 +82,6 @@
       }
 
       virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget,
-                                                          const SliceGeometry& slice,
                                                           const ViewportGeometry& view,
                                                           MouseButton button,
                                                           double x,
@@ -92,17 +91,8 @@
         return NULL;
       }
 
-      virtual bool HasMouseOver(const WorldSceneWidget& widget,
-                                const SliceGeometry& slice,
-                                double x,
-                                double y)
-      {
-        return false;
-      }
-      
       virtual void MouseOver(CairoContext& context,
                              WorldSceneWidget& widget,
-                             const SliceGeometry& slice,
                              const ViewportGeometry& view,
                              double x,
                              double y,
diff -r 468c48eaa01c -r d2adc6189a95 Framework/Widgets/IWorldSceneInteractor.h
--- a/Framework/Widgets/IWorldSceneInteractor.h	Wed May 03 17:35:52 2017 +0200
+++ b/Framework/Widgets/IWorldSceneInteractor.h	Wed May 10 11:34:06 2017 +0200
@@ -40,7 +40,6 @@
     }
     
     virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget,
-                                                        const SliceGeometry& slice,
                                                         const ViewportGeometry& view,
                                                         MouseButton button,
                                                         double x,
@@ -49,7 +48,6 @@
 
     virtual void MouseOver(CairoContext& context,
                            WorldSceneWidget& widget,
-                           const SliceGeometry& slice,
                            const ViewportGeometry& view,
                            double x,
                            double y,
diff -r 468c48eaa01c -r d2adc6189a95 Framework/Widgets/LayeredSceneWidget.h
--- a/Framework/Widgets/LayeredSceneWidget.h	Wed May 03 17:35:52 2017 +0200
+++ b/Framework/Widgets/LayeredSceneWidget.h	Wed May 10 11:34:06 2017 +0200
@@ -73,7 +73,7 @@
 
     virtual ~LayeredSceneWidget();
 
-    virtual SliceGeometry GetSlice();
+    SliceGeometry GetSlice();
 
     ILayerRendererFactory& AddLayer(size_t& layerIndex,
                                     ILayerRendererFactory* factory);   // Takes ownership
diff -r 468c48eaa01c -r d2adc6189a95 Framework/Widgets/TestWorldSceneWidget.cpp
--- a/Framework/Widgets/TestWorldSceneWidget.cpp	Wed May 03 17:35:52 2017 +0200
+++ b/Framework/Widgets/TestWorldSceneWidget.cpp	Wed May 10 11:34:06 2017 +0200
@@ -31,7 +31,6 @@
     {
     public:
       virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget,
-                                                          const SliceGeometry& slice,
                                                           const ViewportGeometry& view,
                                                           MouseButton button,
                                                           double x,
@@ -50,7 +49,6 @@
 
       virtual void MouseOver(CairoContext& context,
                              WorldSceneWidget& widget,
-                             const SliceGeometry& slice,
                              const ViewportGeometry& view,
                              double x,
                              double y,
diff -r 468c48eaa01c -r d2adc6189a95 Framework/Widgets/WorldSceneWidget.cpp
--- a/Framework/Widgets/WorldSceneWidget.cpp	Wed May 03 17:35:52 2017 +0200
+++ b/Framework/Widgets/WorldSceneWidget.cpp	Wed May 10 11:34:06 2017 +0200
@@ -368,7 +368,7 @@
   {
     if (interactor_)
     {
-      interactor_->MouseOver(context, *this, GetSlice(), view, x, y, GetStatusBar());
+      interactor_->MouseOver(context, *this, view, x, y, GetStatusBar());
     }
   }
 
@@ -380,7 +380,7 @@
   {
     if (interactor_)
     {
-      return interactor_->CreateMouseTracker(*this, GetSlice(), view, button, x, y, GetStatusBar());
+      return interactor_->CreateMouseTracker(*this, view, button, x, y, GetStatusBar());
     }
     else
     {
diff -r 468c48eaa01c -r d2adc6189a95 Framework/Widgets/WorldSceneWidget.h
--- a/Framework/Widgets/WorldSceneWidget.h	Wed May 03 17:35:52 2017 +0200
+++ b/Framework/Widgets/WorldSceneWidget.h	Wed May 10 11:34:06 2017 +0200
@@ -96,11 +96,6 @@
       observers_.Unregister(observer);
     }
 
-    virtual SliceGeometry GetSlice()
-    {
-      return SliceGeometry();
-    }
-
     virtual void SetSize(unsigned int width,
                          unsigned int height);