X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.h;h=aea0d6f8b86a12636d553161f0fda69405e85081;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=5df6055eaabb73923bd4a99556db87eab2c2ed94;hpb=a2fa1913c097ab973a9b53ea2e95dc8b1f1d9e0a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
index 5df6055..aea0d6f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.h
@@ -1,8 +1,34 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 WXVTKMPR2DVIEW_H_
 #define WXVTKMPR2DVIEW_H_
 
 #include "vtkInteractorStyleMPRView.h"
 
+#include "wxMPRBaseData.h"
 #include "wxVtk2DBaseView.h"
 
 #include "vtkPolyDataMapper.h"
@@ -21,7 +47,6 @@ public:
 			vtkMPRBaseData	*GetVtkmprbasedata();
 	virtual int				GetActualSlice();
 	virtual	void			SetActualSlice(int slice);
-
 			bool			IfMouseTouchX(double x, double y, double z);
 			bool			IfMouseTouchY(double x, double y, double z);
 			bool			IfMouseTouchZ(double x, double y, double z);
@@ -29,19 +54,17 @@ public:
 			void			MoveY(double x, double y, double z);
 			void			MoveZ(double x, double y, double z);
 			void			ChangeAxisColor(double x, double y, double z);
-	virtual void			TransfromeCoordViewWorld(double &X, double &Y, double &Z, int type);
-	
+	virtual void			TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection=false, int type=2);
 			void			SetVisibleAxis(bool ok);
-
+    virtual int             GetDirection();
 
 private:
-
 	int							_backX;
 	int							_backY;
 	int							_backZ;
-
+	bool 						_backFixAxis2D;
+	double 						_backOpacityAxis;
 	bool						_visibleAxis;
-
 	int							_direction;
 	vtkPoints					*_ptsA;
 	vtkActor					*_lineAActor;
@@ -51,9 +74,8 @@ private:
 	vtkActor					*_lineBActor;
 	vtkPolyDataMapper			*_lineBMapper;
     vtkPolyData					*_pdB;
-//	vtkInteractorStyle2DMaracas	*_interactorStyle2DMaracas; 
+//	vtkInteractorStyle2DMaracas	*_interactorStyle2DMaracas;
 	vtkInteractorStyleMPRView	*_interactorstylemprview;
 };
 
-
 #endif /*WXVTKMPR2DVIEW_H_*/