X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkImageProperties.cxx;h=17b07cfc4ae520647d3d8b5dee96644c9fe2ee06;hb=7f5062112812aade4d10f1f2a3cf21abb3eb750e;hp=2155f82528c321d48dba0e9682e02e9df3df658b;hpb=d818d3773f70d1d68bf712ebae8edd8739bc3e17;p=bbtk.git

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 2155f82..17b07cf 100644
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/02/28 06:56:57 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2012/11/16 08:50:39 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 /**
  *  \file 
@@ -61,7 +68,9 @@ namespace bbitk
 
   void ImageProperties::DoIt()
   {
+      printf("EED ImageProperties::DoIt Start \n");
     BBTK_TEMPLATE_ITK_IMAGE_SWITCH(bbGetInputIn().type(),DoIt);
+      printf("EED ImageProperties::DoIt End \n");
   }
 
   /** 
@@ -70,18 +79,25 @@ namespace bbitk
   template<class itkImageType>
   void ImageProperties::DoIt()
   {
+      printf("EED <template>ImageProperties::DoIt Start \n");
     bbtkDebugMessageInc("Core",9,"bbitk::ImageProperties::DoIt<"
 			<<bbtk::TypeName<itkImageType>()
 			<<">()"<<std::endl);
 
     itkImageType* im = bbGetInputIn().get<itkImageType*>();
+      
+      printf("EED <template>ImageProperties::DoIt 1 \n");
+
     unsigned int dim = im->GetImageDimension();
 
+      
     bbSetOutputTypeName(bbtk::TypeName<typename itkImageType::PixelType>());
     bbSetOutputDimension(dim);
     const typename itkImageType::RegionType& r =im->GetLargestPossibleRegion();
     bbSetOutputLargestPossibleRegion(r);
 
+      printf("EED <template>ImageProperties::DoIt 2 \n");
+
     const typename itkImageType::IndexType& ind = r.GetIndex();
     std::vector<int> vind;
     for (unsigned int i=0;i<dim;++i) 
@@ -92,16 +108,30 @@ namespace bbitk
     std::vector<int> vsz;
     for (unsigned int i=0;i<dim;++i) 
        vsz.push_back(sz[i]);
-    
+
+      printf("EED <template>ImageProperties::DoIt 3 \n");
+
   // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
    if (dim==2)
         vsz.push_back(1);
     bbSetOutputSize(vsz);
+    
+    const typename itkImageType::PointType& orgn = im->GetOrigin();
+    std::vector<float> vog;
+    for (unsigned int i=0;i<dim;++i) 
+       vog.push_back(orgn[i]);
+       
+ // brute hack to avoid failure of most black boxes that expects 3D images. // EC
+    if (dim==2)
+       vog.push_back(1.0);
+  
+    bbSetOutputOrigin(vog);
+      printf("EED <template>ImageProperties::DoIt 4 \n");
 
     typename itkImageType::SpacingType sp = im->GetSpacing();
-    std::vector<float> vsp;
+    std::vector<double> vsp;
     for (unsigned int i=0;i<dim;++i) 
-       vsp.push_back(sp[i]);
+       vsp.push_back(double(sp[i]));
        
  // brute hack to avoid failure of most black boxes that expects 3D images. // JPR
     if (dim==2)
@@ -111,32 +141,23 @@ namespace bbitk
 
 
   // Min Max Value                     // EED
-	  //itk::MinimumMaximumImageFilter< TInputImage >
-	  printf("EED ImageProperties::DoIt 1\n");
-	  itk::MinimumMaximumImageFilter<itkImageType>   *minmaxfilter = itk::MinimumMaximumImageFilter< itkImageType >::New();
-	  printf("EED ImageProperties::DoIt 2\n");
 	  std::vector<float> vminmax;
-/*	  
-	  minmaxfilter->SetInput(im);
-	  printf("EED ImageProperties::DoIt 3\n");
-	  minmaxfilter->Update();
-	  printf("EED ImageProperties::DoIt 4\n");
-//	  vminmax.push_back( minmaxfilter->GetMinimumOutput()->Get() );
-//	  vminmax.push_back( minmaxfilter->GetMaximumOutput()->Get() );
-	  vminmax.push_back( minmaxfilter->GetMinimum() );
-	  printf("EED ImageProperties::DoIt 5\n");
-	  vminmax.push_back( minmaxfilter->GetMaximum() );
-	  printf("EED ImageProperties::DoIt 6\n");
-*/
-	  vminmax.push_back( 22 );
-	  vminmax.push_back( 33 );
-	  
+	  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);
-	  printf("EED ImageProperties::DoIt 7\n");
-	  
+      
+      printf("EED <template>ImageProperties::DoIt 5 \n");
+
+      
     bbtkDebugDecTab("Core",9);
+      printf("EED <template>ImageProperties::DoIt End \n");
   }
-}
-// eo namespace bbtk
+
+
+} // eo namespace bbtk
 
 #endif