X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=73904c377e64241392224d6c7c0185e09a7e57f5;hb=8532fdb6068b8dc79c6e3a9f900b5aa05792d618;hp=716bedf7dae8fff80e60eb587db87ade63dcf2a5;hpb=9179838b318b30ffbe16abc4a9ac2a76a10d319f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 716bedf..73904c3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -91,8 +91,8 @@ vtkRenderWindow* wxVtkBaseView::GetRenWin()		// virtual
 
 //----------------------------------------------------------------------------
 
-void wxVtkBaseView::TransfromeCoordScreenToWorld(double &X, double &Y, double &Z, int type) // virtual
-{  
+void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z, int type)
+{
 	GetRenderer()->SetDisplayPoint((int)X, (int)Y, (int)Z);
 	GetRenderer()->DisplayToWorld();
 	double fP[4];
@@ -103,10 +103,45 @@ void wxVtkBaseView::TransfromeCoordScreenToWorld(double &X, double &Y, double &Z
 		fP[2] /= fP[3];
 	}
 
+	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(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();
+
+	double fP[3];
+	fP[0] = X;
+	fP[1] = Y;
+	fP[2] = Z;
+
 	baseview->TransformCoordinate_spacing_ViewToModel( fP[0] , fP[1] , fP[2] );
 	//JCP 13/05/2009