X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtk3DBaseView.cxx;h=9d92c225526295afd8d36d392e09c339d3e1f7df;hb=3d1c0689f4e1844c8f170d9c20f8ad38b34d98b6;hp=9a12bccb7262162da71a6c8fbee9f6ad5c9ada9b;hpb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
index 9a12bcc..9d92c22 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.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 "wxVtk3DBaseView.h"
 
 #include "vtkInteractorStyleBaseView3D.h"
@@ -48,6 +73,42 @@ void wxVtk3DBaseView::Refresh()
 	vri->vtkRenderWindowInteractor::Render();
 }
 
+//-------------------------------------------------------------------
+// EED 27/05/2013
+void wxVtk3DBaseView::ResetCamera(int* ext, double* spc)
+{
+
+      GetRenderer()->ResetCameraClippingRange();
+
+	if(ext == NULL)
+	{
+
+		GetRenderer()->ResetCamera ();
+		GetCamera()->Dolly(1.2);
+	}else{
+		
+		/*double x = (spc[0])*(origin[0]+(((double)ext[1]-(double)ext[0])/2.0));
+		double y = (spc[1])*(origin[1]+(double)ext[3]);
+		double z = (spc[2])*(origin[2]+(((double)ext[5]-(double)ext[4])/2.0));*/
+		/*double x0=(spc[0])*((double)ext[0]+origin[0]);
+		double x1=(spc[0])*((double)ext[1]+origin[0]);
+		double y0=(spc[1])*((double)ext[2]+origin[1]);
+		double y1=(spc[1])*((double)ext[3]+origin[1]);
+		double z0=(spc[2])*((double)ext[4]+origin[2]);
+		double z1=(spc[2])*((double)ext[5]+origin[2]);*/
+		
+		double x0=(spc[0])*((double)ext[0]);
+		double x1=(spc[0])*((double)ext[1]);
+		double y0=(spc[1])*((double)ext[2]);
+		double y1=(spc[1])*((double)ext[3]);
+		double z0=(spc[2])*((double)ext[4]);
+		double z1=(spc[2])*((double)ext[5]);
+
+		GetRenderer()->ResetCamera(x0,x1,y0,y1,z0,z1);
+		//_wxvtk3Dbaseview->GetCamera()->SetPosition(x,y,z);
+		GetCamera()->Dolly(1.5);	
+	}	
+}
 
 //-------------------------------------------------------------------
 void wxVtk3DBaseView::SetStereo(int type)
@@ -123,6 +184,16 @@ void wxVtk3DBaseView::Configure()
 		_aCamera->SetFocalPoint (0, 0, 0);
 		_aCamera->ComputeViewPlaneNormal();
 
+//EED 27/05/2013
+		GetRenderer()->SetActiveCamera(GetCamera());
+		
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+//EED 13 may 2013  FLIP probleme  ..PLOP..
+		GetCamera()->Roll(180);
+		GetCamera()->Yaw(180+30);
+		GetCamera()->Pitch(-22);
+
+
 	}
 }
 //-------------------------------------------------------------------