X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FwxvtkImageViewer2.cxx;h=adf4c66218bbe8a0095bab8e3201f7ae13351eae;hb=e7e2b2d876b585350b2f993b0866454cc5aa704a;hp=533677cc130ffaceecfe62a55c45a7653bdbd26b;hpb=67837fa48c205487fbb9e5d6134d028c142867bc;p=bbtk.git

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx
index 533677c..adf4c66 100644
--- a/packages/wxvtk/src/wxvtkImageViewer2.cxx
+++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
 
   Program:   Visualization Toolkit
@@ -21,12 +48,12 @@
 #include "vtkImageData.h"
 #include "vtkImageMapToWindowLevelColors.h"
 #include "vtkInteractorStyleImage.h"
-#include "vtk.h"
+#include "vtkObjectFactory.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.4 $");
+vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.8 $");
 vtkStandardNewMacro(wxvtkImageViewer2);
 
 //----------------------------------------------------------------------------
@@ -310,26 +337,54 @@ void wxvtkImageViewer2::UpdateOrientation()
   vtkCamera *cam = this->Renderer ? this->Renderer->GetActiveCamera() : NULL;
   if (cam)
     {
+
+// EED 21 mars FLIP problem  ..PLOP..		
     switch (this->SliceOrientation)
-      {
-      case wxvtkImageViewer2::SLICE_ORIENTATION_XY:
-        cam->SetFocalPoint(0,0,0);
-        cam->SetPosition(0,0,1); // -1 if medical ?
-        cam->SetViewUp(0,1,0);
-        break;
-
-      case wxvtkImageViewer2::SLICE_ORIENTATION_XZ:
-        cam->SetFocalPoint(0,0,0);
-        cam->SetPosition(0,-1,0); // 1 if medical ?
-        cam->SetViewUp(0,0,1);
-        break;
-
-      case wxvtkImageViewer2::SLICE_ORIENTATION_YZ:
-        cam->SetFocalPoint(0,0,0);
-        cam->SetPosition(1,0,0); // -1 if medical ?
-        cam->SetViewUp(0,0,1);
-        break;
+	{
+		case wxvtkImageViewer2::SLICE_ORIENTATION_YZ:
+			  cam->SetViewUp(0,0,1);
+			  cam->SetPosition(1,0,0); // -1 if medical ?
+			  cam->SetFocalPoint(0,0,0);
+			break;
+			
+		case wxvtkImageViewer2::SLICE_ORIENTATION_XZ:
+			cam->SetViewUp(0,0,1);
+			cam->SetPosition(0,-1,0); // 1 if medical ?
+			cam->SetFocalPoint(0,0,0);
+			break;
+			
+		case wxvtkImageViewer2::SLICE_ORIENTATION_XY:
+			  cam->SetViewUp(0,-1,0);
+			  cam->SetPosition(0,0,-1); 
+			  cam->SetFocalPoint(0,0,0);
+			break;
       }
+	
+/*		
+		switch (this->SliceOrientation)
+		{
+			case wxvtkImageViewer2::SLICE_ORIENTATION_YZ:
+				cam->SetViewUp(0,0,1);
+				cam->SetPosition(1,0,0); // -1 if medical ?
+				cam->SetFocalPoint(0,0,0);
+				break;
+ 
+			case wxvtkImageViewer2::SLICE_ORIENTATION_XZ:
+				cam->SetViewUp(0,0,1);
+				cam->SetPosition(0,-1,0); // 1 if medical ?
+				cam->SetFocalPoint(0,0,0);
+				break;
+ 
+			case wxvtkImageViewer2::SLICE_ORIENTATION_XY:
+				cam->SetViewUp(0,1,0);
+				cam->SetPosition(0,0,1); // -1 if medical ?
+				cam->SetFocalPoint(0,0,0);
+				break;
+ 
+				
+		}		
+*/		
+		
     }
 }