X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkFilterBase.cxx;h=7a089be39d8814f535342b9ecdf7da63a42ae65e;hb=4913590ba7e15aa2899fe6f9e403940d4e4ba7a1;hp=09797d886c750959c84dfa4e6a4db0eb236563e4;hpb=f425f2bbd6a8c36a91965bc5a6a6bc28a0912ce3;p=clitk.git

diff --git a/common/clitkFilterBase.cxx b/common/clitkFilterBase.cxx
index 09797d8..7a089be 100644
--- a/common/clitkFilterBase.cxx
+++ b/common/clitkFilterBase.cxx
@@ -23,11 +23,14 @@
 //--------------------------------------------------------------------
 clitk::FilterBase::FilterBase() 
 {
-  SetVerboseOption(false);
+  SetVerboseOptionFlag(false);
   SetCurrentStepNumber(0);
   SetCurrentStepBaseId("");
-  VerboseWarningOffOn(); // OffOn, it's cool no ?
+  VerboseWarningFlagOn();
+  VerboseWarningFlagOff();
+  VerboseMemoryFlagOff();
   SetWarning("");
+  VerboseWarningFlagOn();
   m_IsCancelled = false;
 }
 //--------------------------------------------------------------------
@@ -37,7 +40,7 @@ clitk::FilterBase::FilterBase()
 void clitk::FilterBase::SetWarning(std::string e)
 {
   m_Warning = e;
-  if (!GetVerboseWarningOff()) {
+  if (GetVerboseWarningFlag()) {
     std::cout << GetWarning() << std::endl;
   }
 }
@@ -64,7 +67,7 @@ void clitk::FilterBase::StartNewStep(std::string s)
   }
 
   m_CurrentStepName = "Step "+GetCurrentStepId()+" -- "+s;
-  if (m_VerboseStep) {
+  if (GetVerboseStepFlag()) {
     std::cout << m_CurrentStepName << std::endl;
     //"Step " << GetCurrentStepId() << " -- " << s << std::endl;
   }
@@ -89,9 +92,30 @@ void clitk::FilterBase::Cancel()
 
 
 //--------------------------------------------------------------------
- bool clitk::FilterBase::Cancelled()
- {
-   return m_IsCancelled;
- }
+bool clitk::FilterBase::Cancelled()
+{
+  return m_IsCancelled;
+}
+//--------------------------------------------------------------------
+
+
 //--------------------------------------------------------------------
+void clitk::FilterBase::StartSubStep() {
+  m_SubstepNumbers.push_back(GetCurrentStepNumber());
+  m_SubstepID.push_back(GetCurrentStepId());
+  SetCurrentStepBaseId(GetCurrentStepId());
+  SetCurrentStepNumber(0);;
+}
+//--------------------------------------------------------------------
+
 
+//--------------------------------------------------------------------
+void clitk::FilterBase::StopSubStep() {
+  int s = m_SubstepNumbers.back();
+  m_SubstepNumbers.pop_back();
+  SetCurrentStepNumber(s);
+  m_SubstepID.pop_back();
+  if (m_SubstepID.size() != 0) {
+    SetCurrentStepBaseId(m_SubstepID.back());  }
+  else SetCurrentStepBaseId("");
+}