X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.cpp;h=b9291e1f31b0e3269f37ba1d70c7ac1624e0ffcb;hb=8d73d5f58d80abb928a7f60037837c2933b16bbd;hp=e384e99c7f3c1b674f939b80f668f3e87aaa7c34;hpb=f5b34bdab9bf9fb39cbdf650949dac307e470606;p=creaImageIO.git diff --git a/src2/creaImageIOTreeHandlerImageAdder.cpp b/src2/creaImageIOTreeHandlerImageAdder.cpp index e384e99..b9291e1 100644 --- a/src2/creaImageIOTreeHandlerImageAdder.cpp +++ b/src2/creaImageIOTreeHandlerImageAdder.cpp @@ -46,6 +46,7 @@ namespace creaImageIO std::vector::const_iterator i; for (i=filenames.begin();i!=filenames.end();++i) { + mProgress.IncNumberScannedFiles(); if (IsHandledFile(*i)) { @@ -55,6 +56,7 @@ namespace creaImageIO mProgressSignal(mProgress); if (mProgress.GetStop()) break; } + SetNumberOfChildren(); } //===================================================================== @@ -64,12 +66,38 @@ namespace creaImageIO { mProgress.Reset(); AddDirectoryRecursor( directory, recurse ); + SetNumberOfChildren(); GimmickDebugMessage(3,mProgress< children = mTreeHandler->GetTree().GetChildrenList(); + std::vector::iterator it; + for(it=children.begin();it!=children.end();++it) + { + SetNumberOfChildrenRecursor(*it); + } + } + //===================================================================== + void TreeHandlerImageAdder::SetNumberOfChildrenRecursor(tree::Node* node) + { + std::stringstream out; + out << node->GetChildrenList().size(); + mTreeHandler->SetAttribute(node,"D1111_0011",out.str()); + if(node->GetLevel()GetTree().GetNumberOfLevels()-2) + { + std::vector children = node->GetChildrenList(); + std::vector::iterator it; + for(it=children.begin();it!=children.end();++it) + { + SetNumberOfChildrenRecursor(*it); + } + } + } //===================================================================== void TreeHandlerImageAdder::AddFile( const std::string& filename ) @@ -110,7 +138,7 @@ namespace creaImageIO else { mProgress.IncNumberScannedFiles(); - if (IsHandledFile(itr->string())) + if (IsHandledFile(itr->string())) { mProgress.IncNumberHandledFiles(); AddFile( itr->string() ); @@ -119,6 +147,7 @@ namespace creaImageIO if (mProgress.GetStop()) break; } } + } /*