X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.cxx;h=50354ae4997036662a965aee46712509cef4df30;hb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;hp=7acce9bf9c86823e3d93ff47083ff36e49ff20d7;hpb=4609064827551b8119ad11eeaf92148dda660c00;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 7acce9b..50354ae 100644
--- 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;
-
-
 }
 
 //-------------------------------------------------------------------
@@ -50,8 +73,8 @@ void wxVtkBaseView::Configure()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::Refresh()  // virtual 
 {
+	
 // EED 10 Oct 2007
-
 	#if defined(WIN32)
 		_iren->Refresh(false);
 	#else
@@ -61,7 +84,6 @@ void wxVtkBaseView::Refresh()  // virtual
 	vtkRenderWindowInteractor *vri = GetWxVTKRenderWindowInteractor();
 	vri->vtkRenderWindowInteractor::Render();
 	
-	
 		//_iren->Refresh();
 	#endif
 
@@ -69,6 +91,7 @@ void wxVtkBaseView::Refresh()  // virtual
 //-------------------------------------------------------------------
 void wxVtkBaseView::RefreshView()  // virtual 
 {
+	printf("EED wxVtkBaseView::RefreshView() \n");
 // EED 10 Oct 2007
 
 	#if defined(WIN32)
@@ -76,7 +99,6 @@ void wxVtkBaseView::RefreshView()  // virtual
 	#else
 		//GetRenWin()->Render();
 	#endif
-
 }
 //---------------------------------------------------------------------------
 vtkRenderer* wxVtkBaseView::GetRenderer()	// virtual 
@@ -119,8 +141,7 @@ void wxVtkBaseView::TransCoordScreenToWorld(double &X, double &Y, double &Z, int
 //----------------------------------------------------------------------------
 					
 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;
@@ -171,7 +192,6 @@ vtkInteractorStyleImage*	wxVtkBaseView::GetInteractorStyleBaseView()
 	return _interactorStyle;
 }
 
-
 //---------------------------------------------------------------------------
 
 void wxVtkBaseView::SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle)
@@ -189,6 +209,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;
+}
+
+
 
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------