X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FwxvtkImageViewer2.cxx;h=e0fca3a565c3ee6ebad91f7d4253ac71b9ae7480;hb=f9b730b93d4a2731f365094735bd435a35d5bc90;hp=587e0224d7cf830f2635584340d02acd17f1a218;hpb=911e9825791b3ed1777a80ffc1185970bd051193;p=bbtk.git

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx
index 587e022..e0fca3a 100644
--- a/packages/wxvtk/src/wxvtkImageViewer2.cxx
+++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx
@@ -26,7 +26,7 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.1 $");
+vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.3 $");
 vtkStandardNewMacro(wxvtkImageViewer2);
 
 //----------------------------------------------------------------------------
@@ -342,15 +342,15 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
     return;
     }
 
-  std::cout << "--- wxvtkImageViewer2::UpdateDisplayExtent()"<<std::endl;
+  //  std::cout << "--- wxvtkImageViewer2::UpdateDisplayExtent()"<<std::endl;
   input->UpdateInformation();
   int *w_ext = input->GetWholeExtent();
 
- 	std::cout << "ext = "
-	<<w_ext[0]<<" - "<<w_ext[1]<<" ; "
-		<<w_ext[2]<<" - "<<w_ext[3]<<" ; "
-		<<w_ext[4]<<" - "<<w_ext[5]
-		<<std::endl;
+  // 	std::cout << "ext = "
+  //	<<w_ext[0]<<" - "<<w_ext[1]<<" ; "
+  //		<<w_ext[2]<<" - "<<w_ext[3]<<" ; "
+  //		<<w_ext[4]<<" - "<<w_ext[5]
+  //		<<std::endl;
       // Is the slice in range ? If not, fix it
 
   int slice_min = w_ext[this->SliceOrientation * 2];
@@ -401,7 +401,8 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
         double range = fabs(spos - cpos);
         double *spacing = input->GetSpacing();
         double avg_spacing = 
-          (spacing[0] + spacing[1] + spacing[2]) / 3.0;
+          //(spacing[0] + spacing[1] + spacing[2]) / 3.0;
+	  spacing[2]; // JPR??
         cam->SetClippingRange(
           range - avg_spacing * 3.0, range + avg_spacing * 3.0);
         }
@@ -649,19 +650,19 @@ void wxvtkImageViewer2::Render()
     // Initialize the size if not set yet
 
     vtkImageData *input = this->GetInput();
-    if (//this->RenderWindow->GetSize()[0] == 0 && 
+    if (this->RenderWindow->GetSize()[0] == 0 && 
 	input)
       {
-	/*
+	
       input->UpdateInformation();
       int *w_ext = input->GetWholeExtent();
       int xs = 0, ys = 0;
       
-	std::cout << "wxvtkImageViewer2::Render ext = "
-	<<w_ext[0]<<" - "<<w_ext[1]<<" ; "
-		<<w_ext[2]<<" - "<<w_ext[3]<<" ; "
-		<<w_ext[4]<<" - "<<w_ext[5]
-		<<std::endl;
+      //	std::cout << "wxvtkImageViewer2::Render ext = "
+      //	<<w_ext[0]<<" - "<<w_ext[1]<<" ; "
+      //		<<w_ext[2]<<" - "<<w_ext[3]<<" ; "
+      //		<<w_ext[4]<<" - "<<w_ext[5]
+      //		<<std::endl;
       
       switch (this->SliceOrientation)
         {
@@ -697,7 +698,7 @@ void wxvtkImageViewer2::Render()
           xs < 150 ? 75 : (xs - 1 ) / 2.0);
         }
       this->FirstRender = 0;  
-*/
+
       }
     }
   if (this->GetInput())
@@ -727,7 +728,7 @@ int wxvtkImageViewer2::GetOffScreenRendering()
 //----------------------------------------------------------------------------
 void wxvtkImageViewer2::SetInput(vtkImageData *in) 
 {
-  std::cout << "### wxvtkImageViewer2::SetInput"<<std::endl;
+  //  std::cout << "### wxvtkImageViewer2::SetInput"<<std::endl;
   this->WindowLevel->SetInput(in);
   this->UpdateDisplayExtent();
   // LG 03/12/08