X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkImageToImageGenericFilterBase.cxx;h=70dcba6d90c03d86222f6908a630acb8da78a1c7;hb=6eae372a4d2bc19fe20b4cd4feea7a9d9c61a211;hp=2d1679f748def5299a5c847c757b360bf5557f22;hpb=28a696a732734608d0c32608c80c890a164872c4;p=clitk.git

diff --git a/common/clitkImageToImageGenericFilterBase.cxx b/common/clitkImageToImageGenericFilterBase.cxx
index 2d1679f..70dcba6 100644
--- a/common/clitkImageToImageGenericFilterBase.cxx
+++ b/common/clitkImageToImageGenericFilterBase.cxx
@@ -15,7 +15,11 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ======================================================================-====*/
+
+// clitk
 #include "clitkImageToImageGenericFilterBase.h"
+
+// itk
 #include <itkImage.h>
 
 //--------------------------------------------------------------------
@@ -30,7 +34,9 @@ clitk::ImageToImageGenericFilterBase::ImageToImageGenericFilterBase(std::string
   m_FilterName = n;
   m_FailOnImageTypeError = true;
   m_ReadOnDisk = true;
-  m_LastError = "";
+  // m_LastError = "";
+  // StopOnErrorOn();
+  SetFilterBase(NULL);
 }
 //--------------------------------------------------------------------
 
@@ -115,9 +121,9 @@ void clitk::ImageToImageGenericFilterBase::GetInputImageDimensionAndPixelType(un
     dim=dim_temp;
   } else {
     if (m_InputVVImages.size()) {
-      pixeltype=m_InputVVImages[0]->GetScalarTypeAsString();
-      dim=m_InputVVImages[0]->GetNumberOfDimensions();
-      components=m_InputVVImages[0]->GetNumberOfScalarComponents();
+      pixeltype = m_InputVVImages[0]->GetScalarTypeAsITKString();
+      dim = m_InputVVImages[0]->GetNumberOfDimensions();
+      components = m_InputVVImages[0]->GetNumberOfScalarComponents();
     } else
       assert(false); //No input image, shouldn't happen
   }
@@ -303,4 +309,26 @@ typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsig
 //--------------------------------------------------------------------
 
 
+//--------------------------------------------------------------------
+// void clitk::ImageToImageGenericFilterBase::MustStop()
+// {
+//   if (m_FilterBase != NULL) {
+//     m_FilterBase->SetMustStop(true);
+//   }
+// }
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+void clitk::ImageToImageGenericFilterBase::DeleteLastOutputImage()
+{
+  if (m_OutputVVImages.size()>1) {
+   m_OutputVVImages.pop_back();
+  }
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+