Future 1454

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer2D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 1a1d93f91c60667dc995c8bde1fa03f8fe718c17..caa2d4029cf46bbe56be3c114681ab2996ddb1f2 100644 (file)
--- 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/05/15 14:58:07 $
-  Version:   $Revision: 1.35 $
+  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);
                /*
@@ -305,6 +312,7 @@ namespace bbwxvtk
        void Viewer2D::bbUserSetDefaultValues()
        {
                bbSetInputIn(NULL);
+               bbSetInputInterpolate(true);  // JP
                bbSetInputSlice(0);
                bbSetOutputWidget(0);
                bbSetOutputRenderer(0);