X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.h;h=79391aa6dc764f31119b84efdeb433f4d026f047;hb=439cc05f12e61d0ba090ec0c2ba8701d382238d7;hp=60fafc98cb97b807affb3e05524ded6d01cd604f;hpb=401bb9b06310683e21d0a7676ef543fb9255f1f9;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 60fafc9..79391aa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 
 #ifndef __WX_VTK__BASE__VIEW__H
@@ -18,7 +43,7 @@
 #include <vtkImageViewer2.h> 
 #include <vtkInteractorStyleImage.h> 
 
-#include "wxMPRBaseData.h"
+#include "vtkBaseData.h"
 #include "wxVTKRenderWindowInteractorEditContour.h"
 
 #include <wx/wx.h>
@@ -36,58 +61,62 @@
 //class vtkInteractorStyleBaseView;  
  */
 
-#include "vtkInteractorStyleImage.h"
-
-
 
+#include "vtkInteractorStyleImage.h"
 
 class creaMaracasVisu_EXPORT wxVtkBaseView{
 public:
 	wxVtkBaseView( );
 	wxVtkBaseView( wxWindow *parent );
 	virtual ~wxVtkBaseView();
-	wxVTKRenderWindowInteractor		*GetWxVTKRenderWindowInteractor() throw (char*);
-	virtual void					Configure();
-	virtual void					Refresh();
-	virtual void					RefreshView();
-	virtual vtkRenderer*			GetRenderer();
-	virtual vtkRenderWindow*		GetRenWin();
-	virtual void					TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool is3D=false,bool keepNormalDirection=false,int type=2);
+	wxVTKRenderWindowInteractor	*GetWxVTKRenderWindowInteractor() throw (char*);
+	virtual void				Configure();
+	virtual void				Refresh();
+	virtual void				RefreshView();
+	virtual vtkRenderer*		GetRenderer();
+	virtual vtkRenderWindow*	GetRenWin();
+	virtual void				TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection=false,int type=2);
+
+	//RaC 03-2010 Method used by TransFromCoordScreenToWorld
+	void						TransCoordScreenToWorld(double &X, double &Y, double &Z,int type=2);
+
 	/* JCP 04/05/09
-	void							SetInteractorStyleBaseView( vtkInteractorStyleBaseView*	interactorStyle);
+	void					SetInteractorStyleBaseView( vtkInteractorStyleBaseView*	interactorStyle);
 	*/
-	void							SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
+	void						SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
 	/* JCP 04/05/09
 	 * 
 	vtkInteractorStyleBaseView*		GetInteractorStyleBaseView();	
 	*/
-	vtkInteractorStyleImage*		GetInteractorStyleBaseView();
-	virtual void					GetSpacing(double spc[3]);
+	vtkInteractorStyleImage*	GetInteractorStyleBaseView();
+	virtual void				GetSpacing(double spc[3]);
+	virtual int					GetDirection();
+
+
+	vtkBaseData*				GetVtkBaseData();
+	void						SetVtkBaseData(vtkBaseData *vtkbasedata);
+
 
 private:
-	wxWindow						*_parent;
-	wxVTKRenderWindowInteractor		*_iren;
+	wxWindow					*_parent;
+	wxVTKRenderWindowInteractor *_iren;
 	/**
 	 * JCP 04/05/09
 	 * vtkInteractorStyleImage		*_interactorStyle;
 	 */
 	vtkInteractorStyleImage		*_interactorStyle;
-protected:
 
-};
+// EED Nov 15 2014
+	vtkBaseData					*_vtkbasedata;
 
+protected:
 
+};
 
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
 
-
-
-
 #endif // __WX_VTK__BASE__VIEW__H
 
-
-
-