X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=a6ecfa24a8c843b6310cb655c39acd4cf2011718;hb=50a1ea04e85dcca944eceff2524e8ca06e373a63;hp=18882c41f787e5f0069f810776e2ffd671b280b7;hpb=6415d635327ce5d9058a45cc6f350551af2adff5;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 18882c4..a6ecfa2 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/03/03 13:14:27 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/18 12:59:53 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -75,7 +75,7 @@ namespace bbwxvtk
 
 
 
-  void Viewer2DWidget::Update()
+  void Viewer2DWidget::UpdateView()
   {
 
     if (imageViewer==NULL){
@@ -116,14 +116,22 @@ namespace bbwxvtk
 	//		imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
       }
   
-  
-    if (backImageData!=NULL)
+    //    std::cout << "update"<<std::endl;   
+    //    std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
+    //    std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
+    //    std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
+
+    // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
+    // created and displayed. 
+    // Else when slice != 0 we get an X Window System error with wxGTK
+    if ((backImageData!=NULL)&&(mBox->bbIsShown()))
       {
 	int z = mBox->bbGetInputSlice();
-
+	//	std::cout << "slice = "<<z<<std::endl;
 	int ext[6];
 	backImageData->GetWholeExtent(ext);
 
+	//	std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
 
 	if (z<ext[4]) { z=ext[4]; }
 	if (z>=ext[5]) { z=ext[5]-1; }
@@ -135,12 +143,14 @@ namespace bbwxvtk
 	imageViewer->SetZSlice( z );
 #endif
 
+
       }
     
     wxvtkrenderwindowinteractor->Render();
     //    wxvtkrenderwindowinteractor->Refresh();
     
-    //    Refresh();
+
+    //Refresh();
   }
 
 
@@ -152,12 +162,12 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
 
   void Viewer2D::Process() 
   { 
-    ((Viewer2DWidget*)bbGetOutputWidget())->Update();
+    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
     bbSetOutputOut( bbGetInputSlice() );
   }
   
@@ -172,13 +182,20 @@ namespace bbwxvtk
     bbtkDebugMessageInc("Core",9,"Viewer2D::CreateWidget()"<<std::endl);
 
     Viewer2DWidget* w = new Viewer2DWidget(this,bbGetWxParent());
-    w->Update();
     bbSetOutputWidget(w);
 
     bbtkDebugDecTab("Core",9);
   }
 
 
+  // This callback is necessary to get actual processing of the view 
+  // when window is shown
+  void  Viewer2D::bbUserOnShow()
+  {
+    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
+  }
+  
+
 }//namespace bbtk
 
 #endif