//=====================================================================
bool TreeHandlerImageAdder::IsHandledFile( const std::string& filename)
{
- return (mReader.CanRead(filename,""));
+ return (mReader.CanRead(filename));
}
//=====================================================================
{
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;
}
}
//=====================================================================
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;
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);
}