*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOTreeHandlerImageAdder.cpp

diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp
index ebfd2c594412a353fbcd025292497e1fa1168b3f..3f9d4aa8d32cb2512852cefeef2161d20b80e6f5 100644 (file)
--- a/src2/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src2/creaImageIOTreeHandlerImageAdder.cpp
@@ -47,24 +47,9 @@ namespace creaImageIO
          {
            mProgress.IncNumberHandledFiles();
            AddFile(*i);
-
-
-           /*
-           if (progress)
-             {
-               std::string mess("Adding ");
-               mess += *i;
-               if (!progress->Update( (int)(summary.added_images*999./nbf),
-                                      std2wx(mess)))
-                 {
-                   // Some file was added hence we must return true !
-                   summary.cancelled_by_user = true;
-                   break;
-                 }
-             }
-           */
          }
        mProgressSignal(mProgress);
+       if (mProgress.GetStop()) break;
       }
   }
   //=====================================================================
@@ -102,16 +87,8 @@ namespace creaImageIO
   void TreeHandlerImageAdder::AddDirectoryRecursor(const std::string &dirpath, 
                                                   bool recursive)
   {
-    //    std::cout << "dir : "<<dirpath << std::endl;
-   mProgress.IncNumberScannedDirs();
-    /*
-    if (progress) 
-      {
-       std::string mess("Parsing ");
-       mess += dirpath;
-       progress->Pulse(std2wx(mess));
-      }
-    */    
+    mProgress.IncNumberScannedDirs();
+
     std::string fileName;
     std::string dirName = dirpath;
 
@@ -134,31 +111,24 @@ namespace creaImageIO
 
        wxFileName wxffn(dir.GetName(),filename);
        std::string ffn = wx2std(wxffn.GetFullPath());
-       //      std::cout << "file : "<<ffn << std::endl;
        if (IsHandledFile(ffn)) 
          {
            mProgress.IncNumberHandledFiles();
-           //      std::cout << "handled : "<<ffn << std::endl;
            AddFile( ffn );
          }
-       //      std::cout << "signal " << std::endl;
        mProgressSignal(mProgress);
-       //      std::cout << "cont " << std::endl;
        cont = ( dir.GetNext(&filename) && (!mProgress.GetStop()) );
-       //      std::cout << "next" << std::endl;
       }
     
     // Recurse into subdirs
     if ( recursive )
       {
-       //      std::cout << "recurse " << std::endl;
        cont = dir.GetFirst(&filename, wxEmptyString, 
                            wxDIR_DIRS | wxDIR_HIDDEN );
        while ( cont )
          {
            wxFileName wxffn(dir.GetName(),filename);
            std::string ffn = wx2std(wxffn.GetFullPath());
-           //      std::cout << "goto "<<ffn << std::endl;
            AddDirectoryRecursor( ffn, recursive);
            cont = dir.GetNext(&filename);
          }