re indent

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

diff --git a/packages/itk/src/bbitkImageProperties.cxx b/packages/itk/src/bbitkImageProperties.cxx
index 223950e857550ff35cc8ad932bcdc628dfadc24a..198c145f266b5cad7528f12e3f77fb882cf586ee 100644 (file)
--- a/packages/itk/src/bbitkImageProperties.cxx
+++ b/packages/itk/src/bbitkImageProperties.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkImageProperties.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:50 $
-  Version:   $Revision: 1.3 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2011/03/04 08:33:59 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 
  *  \brief 
@@ -23,6 +36,7 @@
 
 #include "bbitkImageProperties.h"
 #include "bbitkPackage.h"
+#include "itkMinimumMaximumImageFilter.h"
 
 namespace bbitk 
 {
@@ -30,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 
   */
@@ -60,27 +84,44 @@ namespace bbitk
 
     const typename itkImageType::IndexType& ind = r.GetIndex();
     std::vector<int> vind;
-    for (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 (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 (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