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 65a1fdc78633f42c58ad94983bdbae3e7ad982eb..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)
@@ -90,9 +89,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 +102,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 +169,6 @@ vtkInteractorStyleImage*    wxVtkBaseView::GetInteractorStyleBaseView()
        return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*       interactorStyle)
@@ -162,8 +185,6 @@ void wxVtkBaseView::GetSpacing(double spc[3])  // virtual
        spc[2]=1;
 }
 
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------