X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxViewer.cpp;h=4a0f2835aabc5bf1732d6dc0ff2d1e71a34a880a;hb=da80530068246081505e9649523d10e8da8e6acd;hp=523e780051d5f6640d2e0490400dda5493230b5f;hpb=b818afb24157d3474ecb598a98d92667745a6aa3;p=creaImageIO.git

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index 523e780..4a0f283 100644
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -145,22 +145,34 @@ namespace creaImageIO
   //=====================================================================
   void WxViewer::ShowImage(vtkImageData* im)
   {
- 
     GimmickDebugMessage(6,"WxViewer::ShowImage"
 			<<std::endl);
     if (im==0) return;
 
     mViewer->SetInput(im);
-	
+
     mViewer->SetSlice( 0 );
-    
+
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
     im->Update();
-    
+
+//std::cout << "in WxViewer::ShowImage PrintSelf() =";
+//im->PrintSelf(std::cout, vtkIndent(2));
+
     im->GetSpacing(spx,spy,spz);
-    im->GetExtent (x1,x2,y1,y2,z1,z2);
-    
+    //im->GetExtent (x1,x2,y1,y2,z1,z2);  // JPR
+    im->GetWholeExtent (x1,x2,y1,y2,z1,z2); 
+/*       
+std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
+	std::cout << "   [x1]=" << x1;
+	std::cout << "   [x2]=" << x2;
+	std::cout << "   [y1]=" << y1;
+	std::cout << "   [y2]=" << y2;
+	std::cout << "   [z1]=" << z1;
+	std::cout << "   [z2]=" << z2;
+std::cout << std::endl; 
+*/   
     if ((x1!=mx1) ||
 	(x2!=mx2) ||
 	(y1!=my1) ||
@@ -181,30 +193,23 @@ namespace creaImageIO
 	mspx = spx;
 	mspy = spy;
 	mspz = spz;
-	
+
 	double *range = im->GetScalarRange();
-	 mViewer->SetColorWindow(range[1] - range[0]);
-	 mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
-	
+	mViewer->SetColorWindow(range[1] - range[0]);
+	mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
 
-	 mViewer->GetRenderer()->ResetCamera();
+	mViewer->GetRenderer()->ResetCamera();
 	double bounds[6];
 
+	mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
 
-	 mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
-
-	  
-	 mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
-	      mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
-
-	 
-	  
-	  }
-
+	mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+	mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);  
+      }
   } 
   //================================================================
   
-   //================================================================
+  //================================================================
   bool WxViewer::RefreshIfNecessary()
   {
     if (mNeedRefresh)