--- a/Framework/Widgets/LayerWidget.h	Wed May 24 12:42:08 2017 +0200
+++ b/Framework/Widgets/LayerWidget.h	Wed May 24 21:13:29 2017 +0200
@@ -30,7 +30,7 @@
 {
   class LayerWidget :
     public WorldSceneWidget,
-    public ILayerSource::IObserver   // TODO move this as PImpl
+    private ILayerSource::IObserver
   {
   private:
     class Scene;
@@ -50,6 +50,23 @@
     bool LookupLayer(size_t& index /* out */,
                      ILayerSource& layer) const;
     
+
+    virtual void NotifyGeometryReady(ILayerSource& source);
+
+    virtual void NotifyGeometryError(ILayerSource& source);
+
+    virtual void NotifySourceChange(ILayerSource& source);
+
+    virtual void NotifySliceChange(ILayerSource& source,
+                                   const Slice& slice);
+
+    virtual void NotifyLayerReady(ILayerRenderer* renderer,
+                                  ILayerSource& source,
+                                  const Slice& slice);
+
+    virtual void NotifyLayerError(ILayerSource& source,
+                                  const SliceGeometry& slice);
+
         
   protected:
     virtual void GetSceneExtent(double& x1,
@@ -64,7 +81,7 @@
 
     void UpdateLayer(size_t index,
                      ILayerRenderer* renderer,
-                     const SliceGeometry& slice);
+                     const Slice& slice);
     
   public:
     LayerWidget();
@@ -79,20 +96,6 @@
     void SetSlice(const SliceGeometry& slice,
                   double sliceThickness);
 
-    virtual void NotifyGeometryReady(ILayerSource& source);
-
-    virtual void NotifySourceChange(ILayerSource& source);
-
-    virtual void NotifySliceChange(ILayerSource& source,
-                                   const SliceGeometry& slice);
-
-    virtual void NotifyLayerReady(ILayerRenderer* renderer,
-                                  ILayerSource& source,
-                                  const SliceGeometry& viewportSlice);
-
-    virtual void NotifyLayerError(ILayerSource& source,
-                                  const SliceGeometry& viewportSlice);
-
     virtual void Start();
   };
 }