From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Fri, 18 Dec 2009 14:00:05 +0000 (+0000)
Subject: load vs include
X-Git-Tag: CREATOOLS.2-0-3~105
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=443fab11d4694575d7b826a384869d700d1b9036;p=bbtk.git

load vs include
---

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 4acf845..eed3209 100644
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/07/23 12:27:35 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/12/18 14:00:05 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -98,9 +98,9 @@ namespace bbitk
     for (unsigned int i=0;i<dim;++i) 
        vsz.push_back(sz[i]);
     
-    // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
-    if (dim<3) 
-       vsz.push_back(1);
+  // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
+  //  if (dim<3) 
+  //     vsz.push_back(1);
     
     bbSetOutputSize(vsz);
 
@@ -109,9 +109,9 @@ namespace bbitk
     for (unsigned int i=0;i<dim;++i) 
        vsp.push_back(sp[i]);
        
-    // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
-    if (dim<3) 
-       vsp.push_back(1);    
+ // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
+ //   if (dim<3) 
+ //      vsp.push_back(1);    
      
     bbSetOutputSpacing(vsp);
 
diff --git a/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs b/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs
index a4eabf1..7f0719e 100644
--- a/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs
+++ b/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs
@@ -1,4 +1,4 @@
-load vtk
+include vtk
 
 # --- Box Description ---
 define IsoSurfaceExtractor vtk
diff --git a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
index 6b9af87..5655f82 100644
--- a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
+++ b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
@@ -1,7 +1,7 @@
-load wx
-load vtk
-load std
-load wxvtk
+include wx
+include vtk
+include std
+include wxvtk
 
 define IsoSurfaceWidget wxvtk
   author "laurent.guigues@creatis.insa-lyon.fr"
diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx
index 81b0229..e0fca3a 100644
--- a/packages/wxvtk/src/wxvtkImageViewer2.cxx
+++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx
@@ -26,7 +26,7 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.2 $");
+vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.3 $");
 vtkStandardNewMacro(wxvtkImageViewer2);
 
 //----------------------------------------------------------------------------
@@ -401,7 +401,8 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
         double range = fabs(spos - cpos);
         double *spacing = input->GetSpacing();
         double avg_spacing = 
-          (spacing[0] + spacing[1] + spacing[2]) / 3.0;
+          //(spacing[0] + spacing[1] + spacing[2]) / 3.0;
+	  spacing[2]; // JPR??
         cam->SetClippingRange(
           range - avg_spacing * 3.0, range + avg_spacing * 3.0);
         }