X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmick.cpp;h=ced62fa28882e1d5ca1b9e6f6fd49dc631a3a642;hb=fc165c73bc8482c01caeee7c67405962f846a9b6;hp=21d9cd4d01a966e8dd5d60a23f309bfcff8d2763;hpb=fcfe92562365cb738cf919d095d2f8d3608ec389;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index 21d9cd4..ced62fa 100644
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -1,7 +1,6 @@
 #include <creaImageIOGimmick.h>
 
 #include <creaImageIOSystem.h>
-#include <creaImageIOImageFinder.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -12,6 +11,7 @@ namespace creaImageIO
 
   //==============================================================
   Gimmick::Gimmick()
+    : mImageAdder(0)
   {    
     RegisterGimmickMessageTypes();
   }
@@ -182,20 +182,15 @@ namespace creaImageIO
 
 
   //========================================================================
-  /// Add a file to the local database
-  void Gimmick::AddFile(const std::string& d, const std::string& f)
+  /// Add the files to the tree handler
+  void Gimmick::AddFiles(const std::string& d, 
+			const std::vector<std::string>& filenames)
   {
-    GimmickMessage(2,"Adding file '"<<f<<"' to '"<<d<<"'"<<std::endl);
+    GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
-    ImageFinder finder(GetTreeHandler(d));
-    if (finder.IsHandledFile(f)) 
-      {
-	finder.AddFile(f);
-      }
-    else
-      {
-	GimmickError("File '"<<f<<"' does not exist or is not handled");
-      }    
+    mImageAdder.SetTreeHandler(GetTreeHandler(d));
+    mImageAdder.AddFiles(filenames);
+
   }
   //========================================================================
 
@@ -207,11 +202,11 @@ namespace creaImageIO
     GimmickMessage(2,"Adding dir '"<<f<<"' to '"<<d<<"' recurse:"
 		   <<recurse<<std::endl);
 
-    ImageFinder finder(GetTreeHandler(d));
-    
-    finder.AddDirectory(f,recurse);
+    mImageAdder.SetTreeHandler(GetTreeHandler(d));
+    mImageAdder.AddDirectory(f,recurse);
     
   }
+
   //========================================================================
 
   //========================================================================