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

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index e366505..a8c63ee 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/12/03 09:34:41 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2008/12/09 12:54:07 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -53,7 +53,7 @@ namespace bbwxvtk
     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
     wxvtkrenderwindowinteractor->UseCaptureMouseOn();	
 
-    imageViewer	= vtkImageViewer2::New();
+    imageViewer	= wxvtkImageViewer2::New();
     imageViewer->SetSlice( 1 );
     imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
     
@@ -94,7 +94,8 @@ namespace bbwxvtk
     //  wxvtkrenderwindowinteractor->Render();
     //  imageViewer->GetRenderer()->ResetCameraClippingRange();
 
-  
+    imageViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
+
   }
   //-------------------------------------------------------------------------
   
@@ -129,36 +130,53 @@ namespace bbwxvtk
   {
     //    std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
     //   std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
-
-
+    
+    
     if ( ( mBox->bbGetInputIn() == NULL ) &&
 	 ( backImageData != mDefaultImage ) )
       {
+	// 
+	//	std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)"
+	//		  <<std::endl;
 	backImageData = mDefaultImage;
 	mUpdateCamera = true;
-	std::cout << "Viewer2DWidget::UpdateView() passe par 1" << std::endl;
+
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
-	      (backImageData != mBox->bbGetInputIn()) ) 
+	      ( mBox->bbGetInputStatus("In") != bbtk::UPTODATE  )
+	      )
+	      //(backImageData != mBox->bbGetInputIn()) ) 
       {
+	//	std::cout << "** Viewer2DWidget::UpdateView() : Input changed"
+	//		  <<std::endl;
 	backImageData = mBox->bbGetInputIn();
 	backImageData->Update();
 	imageViewer->SetInput( backImageData );
 	mUpdateCamera = true;
-		std::cout << "Viewer2DWidget::UpdateView() passe par 2" << std::endl;
       }
 
     if (mUpdateCamera)
       {
+	//	std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
+	//		  <<std::endl;
 	int x1,x2,y1,y2,z1,z2;
 	double spx,spy,spz;
 	backImageData->GetSpacing(spx,spy,spz);
 	backImageData->GetExtent (x1,x2,y1,y2,z1,z2);
 	
+	double *range = backImageData->GetScalarRange();
+	imageViewer->SetColorWindow(range[1] - range[0]);
+	imageViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+
+	imageViewer->GetRenderer()->ResetCamera();
+	double bounds[6];
+	imageViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
+	imageViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	
 	//	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 );
@@ -170,8 +188,17 @@ namespace bbwxvtk
 	//   
 	//	imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
 	mUpdateCamera = false;
-	std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl;
-      }
+	//	std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl;
+	imageViewer->SetColorWindow(512);
+	imageViewer->SetColorLevel(256);
+  	*/
+	 /*
+	for (int i=0;i<10;i++)
+	  for (int j=0;j<10;j++)
+	    std::cout << mBox->bbGetInputIn()->GetScalarComponentAsFloat(i,j,0,0)
+		      << std::endl;
+	 */
+    }
   
     //  std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
     //  std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
@@ -179,7 +206,7 @@ namespace bbwxvtk
     
     int orientation = mBox->bbGetInputOrientation();
     if (orientation<0 || orientation>2) {
-       bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
+      bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
        orientation=2; // Why not?      
     }
     // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
@@ -193,9 +220,12 @@ namespace bbwxvtk
 		//	std::cout << "slice = "<<z<<std::endl;
 		int ext[6];
 		backImageData->GetWholeExtent(ext);
-
-		//	std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
-
+		/*
+		std::cout << "ext = "<<ext[0]<<" - "<<ext[1]<<" ; "
+			  <<ext[2]<<" - "<<ext[3]<<" ; "
+			  <<ext[4]<<" - "<<ext[5]
+			  <<std::endl;
+		*/
             switch(orientation){
 	       case 0:
 		if (z<ext[0]) { z=ext[0]; }
@@ -217,37 +247,16 @@ namespace bbwxvtk
 	        bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
 	        z = ext[5]; // Why not?
            }
-
-	    //	    std::cout << "V2D Render "<<std::endl;
-	    //      imageViewer->SetSliceOrientation (orientation);
-	    //	   imageViewer->SetSlice( z );
-
-	   //            wxvtkrenderwindowinteractor->Update();
-	   //            wxvtkrenderwindowinteractor->Render();
-	   //          imageViewer->GetRenderer()->ResetCameraClippingRange();
- 
-	    //xvtkrenderwindowinteractor->Refresh();
+	    wxvtkrenderwindowinteractor->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 );
-	#else
-		imageViewer->SetZSlice( z );
-	#endif
-*/
-//           imageViewer->SetSliceOrientation (orientation);
-//	   imageViewer->SetSlice( z );
-		
-		//imageViewer->UpdateDisplayExtent();
-  } 
+	    bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
+	    imageViewer->SetSliceOrientation (orientation);
+	    imageViewer->SetSlice( z );
 
-
-}
+    } 
+    
+    
+  }
 
 
   vtkRenderer * Viewer2DWidget::GetRenderer()
@@ -270,23 +279,14 @@ std::cout << "Viewer2DWidget::UpdateView() passe par 4" << std::endl;
 
   void Viewer2D::Process() 
   { 
-    // LG : Bug on Linux (wxGTK) when initial slice != 0 on first time 
-    // (see wxvtk/bbs/appli/ExampleSimpleSlicer)
-    // I think there is a problem with rendering before window 
-    // has been reparented ... we have to check this 
-    
-std::cout << "Viewer2D::Process() passe par 5" << std::endl;	   
-    
-	  Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
-	  
+    Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
     if (w)
-	{
-std::cout << "Viewer2D::Process() passe par 6" << std::endl;
-		w->UpdateView();
-		bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-	}
-	  bbSetOutputOut( bbGetInputSlice() );
-	  
+      {
+	w->UpdateView();
+	bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
+      }
+    bbSetOutputOut( bbGetInputSlice() );
+    
   }
   
 
@@ -295,7 +295,7 @@ std::cout << "Viewer2D::Process() passe par 6" << std::endl;
     bbSetInputIn(NULL);
     bbSetInputSlice(0);
     bbSetOutputWidget(0);
-    bbSetInputOrientation(0);
+    bbSetInputOrientation(2);
   }
 
   /**
@@ -305,9 +305,7 @@ std::cout << "Viewer2D::Process() passe par 6" << std::endl;
    */ 
   void Viewer2D::CreateWidget(wxWindow* parent)
   {
-  std::cout << "Viewer2D::CreateWidget() passe par 7" << std::endl;
     Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
-
     bbSetOutputWidget(w);
   }