X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkFilterBase.cxx;h=f6bebad101072e7d8ed40fe62b710f962e802f1f;hb=08f7de414957e92b25ca5b299007e941b610d3a8;hp=bea1b15043279698e432decfe8caa6d1dcd52dff;hpb=8e9577b513e5c23835d0e2cb58e5ccc04e90544a;p=clitk.git

diff --git a/common/clitkFilterBase.cxx b/common/clitkFilterBase.cxx
index bea1b15..f6bebad 100644
--- a/common/clitkFilterBase.cxx
+++ b/common/clitkFilterBase.cxx
@@ -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,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 // clitk
 #include "clitkFilterBase.h"
@@ -29,6 +29,7 @@ clitk::FilterBase::FilterBase()
   VerboseWarningFlagOn();
   VerboseWarningFlagOff();
   VerboseMemoryFlagOff();
+  VerboseImageSizeFlagOff();
   SetWarning("");
   VerboseWarningFlagOn();
   m_IsCancelled = false;
@@ -48,7 +49,7 @@ void clitk::FilterBase::SetWarning(std::string e)
 
 
 //--------------------------------------------------------------------
-void clitk::FilterBase::StartNewStep(std::string s) 
+void clitk::FilterBase::StartNewStep(std::string s, bool endl) 
 {
   if (Cancelled()) {
     throw clitk::ExceptionObject("Filter is canceled.");
@@ -68,7 +69,8 @@ void clitk::FilterBase::StartNewStep(std::string s)
 
   m_CurrentStepName = "Step "+GetCurrentStepId()+" -- "+s;
   if (GetVerboseStepFlag()) {
-    std::cout << m_CurrentStepName << std::endl;
+    std::cout << m_CurrentStepName;
+    if (endl) std::cout << std::endl;
     //"Step " << GetCurrentStepId() << " -- " << s << std::endl;
   }
 }
@@ -114,6 +116,8 @@ void clitk::FilterBase::StopSubStep() {
   int s = m_SubstepNumbers.back();
   m_SubstepNumbers.pop_back();
   SetCurrentStepNumber(s);
-  SetCurrentStepBaseId(m_SubstepID.back());
   m_SubstepID.pop_back();
+  if (m_SubstepID.size() != 0) {
+    SetCurrentStepBaseId(m_SubstepID.back());  }
+  else SetCurrentStepBaseId("");
 }