Upgrade for 1.6

[bbtk.git] / packages / itk / src / bbitkImageProperties.cxx

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index fefb554c028d608bfe739ca0357ec11fe4905b29..b8b9f12a3e0b14dcf59acc9c0b1637c697a10e5a 100644 (file)
--- 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: 2008/11/27 14:58:06 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2010/09/21 06:43:17 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -37,24 +37,32 @@
 #include "bbitkImageProperties.h"
 #include "bbitkPackage.h"
 
-
-
 namespace bbitk 
 {
   BBTK_BLACK_BOX_IMPLEMENTATION(ImageProperties,bbtk::AtomicBlackBox);
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itk,ImageProperties);
 
+       //-----------------------------------------------------------------     
+       void ImageProperties::bbUserSetDefaultValues()
+       {
+       }
 
+       //-----------------------------------------------------------------     
+       void ImageProperties::bbUserInitializeProcessing()
+       {
+       }
 
+       //-----------------------------------------------------------------     
+       void ImageProperties::bbUserFinalizeProcessing()
+       {
+       }
 
   void ImageProperties::DoIt()
   {
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(),DoIt);
   }
 
-
-
   /** 
       Template Processing 
   */
@@ -65,7 +73,6 @@ namespace bbitk
                        <<bbtk::TypeName<itkImageType>()
                        <<">()"<<std::endl);
 
-
     itkImageType* im = bbGetInputIn().get<itkImageType*>();
     unsigned int dim = im->GetImageDimension();
 
@@ -76,29 +83,33 @@ namespace bbitk
 
     const typename itkImageType::IndexType& ind = r.GetIndex();
     std::vector<int> vind;
-    for (unsigned int i=0;i<dim;++i) vind.push_back(ind[i]);
+    for (unsigned int i=0;i<dim;++i) 
+       vind.push_back(ind[i]);
     bbSetOutputIndex(vind);
 
     const typename itkImageType::SizeType& sz = r.GetSize();
     std::vector<int> vsz;
-    for (unsigned int i=0;i<dim;++i) vsz.push_back(sz[i]);
+    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==2)
+        vsz.push_back(1);
     bbSetOutputSize(vsz);
 
     typename itkImageType::SpacingType sp = im->GetSpacing();
     std::vector<float> vsp;
-    for (unsigned int i=0;i<dim;++i) vsp.push_back(sp[i]);
-
-     
+    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==2)
+       vsp.push_back(1.0);
+  
     bbSetOutputSpacing(vsp);
 
     bbtkDebugDecTab("Core",9);
   }
-
-
-
-
-
-
 }
 // eo namespace bbtk