}
//----------------------------------------------------------------------------
-
-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();
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];
+ }
+ }
}
//---------------------------------------------------------------------------