X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkMPR2DView.cxx;h=35cf7c7358fb1afb96be073af98215c91d0ff3d9;hb=76820b27f1b2256fc0b6849ee77181d46891baa6;hp=b98d250d80c6e18926fe68cea4cb3ecc1dc66759;hpb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index b98d250..35cf7c7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@ -1,8 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "wxVtkMPR2DView.h"
 
 #include "vtkInteractorStyleBaseView.h"
 
 #include "vtkCellArray.h"
+#include "vtkImageActor.h"
+
 #ifdef WIN32
 #include <mathdefs.h>
 using namespace gtm;
@@ -70,11 +97,9 @@ void wxVtkMPR2DView::Configure()
 		x1 = (int)(x1*spc[0]);
 		y1 = (int)(y1*spc[1]);
 		z1 = (int)(z1*spc[2]);
-
 		x2 = (int)(x2*spc[0]);
 		y2 = (int)(y2*spc[1]);
 		z2 = (int)(z2*spc[2]);
-
 		_visibleAxis = true;
 	}
 
@@ -211,7 +236,11 @@ void wxVtkMPR2DView::Refresh()
 {
 	//wxVtk2DBaseView::Refresh();
 	int x1 = 0,x2 = 0,y1 = 0,y2 = 0,z1 = 0,z2 = 0;
-	int x = 0, y = 0, z = 0;
+
+//EED 02/08/2013
+//	int x = 0, y = 0, z = 0;
+	double x = 0, y = 0, z = 0;
+
 	int xx = 0, yy = 0, zz = 0;
 	double *spc     = 0;
 	double *origin  = 0;
@@ -219,7 +248,8 @@ void wxVtkMPR2DView::Refresh()
 	double xx1,yy1,zz1,xx2,yy2,zz2;
 	
 	vtkImageData* img = GetVtkmprbasedata()->GetImageData();
-	if(img!=NULL){
+	if(img!=NULL)
+ 	{
 		origin = img->GetOrigin();
 		img->GetExtent(x1,x2,y1,y2,z1,z2);
 		spc = img->GetSpacing();
@@ -250,10 +280,15 @@ void wxVtkMPR2DView::Refresh()
 		yy = (int)(GetVtkmprbasedata()->GetY());
 		zz = (int)(GetVtkmprbasedata()->GetZ());
 
-		x =  round(xx*spc[0]);
-		y =  round(yy*spc[1]);
-		z =  round(zz*spc[2]);
-		
+//EED 02/08/2013
+//		x =  round(xx*spc[0]);
+//		y =  round(yy*spc[1]);
+//		z =  round(zz*spc[2]);
+
+		x =  xx*spc[0];
+		y =  yy*spc[1];
+		z =  zz*spc[2];
+
 		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) {
 
 			if (_direction==0) {	// YZ
@@ -309,11 +344,16 @@ void wxVtkMPR2DView::Refresh()
 				_ptsB->SetPoint(1, x   , yy2, z1 );
 				
 				
-			}
+			} // if back
 			_backX=xx;
 			_backY=yy;
 			_backZ=zz;
-		}
+		} // if image
+
+
+//EED 2016/02/19
+	vtkImageActor *imageactor = _imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor();
+	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
 
 //EED 01nov2012
 		UpdateColorWindowLevel();