X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.cxx;h=198c145f266b5cad7528f12e3f77fb882cf586ee;hb=d54571378c577b97b27aa532faf30070e979dc02;hp=4acf845f0f04b459068ec8b8837c4a4cf696983c;hpb=73922461adf24cf7d6539db9f752fc4e44db462d;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 4acf845..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: 2009/07/23 12:27:35 $
-  Version:   $Revision: 1.9 $
+  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 
 {
@@ -49,25 +48,22 @@ namespace bbitk
 	void ImageProperties::bbUserSetDefaultValues()
 	{
 	}
-	
+
 	//-----------------------------------------------------------------	
 	void ImageProperties::bbUserInitializeProcessing()
 	{
 	}
-	
+
 	//-----------------------------------------------------------------	
 	void ImageProperties::bbUserFinalizeProcessing()
 	{
 	}
 
-
   void ImageProperties::DoIt()
   {
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(),DoIt);
   }
 
-
-
   /** 
       Template Processing 
   */
@@ -78,7 +74,6 @@ namespace bbitk
 			<<bbtk::TypeName<itkImageType>()
 			<<">()"<<std::endl);
 
-
     itkImageType* im = bbGetInputIn().get<itkImageType*>();
     unsigned int dim = im->GetImageDimension();
 
@@ -98,10 +93,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==2)
+        vsz.push_back(1);
     bbSetOutputSize(vsz);
 
     typename itkImageType::SpacingType sp = im->GetSpacing();
@@ -109,17 +103,25 @@ 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==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