X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.cxx;h=67df2857932a885a202ca5e5bb518460bdab53f6;hb=a33ac70f8c32efdcef70b39a444117e1901086ca;hp=d856439593b1756c4f13b306f3feb960a36a30fa;hpb=1d7d678c035d92c649daa6718d57abc27f96f704;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index d856439..67df285 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 13:18:38 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/07/08 15:18:25 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -87,6 +87,8 @@ namespace bbwxvtk
   //-------------------------------------------------------------------------
   Viewer3DWidget::~Viewer3DWidget()
   {
+    mBox->DisableObservers();
+    mBox->bbSetOutputWidget(NULL);
     renderwindow->Delete();
     renderer->Delete();
     interactorstyle->Delete();
@@ -132,29 +134,147 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
 
-  void Viewer3D::bbUserConstructor() 
-  { 
-    bbSetInputIn1(NULL);
-    bbSetInputIn2(NULL);
-    bbSetInputIn3(NULL);
-    bbSetInputIn4(NULL);
-    bbSetInputIn5(NULL);
-    bbSetInputObs1(NULL);
-    bbSetInputObs2(NULL);
-    bbSetInputObs3(NULL);
-    bbSetInputObs4(NULL);
-    bbSetInputObs5(NULL);
-    bbSetInputStereo(false);
-    bbSetOutputRenderer( NULL );
-    bbSetOutputInteractor( NULL );
-    bbSetOutputWidget(NULL);
-  }
-
-
+	
+	//-----------------------------------------------------------------	
+	void Viewer3D::bbUserSetDefaultValues()
+	{ 
+		firsttime=true;
+		bbSetInputIn1(NULL);
+		bbSetInputIn2(NULL);
+		bbSetInputIn3(NULL);
+		bbSetInputIn4(NULL);
+		bbSetInputIn5(NULL);
+		bbSetInputObs1(NULL);
+		bbSetInputObs2(NULL);
+		bbSetInputObs3(NULL);
+		bbSetInputObs4(NULL);
+		bbSetInputObs5(NULL);
+		bbSetInputStereo(false);
+		bbSetOutputRenderer( NULL );
+		bbSetOutputInteractor( NULL );
+		bbSetOutputWidget(NULL);
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer3D::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer3D::bbUserFinalizeProcessing()
+	{  
+	  DisableObservers();
+	}
+
+	void Viewer3D::DisableObservers()
+	{  
+	  Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+	  if (w!=NULL)
+	    { 
+	      vtkRenderWindowInteractor *interactor = w->GetInteractor();
+	      if (interactor!=NULL)
+		{
+		  if (bbGetInputObs1()!=NULL) 
+		    {
+		      if (bbGetInputObs1()->GetInteractor()!=NULL)
+			bbGetInputObs1()->EnabledOff();
+		    }
+		  if (bbGetInputObs2()!=NULL) 
+		    {
+		      if (bbGetInputObs2()->GetInteractor()!=NULL)
+		  //bbGetInputObs2()->SetInteractor(NULL);
+		      bbGetInputObs2()->EnabledOff();
+		    }
+		  if (bbGetInputObs3()!=NULL) 
+		    {
+		     if (bbGetInputObs3()->GetInteractor()!=NULL)
+		   //bbGetInputObs3()->SetInteractor(NULL);
+		      bbGetInputObs3()->EnabledOff();
+		    }
+		  if (bbGetInputObs4()!=NULL) 
+		    {
+		     if (bbGetInputObs4()->GetInteractor()!=NULL)
+		   //bbGetInputObs4()->SetInteractor(NULL);
+		      bbGetInputObs4()->EnabledOff();
+		    }
+		  if (bbGetInputObs5()!=NULL) 
+		    {
+		   if (bbGetInputObs5()->GetInteractor()!=NULL)
+		     //bbGetInputObs5()->SetInteractor(NULL);
+		      bbGetInputObs5()->EnabledOff();
+		    }
+		}	
+	    }
+	}
+	
+	//--------------------------------------------------------------------------
   void Viewer3D::Process() 
   { 
+    if (!bbIsShown()) return;
+//EED	  
+//	  Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+//	  if (w)   w->Update();
+
+	  
+	  
     Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
-    if (w) w->Update();
+	  if ((firsttime==true) && (w!=NULL)){ 
+		  firsttime=false;
+		  
+		  vtkRenderWindowInteractor *interactor = w->GetInteractor();
+		  if (interactor!=NULL)
+		  {
+
+			  if (bbGetInputObs1()!=NULL) 
+			  {
+				  bbGetInputObs1()->SetInteractor(interactor);
+				  bbGetInputObs1()->EnabledOn();
+			  }
+			  if (bbGetInputObs2()!=NULL) 
+			  {
+				  bbGetInputObs2()->SetInteractor(interactor);
+				  bbGetInputObs2()->EnabledOn();
+			  }
+			  if (bbGetInputObs3()!=NULL) 
+			  {
+				  bbGetInputObs3()->SetInteractor(interactor);
+				  bbGetInputObs3()->EnabledOn();
+			  }
+			  if (bbGetInputObs4()!=NULL) 
+			  {
+				  bbGetInputObs4()->SetInteractor(interactor);
+				  bbGetInputObs4()->EnabledOn();
+			  }
+			  if (bbGetInputObs5()!=NULL) 
+			  {
+				  bbGetInputObs5()->SetInteractor(interactor);
+				  bbGetInputObs5()->EnabledOn();
+			  }
+			  bbSetOutputInteractor(  w->GetInteractor() );
+		  } // interactor
+	
+		  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();
+			  double bounds[6];
+			  renderer->ComputeVisiblePropBounds(bounds);
+			  renderer->ResetCameraClippingRange(bounds);
+			  
+		  } // renderer
+		  
+		  		  
+	  } // w && firsttime
+
+	  if (w!=NULL)   w->Update();
+
   }
   
 
@@ -165,58 +285,16 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
    */ 
   void Viewer3D::CreateWidget(wxWindow* parent)
   {
+ 
     bbtkDebugMessageInc("Core",9,"Viewer3D::CreateWidget()"<<std::endl);
 
-    Viewer3DWidget* w = new Viewer3DWidget(this,parent,
-										   //bbGetWxParent(),
-										   bbGetInputStereo());
-    w->Update();
-    
-
-    vtkRenderWindowInteractor *interactor = w->GetInteractor();
-    if (interactor!=NULL)
-      {
-	if (bbGetInputObs1()!=NULL) 
-	  {
-	    bbGetInputObs1()->SetInteractor(interactor);
-	    bbGetInputObs1()->EnabledOn();
-	  }
-	if (bbGetInputObs2()!=NULL) 
-	  {
-	    bbGetInputObs2()->SetInteractor(interactor);
-	    bbGetInputObs2()->EnabledOn();
-	  }
-	if (bbGetInputObs3()!=NULL) 
-	  {
-	    bbGetInputObs3()->SetInteractor(interactor);
-	    bbGetInputObs3()->EnabledOn();
-	  }
-	if (bbGetInputObs4()!=NULL) 
-	  {
-	    bbGetInputObs4()->SetInteractor(interactor);
-	    bbGetInputObs4()->EnabledOn();
-	  }
-	if (bbGetInputObs5()!=NULL) 
-	  {
-	    bbGetInputObs5()->SetInteractor(interactor);
-	    bbGetInputObs5()->EnabledOn();
-	  }
-	bbSetOutputInteractor(  w->GetInteractor() );
-      }
-        
-
-    vtkRenderer *renderer = w->GetRenderer();
-    if (renderer!=NULL)
-      {
-	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 );
-	  }
-
+    Viewer3DWidget* w = new Viewer3DWidget(this,
+					   parent,
+					   //bbGetWxParent(),
+					   bbGetInputStereo());
+    //EED  w->Update();
+    //...
+	  
     bbSetOutputWidget(w);
     
     bbtkDebugDecTab("Core",9);
@@ -227,7 +305,8 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
   // when window is shown
   void  Viewer3D::OnShowWidget()
   {
-    //    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+    Process();
+	//    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
     //    if (w) w->Update();
   }