Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a few bugs in counting and model parenting

Browse source
This commit is contained in:
csoler 2024-03-11 13:37:09 +01:00
parent c1a6b8fe12
commit 5e3434396c
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/common/RsCollectionModel.cpp
View file

@ -22,7 +22,7 @@ static std::ostream& operator<<(std::ostream& o,const RsCollectionModel::EntryIn
} }
static std::ostream& operator<<(std::ostream& o,const QModelIndex& i) static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
{ {
return o << "QModelIndex (row " << i.row() << ", of ref " << i.internalId() << ")" ; return o << "QModelIndex (row " << i.row() << ", ref " << i.internalId() << ")" ;
} }
#ifdef DEBUG_COLLECTION_MODEL #ifdef DEBUG_COLLECTION_MODEL
#endif #endif
@ -200,7 +200,7 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
return QModelIndex(); return QModelIndex();
EntryIndex i; EntryIndex i;
if(!convertInternalIdToIndex(index.internalId(),i) || i.index==0) if(index.internalId()==0 || !convertInternalIdToIndex(index.internalId(),i))
return QModelIndex(); return QModelIndex();
EntryIndex p; EntryIndex p;
@ -276,7 +276,7 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
{ {
recursSetCheckFlag(dir_data.subdirs[i],s); recursSetCheckFlag(dir_data.subdirs[i],s);
mDirInfos[index].total_size += mDirInfos[dir_data.subdirs[i]].total_size ; mDirInfos[index].total_size += mDirInfos[dir_data.subdirs[i]].total_size ;
++mDirInfos[index].total_count; mDirInfos[index].total_count+= mDirInfos[dir_data.subdirs[i]].total_count;
} }
for(uint32_t i=0;i<dir_data.subfiles.size();++i) for(uint32_t i=0;i<dir_data.subfiles.size();++i)
@ -548,7 +548,10 @@ void RsCollectionModel::debugDump()
std::cerr << "Index: " << indx << " has_children: " << RsCollectionModel::hasChildren(indx) std::cerr << "Index: " << indx << " has_children: " << RsCollectionModel::hasChildren(indx)
<< ", rowCount: " << RsCollectionModel::rowCount(indx) << ", rowCount: " << RsCollectionModel::rowCount(indx)
<< ", internalId: " << (uint64_t)indx.internalId()
<< ", type: " << (entry.is_file?"file":"dir") << " number " << entry.index << ", type: " << (entry.is_file?"file":"dir") << " number " << entry.index
<< ", prow: " << (entry.is_file?mFileInfos[entry.index].parent_row:mDirInfos[entry.index].parent_row)
<< ", parent: " << RsCollectionModel::parent(indx)
<< ", display role: \"" << displayRole(entry,0).toString().toStdString() << ", display role: \"" << displayRole(entry,0).toString().toStdString()
<< std::endl; << std::endl;
@ -563,10 +566,10 @@ void RsCollectionModel::debugDump()
std::cerr << "mCollectionModel internal data: " << std::endl; std::cerr << "mCollectionModel internal data: " << std::endl;
std::cerr << "Directories: "<< std::endl; std::cerr << "Directories: "<< std::endl;
for(uint32_t i=0;i<mCollection.fileTree().numDirs();++i) for(uint32_t i=0;i<mCollection.fileTree().numDirs();++i)
std::cerr << " " << mCollection.fileTree().directoryData(i).name << std::endl; std::cerr << " " << i << ": "<< mCollection.fileTree().directoryData(i).name << std::endl;
std::cerr << "Files: "<< std::endl; std::cerr << "Files: "<< std::endl;
for(uint32_t i=0;i<mCollection.fileTree().numFiles();++i) for(uint32_t i=0;i<mCollection.fileTree().numFiles();++i)
std::cerr << " " << mCollection.fileTree().fileData(i).name << std::endl; std::cerr << " " << i << ": " << mCollection.fileTree().fileData(i).name << std::endl;
} }