X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk2DBaseView.cxx;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk2DBaseView.cxx;h=af726f120d87331ddc6485ca6667e6d5a1f072c9;hb=69c806e632999e11e12e8626609f4192d3aec364;hp=bd26d120d364e66401ac592ac30059cd5db585ce;hpb=00b3b34355fb96a6cdfcb3502950baac74d0fd0e;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index bd26d12..af726f1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -46,7 +46,6 @@ wxVtk2DBaseView::~wxVtk2DBaseView()
 	{
 	   delete _vtkIinfoTextImage;
 	}
-
 	if (_imageViewer2XYZ!=NULL)
 	{
 	   delete _imageViewer2XYZ;
@@ -61,19 +60,17 @@ void wxVtk2DBaseView::TransformCoordinate_spacing_ViewToModel(double &X,double &
 //	GetVtkBaseData()->GetImageData()->GetSpacing(spc);
 //JCP 04/08/10	W/O Image this->_imageViewer2XYZ->GetVtkImageViewer2()->GetInput()->GetSpacing(spc);
 	vtkImageData* image = this->_imageViewer2XYZ->GetVtkImageViewer2()->GetInput();
-	if(image){
+	if(image)
+	{
 		image->GetSpacing(spc);
 	}else{
 		spc[0] = 1;
 		spc[1] = 1;
 		spc[2] = 1;
 	}
-
-
 	X = X / spc[0];
 	Y = Y / spc[1];
 	Z = Z / spc[2];
-
 }
 
 //-------------------------------------------------------------------
@@ -104,10 +101,10 @@ void wxVtk2DBaseView::ResetView()
 	double spx = 0,spy = 0,spz = 0;
 	int x1 = 1,x2 = 1,y1 = 1,y2 = 1,z1 = 1,z2 = 1;
 	wxVtkBaseView::Configure();
-
 	wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 	vtkImageData *imageData	= GetVtkBaseData()->GetImageData();
-	if(imageData){
+	if(imageData)
+	{
 		imageData->UpdateInformation();
 		imageData->SetUpdateExtent( imageData->GetWholeExtent());
 		imageData->Update();
@@ -115,7 +112,6 @@ void wxVtk2DBaseView::ResetView()
 		imageData->GetSpacing (spx,spy,spz);
 		imageData->GetExtent (x1,x2,y1,y2,z1,z2);
 	}
-
 	_imageViewer2XYZ -> SetExtentDimension(x1,x2,y1,y2,z1,z2);
  	_imageViewer2XYZ -> GetVtkImageViewer2()->SetupInteractor ( iren );
 
@@ -149,10 +145,16 @@ void wxVtk2DBaseView::ResetView()
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::SetImageToVtkViewer(vtkImageData *imageData)
 {
+	int ext[6];
+	imageData->GetWholeExtent(ext);
+	_imageViewer2XYZ->SetExtentDimension( ext[0],ext[1],ext[2],ext[3],ext[4],ext[5] );
 	if (_imageViewer2XYZ!=NULL)
 	{
 		_imageViewer2XYZ->GetVtkImageViewer2()->SetInput( imageData );
 	} // if _imageViewer2XYZ
+
+	GetRenderer()->GetActiveCamera()->SetClippingRange(0.01, 1000000);
+
 }
 
 //-------------------------------------------------------------------
@@ -236,7 +238,7 @@ void wxVtk2DBaseView::Configure(bool okimage)
 //EED 21 mars 2012	FLIP problem  ..PLOP..
 			
 			// XY
-			camera->SetViewUp		( spx*0			, -spy*1			, spz*0		);
+			camera->SetViewUp		( spx*0			, -spy*1		, spz*0		);
 			camera->SetPosition		( spx*(x1+x2)/2	, spy*(y1+y2)/2	, -spz*10000	);
 			camera->SetFocalPoint	( spx*(x1+x2)/2	, spy*(y1+y2)/2	, spz*0		);
 /*