New widget pipeline : progressing ...

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer3D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index bb2d69394acfddbe9ef519697d4ba4b357932734..41e76ab2e2b0a92e3b479e84962af7fd683480aa 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/10 19:19:55 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/11/25 11:17:28 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -97,7 +97,9 @@ namespace bbwxvtk
   //-------------------------------------------------------------------------
   void Viewer3DWidget::Update()
   {
+    wxvtkrenderwindowinteractor->Update();
     wxvtkrenderwindowinteractor->Render();
+    renderer->ResetCameraClippingRange();
   }
   //-------------------------------------------------------------------------
 
@@ -115,6 +117,13 @@ namespace bbwxvtk
   }
   //-------------------------------------------------------------------------
 
+void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
+{
+//  wxPanel::Refresh(false,rect);
+}
+
+
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
@@ -138,12 +147,14 @@ namespace bbwxvtk
     bbSetInputStereo(false);
     bbSetOutputRenderer( NULL );
     bbSetOutputInteractor( NULL );
+    bbSetOutputWidget(NULL);
   }
 
 
   void Viewer3D::Process() 
   { 
-    ((Viewer3DWidget*)bbGetOutputWidget())->Update();
+    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+    if (w) w->Update();
   }
   
 
@@ -152,11 +163,13 @@ namespace bbwxvtk
    *
    *
    */ 
-  void Viewer3D::CreateWidget()
+  void Viewer3D::CreateWidget(wxWindow* parent)
   {
     bbtkDebugMessageInc("Core",9,"Viewer3D::CreateWidget()"<<std::endl);
 
-    Viewer3DWidget* w = new Viewer3DWidget(this,bbGetWxParent(),bbGetInputStereo());
+    Viewer3DWidget* w = new Viewer3DWidget(this,parent,
+                                                                                  //bbGetWxParent(),
+                                                                                  bbGetInputStereo());
     w->Update();
     
 
@@ -210,6 +223,14 @@ namespace bbwxvtk
     
   }
 
+  // This callback is necessary to get actual processing of the view 
+  // when window is shown
+  void  Viewer3D::OnShowWidget()
+  {
+    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+    if (w) w->Update();
+  }
+
 
 }//namespace bbwxvtk