Bug #1679

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtkBaseView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index c2be59111ba4abc2bda1004f1806f2f3f53aae4f..6bba28cece1d89788983ec78f7590b424c2c6216 100644 (file)
--- 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;
-
-
 }
 
 //-------------------------------------------------------------------
@@ -50,8 +48,8 @@ void wxVtkBaseView::Configure()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::Refresh()  // virtual 
 {
+       
 // EED 10 Oct 2007
-
        #if defined(WIN32)
                _iren->Refresh(false);
        #else
@@ -69,6 +67,7 @@ void wxVtkBaseView::Refresh()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::RefreshView()  // virtual 
 {
+       printf("EED wxVtkBaseView::RefreshView() \n");
 // EED 10 Oct 2007
 
        #if defined(WIN32)
@@ -91,7 +90,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 +102,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 +169,6 @@ vtkInteractorStyleImage*    wxVtkBaseView::GetInteractorStyleBaseView()
        return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*       interactorStyle)
@@ -171,8 +185,6 @@ void wxVtkBaseView::GetSpacing(double spc[3])  // virtual
        spc[2]=1;
 }
 
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------