X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=00cfbdc7d2a6234530e8b69dbda8653005014ba5;hb=825f47d7d281a359e9fec03de88e7db58e9e49ff;hp=c2be59111ba4abc2bda1004f1806f2f3f53aae4f;hpb=31f62e211fad94014168485d32c5e3ca936da953;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index c2be591..00cfbdc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -24,8 +24,6 @@ wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 //	_iren->UseCaptureMouseOn();
 //	_iren				= new wxVTKRenderWindowInteractor(_parent,-1);
 	_interactorStyle	= NULL;
-
-
 }
 
 //-------------------------------------------------------------------
@@ -91,7 +89,7 @@ vtkRenderWindow* wxVtkBaseView::GetRenWin()		// virtual
 
 //----------------------------------------------------------------------------
 
-void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z)
+void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z, int type)
 {
 	GetRenderer()->SetDisplayPoint((int)X, (int)Y, (int)Z);
 	GetRenderer()->DisplayToWorld();
@@ -103,22 +101,38 @@ void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z)
 		fP[2] /= fP[3];
 	}
 
-	X = fP[0];
-	Y = fP[1];
-	Z = fP[2];
+	if (type!=0)
+	{
+		X=fP[0];
+	}
+	if (type!=1)
+	{
+		Y=fP[1];
+	}
+	if (type!=2)
+	{
+		Z=fP[2];
+	} 
 }
 //----------------------------------------------------------------------------
 					
 void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection, int type) //virtual //keepNormalDirection=false, type=2
-{  
+{
+	double xx = X;
+	double yy = Y;
+	double zz = Z;
 
 	//RaC 03-2010
-	TransCoordScreenToWorld(X,Y,Z);
+	TransCoordScreenToWorld(xx,yy,zz,type);
+
+	X = xx;
+	Y = yy;
+	Z=zz;
 
 // EEDx5
 	//JCP 13/05/2009
 	vtkInteractorStyleBaseView* interactorstyle = (vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView();
-	wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)interactorstyle->GetWxVtk2DBaseView();
+    wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)interactorstyle->GetWxVtk2DBaseView();
 
 	double fP[3];
 	fP[0] = X;
@@ -154,7 +168,6 @@ vtkInteractorStyleImage*	wxVtkBaseView::GetInteractorStyleBaseView()
 	return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle)
@@ -171,8 +184,6 @@ void wxVtkBaseView::GetSpacing(double spc[3])  // virtual
 	spc[2]=1;
 }
 
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------