#3019 creaMaracasVisu Bug New Normal Windows MPR2D refresh

[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 128a8446e16a65f50e84c0647f0e54233ba1ff8a..88ce1acc9cff550f035abb709da43f47e5dd5132 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 
 //#include "vtkInteractorStyleBaseView.h"
@@ -24,8 +49,6 @@ wxVtkBaseView::wxVtkBaseView(wxWindow *parent)
 //     _iren->UseCaptureMouseOn();
 //     _iren                           = new wxVTKRenderWindowInteractor(_parent,-1);
        _interactorStyle        = NULL;
-
-
 }
 
 //-------------------------------------------------------------------
@@ -51,24 +74,23 @@ void wxVtkBaseView::Configure()  // virtual
 void wxVtkBaseView::Refresh()  // virtual 
 {
 // EED 10 Oct 2007
-
        #if defined(WIN32)
-               _iren->Refresh(false);
+               _iren->Refresh(true);
+// EED 27 sept 2016
+          vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
+          vri->vtkRenderWindowInteractor::Render();
        #else
-       
 //EED 01Avril2009
 //             _iren->Render();        
        vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
        vri->vtkRenderWindowInteractor::Render();
-       
-       
                //_iren->Refresh();
        #endif
-
 }
 //-------------------------------------------------------------------
 void wxVtkBaseView::RefreshView()  // virtual 
 {
+       printf("EED wxVtkBaseView::RefreshView() \n");
 // EED 10 Oct 2007
 
        #if defined(WIN32)
@@ -76,7 +98,6 @@ void wxVtkBaseView::RefreshView()  // virtual
        #else
                //GetRenWin()->Render();
        #endif
-
 }
 //---------------------------------------------------------------------------
 vtkRenderer* wxVtkBaseView::GetRenderer()      // virtual 
@@ -90,9 +111,9 @@ vtkRenderWindow* wxVtkBaseView::GetRenWin()          // virtual
 }
 
 //----------------------------------------------------------------------------
-                                       
-void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection, int type) //virtual //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,10 +124,44 @@ void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z,
                fP[2] /= fP[3];
        }
 
+       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(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;
+       fP[1] = Y;
+       fP[2] = Z;
+
        baseview->TransformCoordinate_spacing_ViewToModel( fP[0] , fP[1] , fP[2] );
        //JCP 13/05/2009
 
@@ -136,7 +191,6 @@ vtkInteractorStyleImage*    wxVtkBaseView::GetInteractorStyleBaseView()
        return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*       interactorStyle)
@@ -154,6 +208,25 @@ void wxVtkBaseView::GetSpacing(double spc[3])  // virtual
 }
 
 
+//---------------------------------------------------------------------------
+int  wxVtkBaseView::GetDirection()   // virtual 
+{
+       return -1;
+}
+
+//-------------------------------------------------------------------
+vtkBaseData *wxVtkBaseView::GetVtkBaseData()
+{
+   return _vtkbasedata;
+}
+
+//-------------------------------------------------------------------
+void wxVtkBaseView::SetVtkBaseData(vtkBaseData *vtkbasedata)
+{
+   _vtkbasedata=vtkbasedata;
+}
+
+
 
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------