X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=65a1fdc78633f42c58ad94983bdbae3e7ad982eb;hb=401bb9b06310683e21d0a7676ef543fb9255f1f9;hp=564f6594cc4e136f1b0a5d68599b68627a30802a;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 564f659..65a1fdc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -31,8 +31,8 @@ wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 //-------------------------------------------------------------------
 wxVtkBaseView::~wxVtkBaseView()
 {
- //	_iren -> Delete();
-	_iren=NULL;
+ 	_iren -> Delete();
+	//_iren=NULL;
 }
 //-------------------------------------------------------------------
 wxVTKRenderWindowInteractor* wxVtkBaseView::GetWxVTKRenderWindowInteractor() throw (char*)
@@ -90,8 +90,8 @@ vtkRenderWindow* wxVtkBaseView::GetRenWin()		// virtual
 }
 
 //----------------------------------------------------------------------------
-
-void wxVtkBaseView::TransfromeCoordScreenToWorld(double &X, double &Y, double &Z, int type) // virtual
+					
+void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool is3D, bool keepNormalDirection, int type) //virtual //is3d=false keepNormalDirection=false, type=2
 {  
 	GetRenderer()->SetDisplayPoint((int)X, (int)Y, (int)Z);
 	GetRenderer()->DisplayToWorld();
@@ -103,25 +103,34 @@ void wxVtkBaseView::TransfromeCoordScreenToWorld(double &X, double &Y, double &Z
 		fP[2] /= fP[3];
 	}
 
-// 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)
+	if(is3D)
 	{
 		X=fP[0];
-	}
-	if (type!=1)
-	{
 		Y=fP[1];
+		Z=fP[2];		
 	}
-	if (type!=2)
+	else
 	{
-		Z=fP[2];
-	} 
+		// 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];
+		}
+	}
 }
 
 //---------------------------------------------------------------------------