X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkPlane2DView.cxx;h=f0cbc97744c4d841c05e21f5150e7aaf0ce4d67c;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=e95ca9d077ecdd380bd622fc0f8978b43eb992c4;hpb=3d7dc8f5fc5f6acd6f79f455ef7d068d912653a1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
index e95ca9d..f0cbc97 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.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 "vtkPlane2DView.h"
 
 #include "vtkCellArray.h"
@@ -344,7 +369,25 @@ void vtkPlane2DView::Configure( )
 //	SetActive(false);
 	_imageViewer2XYZ -> GetVtkImageViewer2()	-> SetupInteractor ( iren );
 
-	SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+	//////////////
+	//RaC 04-2010 Look for the description of new changes in vtkInteractorStyleBaseView2D constructor.
+	//
+	// Previous version
+	// SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
+	//
+	// Actual version
+	vtkInteractorStyleBaseView2D *style2D = vtkInteractorStyleBaseView2D::New();
+
+	manualInteractorWindowLevel *_manualinteractorwindowlevel= new manualInteractorWindowLevel();
+	style2D->SetInteractorWindowLevel( _manualinteractorwindowlevel );
+
+	vtkInteractorScrollZ *_vtkInteractorScrollZ = new vtkInteractorScrollZ();
+	style2D->SetInteractorScrollZ(_vtkInteractorScrollZ);
+
+	SetInteractorStyleImage( style2D );
+
+	// RaC
+	//////////////
 
 	_interactorstyleplane2D = new vtkInteractorStylePlane2D();
 	((vtkInteractorStyleBaseView*)GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _interactorstyleplane2D );
@@ -367,8 +410,6 @@ void vtkPlane2DView::Configure( )
 	_vtkInfoTextImageInteractorPlane2D->SetModelVtkInfoTextImage(_vtkInfoTextImage);	
 	_vtkInfoTextImage->Configure();
 	((vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView())->AddInteractorStyleMaracas(_vtkInfoTextImageInteractorPlane2D);
-
-
 }
 
 //-------------------------------------------------------------------
@@ -519,7 +560,7 @@ void vtkPlane2DView::SetVisibleLine(bool ok)
 	_lineActor->GetProperty()->SetOpacity(opacity);
 }
 // ----------------------------------------------------------------------------
-void vtkPlane2DView::TransfromeCoordViewWorld2(double &X, double &Y, double &Z)
+void vtkPlane2DView::TransfromCoordViewWorld2(double &X, double &Y, double &Z)
 {
 	double spc[3];
 	GetVtkmprbasedata()->GetImageData()->GetSpacing(spc);
@@ -528,7 +569,7 @@ void vtkPlane2DView::TransfromeCoordViewWorld2(double &X, double &Y, double &Z)
 	double yy = Y;
 	double zz = 0;
 
-	TransFromeCoordScreenToWorld(xx,yy,zz);
+	TransFromCoordScreenToWorld(xx,yy,zz);
 
 
 	vtkTransform *transf1 = vtkTransform::New();
@@ -548,6 +589,5 @@ void vtkPlane2DView::TransfromeCoordViewWorld2(double &X, double &Y, double &Z)
 	X = out[0] + GetVtkmprbasedata()->GetX() ;
 	Y = out[1] + GetVtkmprbasedata()->GetY() ;
 	Z = out[2] + GetVtkmprbasedata()->GetZ() ;
-
 }