added temporisation to update of Flat shared files view. Makes it more handy for large lists

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-04-09 19:43:09 +00:00
parent 2796ec6048
commit 210b43dc47
2 changed files with 28 additions and 6 deletions

View File

@ -24,6 +24,7 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QUrl> #include <QUrl>
#include <QMimeData> #include <QMimeData>
#include <QTimer>
#include "RemoteDirModel.h" #include "RemoteDirModel.h"
#include <retroshare/rsfiles.h> #include <retroshare/rsfiles.h>
@ -1294,18 +1295,28 @@ TreeStyle_RDM::~TreeStyle_RDM()
void FlatStyle_RDM::postMods() void FlatStyle_RDM::postMods()
{ {
_ref_entries.clear() ; _ref_entries.clear() ;
_ref_stack.clear() ;
_ref_stack.push_back(NULL) ; // init the stack with the topmost parent directory
std::cerr << "FlatStyle_RDM::postMods(): cleared ref entries" << std::endl; std::cerr << "FlatStyle_RDM::postMods(): cleared ref entries" << std::endl;
updateRefs() ;
}
std::vector<void *> stack(1,(void *)NULL) ; void FlatStyle_RDM::updateRefs()
{
RetroshareDirModel::preMods() ;
while(!stack.empty()) static const uint32_t MAX_REFS_PER_SECOND = 2000 ;
uint32_t nb_treated_refs = 0 ;
while(!_ref_stack.empty())
{ {
void *ref = stack.back() ; void *ref = _ref_stack.back() ;
#ifdef RDM_DEBUG #ifdef RDM_DEBUG
std::cerr << "FlatStyle_RDM::postMods(): poped ref " << ref << std::endl; std::cerr << "FlatStyle_RDM::postMods(): poped ref " << ref << std::endl;
#endif #endif
stack.pop_back() ; _ref_stack.pop_back() ;
uint32_t flags = DIR_FLAGS_DETAILS; uint32_t flags = DIR_FLAGS_DETAILS;
DirDetails details ; DirDetails details ;
@ -1317,7 +1328,12 @@ void FlatStyle_RDM::postMods()
std::cerr << "FlatStyle_RDM::postMods(): addign ref " << ref << std::endl; std::cerr << "FlatStyle_RDM::postMods(): addign ref " << ref << std::endl;
#endif #endif
for(std::list<DirStub>::iterator it = details.children.begin(); it != details.children.end(); it++) for(std::list<DirStub>::iterator it = details.children.begin(); it != details.children.end(); it++)
stack.push_back(it->ref) ; _ref_stack.push_back(it->ref) ;
}
if(++nb_treated_refs > MAX_REFS_PER_SECOND) // we've done enough, let's give back hand to
{ // the user and setup a timer to finish the job later.
QTimer::singleShot(500,this,SLOT(updateRefs())) ;
break ;
} }
} }
std::cerr << "reference tab contains " << _ref_entries.size() << " files" << std::endl; std::cerr << "reference tab contains " << _ref_entries.size() << " files" << std::endl;

View File

@ -162,6 +162,8 @@ class TreeStyle_RDM: public RetroshareDirModel
// //
class FlatStyle_RDM: public RetroshareDirModel class FlatStyle_RDM: public RetroshareDirModel
{ {
Q_OBJECT
public: public:
FlatStyle_RDM(bool mode) FlatStyle_RDM(bool mode)
: RetroshareDirModel(mode) : RetroshareDirModel(mode)
@ -170,6 +172,9 @@ class FlatStyle_RDM: public RetroshareDirModel
virtual ~FlatStyle_RDM() ; virtual ~FlatStyle_RDM() ;
protected slots:
void updateRefs() ;
protected: protected:
virtual void postMods(); virtual void postMods();
@ -186,7 +191,8 @@ class FlatStyle_RDM: public RetroshareDirModel
QString computeDirectoryPath(const DirDetails& details) const ; QString computeDirectoryPath(const DirDetails& details) const ;
std::vector<std::pair<void *,QString> > _ref_entries ; std::vector<std::pair<void *,QString> > _ref_entries ;// used to store the refs to display
std::vector<void *> _ref_stack ; // used to store the refs to update
}; };