X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkFilterBase.txx;h=fe175e12af72773578a2c775694f2e2b64e43b2d;hb=543b72e23ad001ac2a7743b9beacf48e2d0054ac;hp=c00d18adabdb28307f357b883078d314a0aab2d9;hpb=03c0a567e50d4b3dcdee11112b0a404789468857;p=clitk.git

diff --git a/common/clitkFilterBase.txx b/common/clitkFilterBase.txx
index c00d18a..fe175e1 100644
--- a/common/clitkFilterBase.txx
+++ b/common/clitkFilterBase.txx
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,15 +14,16 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 #include "clitkImageCommon.h"
+#include "clitkMemoryUsage.h"
 
 //--------------------------------------------------------------------
 template<class OptionType>
 void clitk::FilterBase::VerboseOption(std::string name, OptionType value) 
 {
-  if (!this->GetVerboseOption()) return;
+  if (!this->GetVerboseOptionFlag()) return;
   std::cout << "Set option '" << name << "' = " << value << std::endl;
 }
 //--------------------------------------------------------------------
@@ -32,7 +33,7 @@ void clitk::FilterBase::VerboseOption(std::string name, OptionType value)
 template<class OptionType>
 void clitk::FilterBase::VerboseOption(std::string name, int nb, OptionType value) 
 {
-  if (!this->GetVerboseOption()) return;
+  if (!this->GetVerboseOptionFlag()) return;
   if (nb==0) std::cout << "Set option '" << name << "' not given" << std::endl;
   else {
     std::cout << "Set option '" << name << "' = " << value << std::endl;
@@ -45,7 +46,7 @@ void clitk::FilterBase::VerboseOption(std::string name, int nb, OptionType value
 template<class OptionType>
 void clitk::FilterBase::VerboseOptionV(std::string name, int nb, OptionType * value) 
 {
-  if (!this->GetVerboseOption()) return;
+  if (!this->GetVerboseOptionFlag()) return;
   if (nb==0) std::cout << "Set option '" << name << "' not given" << std::endl;
   else {
     std::cout << "Set option '" << name << "'[" << nb << "] ";
@@ -58,13 +59,28 @@ void clitk::FilterBase::VerboseOptionV(std::string name, int nb, OptionType * va
 
 //--------------------------------------------------------------------
 template<class TInternalImageType>
-void clitk::FilterBase::StopCurrentStep(typename TInternalImageType::Pointer p) 
+void clitk::FilterBase::StopCurrentStep(typename TInternalImageType::Pointer p, std::string txt) 
 {
-  if (m_WriteStep) {
+  StopCurrentStep();
+  if (m_WriteStepFlag) {
     std::ostringstream name;
     name << "step-" << GetCurrentStepId() << ".mhd";
     clitk::writeImage<TInternalImageType>(p, name.str());
   }
+  clitk::PrintMemory(GetVerboseMemoryFlag(), "End of step"); 
+  if (GetVerboseImageSizeFlag()) {
+    std::ostream & os = std::cout;
+    unsigned int dim = p->GetImageDimension();
+    int nb = 1;
+    os << txt << " size = ";
+    for(unsigned int i=0; i<dim-1; i++) {
+      os << p->GetLargestPossibleRegion().GetSize()[i] << "x";
+      nb *= p->GetLargestPossibleRegion().GetSize()[i];
+    }
+    os << p->GetLargestPossibleRegion().GetSize()[dim-1] << "  ";
+    nb *= p->GetLargestPossibleRegion().GetSize()[dim-1];
+    os << " pixels = " << nb << std::endl;    
+  }
 }
 //--------------------------------------------------------------------