From: guigues <guigues>
Date: Tue, 17 Jun 2008 11:12:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~26
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3b14f0c4fe66a15679b08327f38fd4958a35c8f5;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index a42cff3..9db6a27 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/05/15 08:02:37 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/06/17 11:12:03 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -51,16 +51,32 @@ namespace bbwxvtk
 
     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
     wxvtkrenderwindowinteractor->UseCaptureMouseOn();	
+
+    imageViewer	= vtkImageViewer2::New();
+    imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
+    
+    mDefaultImage = vtkImageData::New();
+    int dim[3];
+    dim[0] = dim[1] = dim[2] = 1; 
+    mDefaultImage->SetDimensions ( dim );
+    mDefaultImage->SetSpacing(1,1,1);
+
+    mDefaultImage->SetScalarTypeToUnsignedChar();
+    mDefaultImage->AllocateScalars();    
+    for (int i=0;i<dim[0];i++) 
+      for (int j=0;j<dim[1];j++) 
+	mDefaultImage->SetScalarComponentFromFloat(i,j,0,0,0);
+
+    backImageData = mDefaultImage;
+    imageViewer->SetInput( backImageData );
+    mUpdateCamera = true;
+
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     sizer	-> Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0);
     panel	-> SetSizer(sizer);
     panel	-> SetAutoLayout(true);
     panel	-> Layout();
     
-    backImageData	= NULL;
-    imageViewer		= NULL;
-
-    
   }
   //-------------------------------------------------------------------------
   
@@ -72,6 +88,8 @@ namespace bbwxvtk
     // we want to force its destruction without taking care of vtk ref counting
     // on the contrary the following vtk objects are deleted with vtk Delete
     //    std::cout << "Viewer2DWidget::~Viewer2DWidget()" << std::endl;
+    mDefaultImage->Delete();
+
     if (backImageData)
       {
 	//	backImageData->UnRegister(NULL);
@@ -94,65 +112,53 @@ namespace bbwxvtk
     //    std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
     //   std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
 
-    if ( (mBox->bbGetInputIn()!=NULL) &&
-	 (backImageData != mBox->bbGetInputIn()) )
+    if ( ( mBox->bbGetInputIn() == NULL ) &&
+	 ( backImageData != mDefaultImage ) )
+      {
+	backImageData = mDefaultImage;
+	mUpdateCamera = true;
+      }
+    else if ( ( mBox->bbGetInputIn() != NULL ) && 
+	      (backImageData != mBox->bbGetInputIn()) ) 
       {
-	if (imageViewer==NULL)
-	  {
-	    imageViewer	= vtkImageViewer2::New();
-	    imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
-	  }
-	
-	//	std::cout << "V2D b="<<backImageData<<std::endl;
-
-
-	if (backImageData) 
-	  {
-	    //	    std::cout << "V2D r1="<<backImageData->GetReferenceCount()<<std::endl;
-	    //	    backImageData->DebugOn();
-	    //	    backImageData->UnRegister(NULL);
-	  }
 	backImageData = mBox->bbGetInputIn();
-
-
-	//	std::cout << "V2D r2="<<backImageData->GetReferenceCount()<<std::endl;
-	//	backImageData->DebugOn();
-	//	backImageData->PrintSelf(std::cout,0);
-
-	// backImageData->Register(NULL);
-	imageViewer->SetInput( backImageData );
 	backImageData->Update();
+	imageViewer->SetInput( backImageData );
+	mUpdateCamera = true;
+      }
 
+    if (mUpdateCamera)
+      {
 	int x1,x2,y1,y2,z1,z2;
 	double spx,spy,spz;
 	backImageData->GetSpacing(spx,spy,spz);
 	backImageData->GetExtent (x1,x2,y1,y2,z1,z2);
 	
-	bbtkMessage("Output",2,"Viewer2D '"<<mBox->bbGetName()<<"' - Image :"<<std::endl);
-	bbtkMessage("Output",2," extent  = "<< x1<<"-"<<x2<<" x "<<y1<<"-"<<y2<<" x "<<z1<<"-"<<z2<<std::endl);
-	bbtkMessage("Output",2," spacing = "<<spx << " - "<< spy << " - "<<spz<<std::endl);
-
+	//	bbtkMessage("Output",2,"Viewer2D '"<<mBox->bbGetName()<<"' - Image :"<<std::endl);
+	//	std::cout << " extent  = "<< x1<<"-"<<x2<<" x "<<y1<<"-"<<y2<<" x "<<z1<<"-"<<z2<<std::endl;
+	//	std::cout << " spacing = "<<spx << " - "<< spy << " - "<<spz<<std::endl;
+	
 	vtkCamera *camera = imageViewer->GetRenderer()->GetActiveCamera();
 
 	camera->SetViewUp ( spx*0, -spy*1, spz*0);
 	camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000); 
 	camera->SetFocalPoint	( spx*(x1+x2)/2	, spy*(y1+y2)/2	, spz*0); 
 
-
 	camera->ComputeViewPlaneNormal();
 	camera->SetParallelScale(  spx*(x2-x1)/2.0 );
-	//		imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
+	//   
+	//	imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
+	mUpdateCamera = false;
       }
   
-    //    std::cout << "update"<<std::endl;   
-    //    std::cout << "OW = "<< mBox->bbGetWindow() << 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 ((imageViewer!=NULL)&&
+    if (
 	(backImageData!=NULL)&&
 	(mBox->bbIsShown()))
       {
@@ -165,19 +171,8 @@ namespace bbwxvtk
 
 	if (z<ext[4]) { z=ext[4]; }
 	if (z>=ext[5]) { z=ext[5]-1; }
-	// LG : SetZSlice does not exist anymore in vtk 5 !
-	/*
-#if (VTK_MAJOR_VERSION >= 5)
-	imageViewer->SetSlice( 0 );
-#else
-	imageViewer->SetZSlice( 0 );
-#endif
 
 
-	
-	wxvtkrenderwindowinteractor->Render();
-	*/
-
 #if (VTK_MAJOR_VERSION >= 5)
 	imageViewer->SetSlice( z );
 #else
@@ -189,7 +184,6 @@ namespace bbwxvtk
 
     
 
-    //Refresh();
   }
 
 
@@ -201,6 +195,8 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
+
+
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
 
@@ -216,6 +212,11 @@ namespace bbwxvtk
   }
   
 
+  void Viewer2D::bbUserConstructor()
+  {
+    bbSetInputIn(0);
+  }
+
   /**
    * \brief  Create wxWidget . 
    *
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index 1f7dc82..b5e92ae 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:53 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/06/17 11:12:03 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -62,8 +62,9 @@ namespace bbwxvtk
     Viewer2D                     *mBox;
     vtkImageViewer2		 *imageViewer;
     vtkImageData		 *backImageData;
+    vtkImageData		 *mDefaultImage;
     wxVTKRenderWindowInteractor  *wxvtkrenderwindowinteractor;
-
+    bool mUpdateCamera;
     vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
 
   };
@@ -84,6 +85,7 @@ namespace bbwxvtk
     BBTK_CREATE_WIDGET(CreateWidget);
     void CreateWidget();
     void bbUserOnShow();
+    void bbUserConstructor();
   };
    
   //=================================================================