X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.cxx;h=f6e4f6d358cf2655421b6e7f1d4288cc33cf661f;hb=92777ab6b0fdbab3ca7d2ffda2e87d6270869ded;hp=5d54e743dec3eb24b9a5a24e26600f0581f45231;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 5d54e74..f6e4f6d 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: 2008/10/17 08:18:21 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2011/02/27 18:30:48 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -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,8 +73,7 @@ namespace bbitk
 			<<bbtk::TypeName<itkImageType>()
 			<<">()"<<std::endl);
 
-
-	itkImageType* im = bbGetInputIn().get<itkImageType*>();
+    itkImageType* im = bbGetInputIn().get<itkImageType*>();
     unsigned int dim = im->GetImageDimension();
 
     bbSetOutputTypeName(bbtk::TypeName<typename itkImageType::PixelType>());
@@ -76,27 +83,45 @@ 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);
 
+
+  // Min Max Value                     // EED
+	  //itk::MinimumMaximumImageFilter< TInputImage >
+//	  itk::MinimumMaximumImageFilter   minmaxfilter itk::MinimumMaximumImageFilter< im >
+	  std::vector<float> vminmax;
+//	  vminmax.push_back( minmaxfilter->GetMaximumOutput() );
+//	  vminmax.push_back( minmaxfilter->GetMinimumOutput() );
+	  vminmax.push_back( 17 );
+	  vminmax.push_back( 1972 );
+	  
+	  bbSetOutputMinMax(vminmax);
+	  
     bbtkDebugDecTab("Core",9);
   }
-
-
-
-
-
-
 }
 // eo namespace bbtk