X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.cxx;h=198c145f266b5cad7528f12e3f77fb882cf586ee;hb=731d9ee262e286a24e3ea2776d8e914950840a2c;hp=fefb554c028d608bfe739ca0357ec11fe4905b29;hpb=98ab778755e68bd1b55dd41f20222b91bde7dd5a;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index fefb554..198c145 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/11/27 14:58:06 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2011/03/04 08:33:59 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -36,8 +36,7 @@
 
 #include "bbitkImageProperties.h"
 #include "bbitkPackage.h"
-
-
+#include "itkMinimumMaximumImageFilter.h"
 
 namespace bbitk 
 {
@@ -45,16 +44,26 @@ namespace bbitk
 
   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 +74,6 @@ namespace bbitk
 			<<bbtk::TypeName<itkImageType>()
 			<<">()"<<std::endl);
 
-
     itkImageType* im = bbGetInputIn().get<itkImageType*>();
     unsigned int dim = im->GetImageDimension();
 
@@ -76,29 +84,44 @@ 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
+	  std::vector<float> vminmax;
+	  typedef itk::MinimumMaximumImageFilter< itkImageType > MinMaxFilterType;
+	  typename MinMaxFilterType::Pointer minMaxCalculator = MinMaxFilterType::New();
+	  minMaxCalculator->SetInput(im);
+	  minMaxCalculator->Update();
+	  vminmax.push_back( (float) (minMaxCalculator->GetMinimum()) );
+	  vminmax.push_back( (float) (minMaxCalculator->GetMaximum()) );	  
+	  bbSetOutputMinMax(vminmax);
+	  
     bbtkDebugDecTab("Core",9);
   }
-
-
-
-
-
-
 }
 // eo namespace bbtk