X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=731d4978e9df71f99fa2d2004a4633082ec760e1;hb=e7e2b2d876b585350b2f993b0866454cc5aa704a;hp=48ac1ac175b1d0c930990f1881a57432cbe38f62;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 48ac1ac..731d497 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -1,18 +1,37 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:18 $
-  Version:   $Revision: 1.36 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
+  Date:      $Date: 2012/11/16 08:52:36 $
+  Version:   $Revision: 1.39 $
                                                                                 
 =========================================================================*/
 /**
@@ -33,7 +52,7 @@
 #include "vtkRenderer.h"
 #include <vtkInteractorStyleImage.h>
 #include <vtkCommand.h>
-
+#include <vtkImageActor.h>
 namespace bbwxvtk
 {
   //--------------------------------------------------------------------------
@@ -44,7 +63,7 @@ namespace bbwxvtk
     ~Viewer2DWidget();
     void UpdateView();
     vtkRenderer		*GetRenderer();
-    
+    vtkImageActor       *GetImageActor();
   private:
     bool                        mFirstTime;
     Viewer2D                    *mBox;
@@ -226,28 +245,32 @@ namespace bbwxvtk
 		      << std::endl;
 	 */
     }
-  
+
     //  std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
     //  std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
     //  std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
+
+    bool interp = mBox->bbGetInputInterpolate();
+    if ( interp )
+    	imageViewer->GetImageActor()->InterpolateOn();
+    else
+    	imageViewer->GetImageActor()->InterpolateOff();
+	
     
     int orientation = mBox->bbGetInputOrientation();
     if (orientation<0 || orientation>2) {
        bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
        orientation=2; // Why not?      
     }
-	std::cout << "slicepre = "<<std::endl;
-	    // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
+
+    // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
     // created and displayed. 
     // Else when slice != 0 we get an X Window System error with wxGTK
-
-	std::cout << "shown = "<<mBox->bbIsShown()<<std::endl;
     if (
 	(backImageData!=NULL)&&
 	(mBox->bbIsShown()))
     {
 		int z = mBox->bbGetInputSlice();
-		std::cout << "slice = "<<z<<std::endl;
 		int ext[6];
 		backImageData->GetWholeExtent(ext);
 		/*
@@ -308,6 +331,7 @@ namespace bbwxvtk
 	void Viewer2D::bbUserSetDefaultValues()
 	{
 		bbSetInputIn(NULL);
+		bbSetInputInterpolate(true);  // JP
 		bbSetInputSlice(0);
 		bbSetOutputWidget(0);
 		bbSetOutputRenderer(0);