X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=e366505a15fe33dcccd1db67d19d5397b5b1cd95;hb=ae4497a19b957df306e688ce3f69c3687323668e;hp=a19eeaced7830532cd768d7f46245aef6361c56f;hpb=236a8e2fee9937c050e2d16c7222e1caa993f01c;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index a19eeac..e366505 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/13 14:46:48 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2008/12/03 09:34:41 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -90,9 +90,9 @@ namespace bbwxvtk
     panel-> Layout();
 
 
-    wxvtkrenderwindowinteractor->Refresh();
-    wxvtkrenderwindowinteractor->Render();
-    imageViewer->GetRenderer()->ResetCameraClippingRange();
+    //  wxvtkrenderwindowinteractor->Refresh();
+    //  wxvtkrenderwindowinteractor->Render();
+    //  imageViewer->GetRenderer()->ResetCameraClippingRange();
 
   
   }
@@ -136,6 +136,7 @@ namespace bbwxvtk
       {
 	backImageData = mDefaultImage;
 	mUpdateCamera = true;
+	std::cout << "Viewer2DWidget::UpdateView() passe par 1" << std::endl;
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
 	      (backImageData != mBox->bbGetInputIn()) ) 
@@ -144,6 +145,7 @@ namespace bbwxvtk
 	backImageData->Update();
 	imageViewer->SetInput( backImageData );
 	mUpdateCamera = true;
+		std::cout << "Viewer2DWidget::UpdateView() passe par 2" << std::endl;
       }
 
     if (mUpdateCamera)
@@ -168,6 +170,7 @@ namespace bbwxvtk
 	//   
 	//	imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
 	mUpdateCamera = false;
+	std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl;
       }
   
     //  std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
@@ -215,10 +218,21 @@ namespace bbwxvtk
 	        z = ext[5]; // Why not?
            }
 
-            wxvtkrenderwindowinteractor->Update();
-            wxvtkrenderwindowinteractor->Render();
-            imageViewer->GetRenderer()->ResetCameraClippingRange();
-	    
+	    //	    std::cout << "V2D Render "<<std::endl;
+	    //      imageViewer->SetSliceOrientation (orientation);
+	    //	   imageViewer->SetSlice( z );
+
+	   //            wxvtkrenderwindowinteractor->Update();
+	   //            wxvtkrenderwindowinteractor->Render();
+	   //          imageViewer->GetRenderer()->ResetCameraClippingRange();
+ 
+	    //xvtkrenderwindowinteractor->Refresh();
+	    wxvtkrenderwindowinteractor->Render();
+    imageViewer->GetRenderer()->ResetCameraClippingRange();
+           imageViewer->SetSliceOrientation (orientation);
+	   imageViewer->SetSlice( z );
+
+std::cout << "Viewer2DWidget::UpdateView() passe par 4" << std::endl;	    
 /*
 	#if (VTK_MAJOR_VERSION >= 5)
 		imageViewer->SetSlice( z );
@@ -226,8 +240,8 @@ namespace bbwxvtk
 		imageViewer->SetZSlice( z );
 	#endif
 */
-           imageViewer->SetSliceOrientation (orientation);
-	   imageViewer->SetSlice( z );
+//           imageViewer->SetSliceOrientation (orientation);
+//	   imageViewer->SetSlice( z );
 		
 		//imageViewer->UpdateDisplayExtent();
   } 
@@ -260,11 +274,19 @@ namespace bbwxvtk
     // (see wxvtk/bbs/appli/ExampleSimpleSlicer)
     // I think there is a problem with rendering before window 
     // has been reparented ... we have to check this 
-
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-    bbSetOutputOut( bbGetInputSlice() );
-    bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-	
+    
+std::cout << "Viewer2D::Process() passe par 5" << std::endl;	   
+    
+	  Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
+	  
+    if (w)
+	{
+std::cout << "Viewer2D::Process() passe par 6" << std::endl;
+		w->UpdateView();
+		bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
+	}
+	  bbSetOutputOut( bbGetInputSlice() );
+	  
   }
   
 
@@ -272,6 +294,8 @@ namespace bbwxvtk
   {
     bbSetInputIn(NULL);
     bbSetInputSlice(0);
+    bbSetOutputWidget(0);
+    bbSetInputOrientation(0);
   }
 
   /**
@@ -279,32 +303,22 @@ namespace bbwxvtk
    *
    *
    */ 
-  void Viewer2D::CreateWidget()
+  void Viewer2D::CreateWidget(wxWindow* parent)
   {
-    bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<<std::endl);
+  std::cout << "Viewer2D::CreateWidget() passe par 7" << std::endl;
+    Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
 
-    Viewer2DWidget* w = new Viewer2DWidget(this,bbGetWxParent());
     bbSetOutputWidget(w);
-
-    bbtkDebugDecTab("Core",9);
   }
 
 
-  // This callback is necessary to get actual processing of the view 
+  // This callback is *no more*
+  // necessary to get actual processing of the view 
   // when window is shown
   void  Viewer2D::OnShowWidget()
   {
-
-#if defined(_WIN32)
-//    ((Viewer2DWidget*)bbGetOutputWidget())->Refresh();
-    ((Viewer2DWidget*)bbGetOutputWidget())->Update();
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-#endif
-     /*
-      // BUGS ON LINUX !!
-    ((Viewer2DWidget*)bbGetOutputWidget())->Update();
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
-    */
+    // ((Viewer2DWidget*)bbGetOutputWidget())->Update();
+    // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
   }