X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FclitkImageToImageGenericFilter.cxx;h=835ab03e5ccdb6e8f0bb67b5c395ff409aab6119;hb=8973673f3f984656ec3552b5d963ba7b18119d39;hp=f41f8d36b3e09178d0cbb666bfc44ca36bb37ba2;hpb=9bcf64b7f7c5a7f0a39843df634c05b5d9e4e237;p=clitk.git

diff --git a/common/clitkImageToImageGenericFilter.cxx b/common/clitkImageToImageGenericFilter.cxx
index f41f8d3..835ab03 100644
--- a/common/clitkImageToImageGenericFilter.cxx
+++ b/common/clitkImageToImageGenericFilter.cxx
@@ -5,33 +5,14 @@
 clitk::ImageToImageGenericFilterBase::ImageToImageGenericFilterBase(std::string n)
   :mIOVerbose(false) {
   mFilterName = n;
-  mListOfAllowedDimension.clear();
-  mListOfAllowedPixelType.clear();
   mFailOnImageTypeError = true;
 }
 //--------------------------------------------------------------------
 
 
-//--------------------------------------------------------------------
-void clitk::ImageToImageGenericFilterBase::AddImageType(unsigned int d, std::string p) {
-  // Search for dimension (to not duplicate)
-  std::vector<unsigned int>::const_iterator it = 
-    std::find (mListOfAllowedDimension.begin(), 
-               mListOfAllowedDimension.end(), d);
-  if (it == mListOfAllowedDimension.end()) mListOfAllowedDimension.push_back(d);
-  // Search for PixelType (to not duplicate)
-  std::vector<std::string>::const_iterator itt = 
-    std::find (mListOfAllowedPixelType.begin(), 
-               mListOfAllowedPixelType.end(), p);
-  if (itt == mListOfAllowedPixelType.end()) mListOfAllowedPixelType.push_back(p);
-}
-//--------------------------------------------------------------------
-
-
 //--------------------------------------------------------------------
 void clitk::ImageToImageGenericFilterBase::SetInputFilenames(const std::vector<std::string> & filenames) {
-  mInputFilenames.resize(filenames.size());
-  std::copy(filenames.begin(), filenames.end(), mInputFilenames.begin());
+    mInputFilenames=filenames;
 }
 //--------------------------------------------------------------------
 
@@ -71,7 +52,8 @@ void clitk::ImageToImageGenericFilterBase::AddOutputFilename(const std::string &
 //--------------------------------------------------------------------
 void clitk::ImageToImageGenericFilterBase::SetOutputFilenames(const std::vector<std::string> & filenames)
 {
-    std::copy(filenames.begin(), filenames.end(), mOutputFilenames.begin());
+    mOutputFilenames.clear();
+    std::copy(filenames.begin(),filenames.end(),mOutputFilenames.begin());
 }
 //--------------------------------------------------------------------
 
@@ -153,83 +135,21 @@ void clitk::ImageToImageGenericFilterBase::SetInputVVImages (std::vector<vvImage
 //--------------------------------------------------------------------
 
 
-
-//--------------------------------------------------------------------
-bool clitk::ImageToImageGenericFilterBase::CheckImageType() {
-  return (CheckDimension() && CheckPixelType());
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-bool clitk::ImageToImageGenericFilterBase::CheckDimension(unsigned int d) {
-  bool b = false;
-  unsigned int i=0;
-  while ((!b) && (i<mListOfAllowedDimension.size())) {
-    b = (mListOfAllowedDimension[i] == d);
-    i++;
-  }
-  return b;
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-bool clitk::ImageToImageGenericFilterBase::CheckPixelType(std::string pt) {
-  bool b = false;
-  unsigned int i=0;
-  while ((!b) && (i<mListOfAllowedPixelType.size())) {
-    b = (mListOfAllowedPixelType[i] == pt);
-    i++;
-  }
-  return b;
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-bool clitk::ImageToImageGenericFilterBase::CheckDimension() {
-  return CheckDimension(mDim);
-}
-//--------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------
-bool clitk::ImageToImageGenericFilterBase::CheckPixelType() {
-  return CheckPixelType(mPixelTypeName);
-}
-//--------------------------------------------------------------------
-
-
 //--------------------------------------------------------------------
 void clitk::ImageToImageGenericFilterBase::PrintAvailableImageTypes() {
-  std::cout << "The filter <" << mFilterName << "> manages ";
-  for(unsigned int i=0; i<mListOfAllowedDimension.size(); i++) {
-    std::cout << mListOfAllowedDimension[i] << "D ";
-  }
-  std::cout << "images, with pixel types: ";
-  for(unsigned int i=0; i<mListOfAllowedPixelType.size(); i++) {
-    std::cout << mListOfAllowedPixelType[i] << " ";
-  }
-  std::cout << std::endl;
+  std::cout << GetAvailableImageTypes();
 }
 //--------------------------------------------------------------------
 
 
+
 //--------------------------------------------------------------------
 void clitk::ImageToImageGenericFilterBase::ImageTypeError() {
   std::cerr << "**Error** The filter <" << mFilterName << "> is not available for " 
             << mDim << "D images with pixel=" 
-            << mPixelTypeName << "." << std::endl;
-  std::cerr << "**Error** Allowed image dim: \t";
-  for(unsigned int i=0; i<mListOfAllowedDimension.size(); i++) {
-    std::cerr << mListOfAllowedDimension[i] << " ";
-  }
-  std::cerr << std::endl << "**Error** Allowed pixel types: \t";
-  for(unsigned int i=0; i<mListOfAllowedPixelType.size(); i++) {
-    std::cerr << mListOfAllowedPixelType[i] << " ";
-  }
-  std::cerr << std::endl;
+            << mPixelTypeName << " and "
+            << mNbOfComponents << " component." << std::endl;
+  std::cerr << GetAvailableImageTypes();
   exit(0);
 }
 //--------------------------------------------------------------------