X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.cxx;h=caa2d4029cf46bbe56be3c114681ab2996ddb1f2;hb=731d9ee262e286a24e3ea2776d8e914950840a2c;hp=c5299614e1e74a22812b48214e8c3470ab327262;hpb=b5c0689eda6a07fe88850b7fc105b0ae99b2d5a8;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index c529961..caa2d40 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/04/17 09:04:13 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2009/09/17 11:17:18 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@
 #include "vtkRenderer.h"
 #include <vtkInteractorStyleImage.h>
 #include <vtkCommand.h>
-
+#include <vtkImageActor.h>
 namespace bbwxvtk
 {
   //--------------------------------------------------------------------------
@@ -44,7 +44,7 @@ namespace bbwxvtk
     ~Viewer2DWidget();
     void UpdateView();
     vtkRenderer		*GetRenderer();
-    
+    vtkImageActor       *GetImageActor();
   private:
     bool                        mFirstTime;
     Viewer2D                    *mBox;
@@ -226,16 +226,24 @@ 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?      
     }
+
     // 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
@@ -244,7 +252,6 @@ namespace bbwxvtk
 	(mBox->bbIsShown()))
     {
 		int z = mBox->bbGetInputSlice();
-		//	std::cout << "slice = "<<z<<std::endl;
 		int ext[6];
 		backImageData->GetWholeExtent(ext);
 		/*
@@ -300,6 +307,29 @@ namespace bbwxvtk
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer2D);
   BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserSetDefaultValues()
+	{
+		bbSetInputIn(NULL);
+		bbSetInputInterpolate(true);  // JP
+		bbSetInputSlice(0);
+		bbSetOutputWidget(0);
+		bbSetOutputRenderer(0);
+		bbSetInputOrientation(2);
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void Viewer2D::bbUserFinalizeProcessing()
+	{
+	}
+	
+	//--------------------------------------------------------------------------
   void Viewer2D::Process() 
   { 
     //    std::cout << "Viewer2D::Process" << std::endl;
@@ -314,16 +344,9 @@ namespace bbwxvtk
   }
   
 
-  void Viewer2D::bbUserConstructor()
-  {
-    bbSetInputIn(NULL);
-    bbSetInputSlice(0);
-    bbSetOutputWidget(0);
-    bbSetOutputRenderer(0);
-    bbSetInputOrientation(2);
-  }
 
 
+	//--------------------------------------------------------------------------
   void Viewer2D::CreateWidget(wxWindow* parent)
   {
     Viewer2DWidget* w = new Viewer2DWidget(this,parent);