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=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=65a1fdc78633f42c58ad94983bdbae3e7ad982eb;hpb=401bb9b06310683e21d0a7676ef543fb9255f1f9;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 65a1fdc..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;
-
-
 }
 
 //-------------------------------------------------------------------
@@ -90,9 +88,9 @@ vtkRenderWindow* wxVtkBaseView::GetRenWin()		// virtual
 }
 
 //----------------------------------------------------------------------------
-					
-void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool is3D, bool keepNormalDirection, int type) //virtual //is3d=false keepNormalDirection=false, type=2
-{  
+
+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,34 +101,59 @@ void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z,
 		fP[2] /= fP[3];
 	}
 
-	if(is3D)
+	if (type!=0)
 	{
 		X=fP[0];
+	}
+	if (type!=1)
+	{
 		Y=fP[1];
-		Z=fP[2];		
 	}
-	else
+	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
+
+	if (type!=0)
+	{
+		X=fP[0];
+	}
+	if (type!=1)
 	{
-		// EEDx5
-		//JCP 13/05/2009
-		vtkInteractorStyleBaseView* interactorstyle = (vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView();
-		wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)interactorstyle->GetWxVtk2DBaseView();
-		baseview->TransformCoordinate_spacing_ViewToModel( fP[0] , fP[1] , fP[2] );
-		//JCP 13/05/2009
-
-		if (type!=0)
-		{
-			X=fP[0];
-		}
-		if (type!=1)
-		{
-			Y=fP[1];
-		}
-		if (type!=2)
-		{
-			Z=fP[2];
-		}
+		Y=fP[1];
 	}
+	if (type!=2)
+	{
+		Z=fP[2];
+	} 
 }
 
 //---------------------------------------------------------------------------
@@ -145,7 +168,6 @@ vtkInteractorStyleImage*	wxVtkBaseView::GetInteractorStyleBaseView()
 	return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle)
@@ -162,8 +184,6 @@ void wxVtkBaseView::GetSpacing(double spc[3])  // virtual
 	spc[2]=1;
 }
 
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------