minor fixes

diff --git a/common/clitkImageToImageGenericFilter.cxx b/common/clitkImageToImageGenericFilter.cxx
index 105afe0b44725c53c5e45a2d408567881e9f4745..0465b9b7879074047eb0eb0a5b3e02bb2059dcf0 100644 (file)
--- a/common/clitkImageToImageGenericFilter.cxx
+++ b/common/clitkImageToImageGenericFilter.cxx
@@ -5,8 +5,8 @@
 clitk::ImageToImageGenericFilterBase::ImageToImageGenericFilterBase(std::string n)
   :mIOVerbose(false) {
   mFilterName = n;
-  mListOfAllowedDimension.clear();
-  mListOfAllowedPixelType.clear();
+  mListOfAllowedDimensions.clear();
+  mListOfAllowedPixelTypes.clear();
   mFailOnImageTypeError = true;
 }
 //--------------------------------------------------------------------
@@ -14,24 +14,16 @@ clitk::ImageToImageGenericFilterBase::ImageToImageGenericFilterBase(std::string
 
 //--------------------------------------------------------------------
 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);
+
+    mListOfAllowedDimensions.insert(d);
+    mListOfAllowedPixelTypes.insert(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 +63,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());
 }
 //--------------------------------------------------------------------
 
@@ -163,26 +156,14 @@ bool clitk::ImageToImageGenericFilterBase::CheckImageType() {
 
 //--------------------------------------------------------------------
 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;
+    return (mListOfAllowedDimensions.find(d) != mListOfAllowedDimensions.end());
 }
 //--------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------
 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;
+    return (mListOfAllowedPixelTypes.find(pt) != mListOfAllowedPixelTypes.end());
 }
 //--------------------------------------------------------------------
 
@@ -212,12 +193,14 @@ void clitk::ImageToImageGenericFilterBase::PrintAvailableImageTypes() {
 std::string clitk::ImageToImageGenericFilterBase::GetAvailableImageTypes() {
   std::ostringstream oss;
   oss << "The filter <" << mFilterName << "> manages ";
-  for(unsigned int i=0; i<mListOfAllowedDimension.size(); i++) {
-    oss << mListOfAllowedDimension[i] << "D ";
+  for(std::set<unsigned int>::const_iterator i=mListOfAllowedDimensions.begin();
+          i!=mListOfAllowedDimensions.end(); i++) {
+    oss << *i << "D ";
   }
   oss << "images, with pixel types: ";
-  for(unsigned int i=0; i<mListOfAllowedPixelType.size(); i++) {
-    oss << mListOfAllowedPixelType[i] << " ";
+  for(std::set<std::string>::const_iterator i=mListOfAllowedPixelTypes.begin();
+          i!=mListOfAllowedPixelTypes.end(); i++) {
+    oss << *i << " ";
   }
   oss << std::endl;
   return oss.str();
@@ -232,12 +215,14 @@ void clitk::ImageToImageGenericFilterBase::ImageTypeError() {
             << 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] << " ";
+  for(std::set<unsigned int>::const_iterator i=mListOfAllowedDimensions.begin();
+          i!=mListOfAllowedDimensions.end(); i++) {
+      std::cerr << *i << "D ";
   }
   std::cerr << std::endl << "**Error** Allowed pixel types: \t";
-  for(unsigned int i=0; i<mListOfAllowedPixelType.size(); i++) {
-    std::cerr << mListOfAllowedPixelType[i] << " ";
+  for(std::set<std::string>::const_iterator i=mListOfAllowedPixelTypes.begin();
+          i!=mListOfAllowedPixelTypes.end(); i++) {
+      std::cerr << *i << " ";
   }
   std::cerr << std::endl;
   exit(0);

diff --git a/common/clitkImageToImageGenericFilter.h b/common/clitkImageToImageGenericFilter.h
index 645fe9b550817305506013b3efa2af582be81ee9..90869c53d1af3e7500bcbc9fd331d756d528cebe 100644 (file)
--- a/common/clitkImageToImageGenericFilter.h
+++ b/common/clitkImageToImageGenericFilter.h
@@ -3,8 +3,8 @@
   Program:   clitk
   Module:    $RCSfile: clitkImageToImageGenericFilter.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:53:15 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2010/02/03 13:08:52 $
+  Version:   $Revision: 1.4 $
   Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
              David Sarrut <david.sarrut@creatis.insa-lyon.fr>
 
@@ -40,6 +40,7 @@
 #include <vvFromITK.h>
 #include <vvToITK.h>
 #include <list>
+#include <set>
 
 namespace clitk {
   
@@ -115,8 +116,8 @@ namespace clitk {
     std::vector<vvImage::Pointer> mInputVVImages;
     std::vector<vvImage::Pointer> mOutputVVImages;
 
-    std::vector<std::string> mListOfAllowedPixelType;
-    std::vector<unsigned int> mListOfAllowedDimension;    
+    std::set<std::string> mListOfAllowedPixelTypes;
+    std::set<unsigned int> mListOfAllowedDimensions;
     bool CheckImageType();
     bool CheckDimension();
     bool CheckPixelType();

diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index 22b356d3e014ef7f24a08a77b6cd52b2d4fe20b7..251c0d68607cd4da37a300d0e406f3b147d0c0dd 100644 (file)
--- a/vv/vvToolBinarize.cxx
+++ b/vv/vvToolBinarize.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolBinarize.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/03 10:54:08 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2010/02/03 13:08:55 $
+  Version:   $Revision: 1.4 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -161,7 +161,7 @@ void vvToolBinarize::UpdateSlice(int slicer,int slices) {
 
 
    int slice = mCurrentSliceManager->GetSlicer(0)->GetSlice();
-    int tslice = mCurrentSliceManager->GetSlicer(0)->GetTSlice();
+    //int tslice = mCurrentSliceManager->GetSlicer(0)->GetTSlice();
     mClipper->SetInput(mCurrentSliceManager->GetSlicer(0)->GetInput());
     int* extent = mCurrentSliceManager->GetSlicer(0)->GetImageActor()->GetDisplayExtent();
     mClipper->SetOutputWholeExtent(extent[0],extent[1],extent[2],extent[3],extent[4],extent[5]);