X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.cxx;h=73b75560c5fc8131f6fc8625a2ce5a4fc9404284;hb=bfd7e9034cbfd9c535e98ccb302c08e5e42da8c6;hp=41e76ab2e2b0a92e3b479e84962af7fd683480aa;hpb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;p=bbtk.git diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx index 41e76ab..73b7556 100644 --- 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/11/25 11:17:28 $ - Version: $Revision: 1.11 $ + Date: $Date: 2008/12/03 13:35:35 $ + Version: $Revision: 1.13 $ 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,7 @@ namespace bbwxvtk //------------------------------------------------------------------------- void Viewer3DWidget::Update() { - wxvtkrenderwindowinteractor->Update(); + // wxvtkrenderwindowinteractor->Update(); wxvtkrenderwindowinteractor->Render(); renderer->ResetCameraClippingRange(); } @@ -208,13 +208,18 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) vtkRenderer *renderer = w->GetRenderer(); if (renderer!=NULL) { + bbSetOutputRenderer( renderer ); + if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); } if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); } if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); } if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); } if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); } renderer->ResetCamera(); - bbSetOutputRenderer( renderer ); + double bounds[6]; + renderer->ComputeVisiblePropBounds(bounds); + renderer->ResetCameraClippingRange(bounds); + } bbSetOutputWidget(w); @@ -227,8 +232,8 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) // when window is shown void Viewer3D::OnShowWidget() { - Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); - if (w) w->Update(); + // Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); + // if (w) w->Update(); }