kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Runtime optimization for preview sorting: Use 2 different algorithms dependent on the relation between model-rows and preview items. One algorithm is faster when e. g. inserting 10 items into a directory of 2000 items, while the other algorithm is faster when initially loading the directory.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=820321
This commit is contained in:
Peter Penz 2008-06-13 21:22:13 +00:00
parent b17a5814d0
commit 94fd0e85ff
1 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/iconmanager.cpp
View file

@ -486,37 +486,60 @@ void IconManager::orderItems(KFileItemList& items)
// Order the items in a way that the preview for the visible items // Order the items in a way that the preview for the visible items
// is generated first, as this improves the feeled performance a lot. // is generated first, as this improves the feeled performance a lot.
// //
// Implementation note: using KDirModel::itemForUrl() would lead to a more // Implementation note: 2 different algorithms are used for the sorting.
// readable code, but it is slower as iterating all model indicess // Algorithm 1 is faster when having a lot of items in comparison
// and checking whether the index is part of 'items'. // to the number of rows in the model. Algorithm 2 is faster
// when having quite less items in comparison to the number of rows in
// the model. Choosing the right algorithm is important when having directories
// with several hundreds or thousands of items.
const int itemCount = items.count(); const int itemCount = items.count();
const int rowCount = m_proxyModel->rowCount();
const QRect visibleArea = m_view->viewport()->rect(); const QRect visibleArea = m_view->viewport()->rect();
const int rowCount = m_proxyModel->rowCount(); if (itemCount * 10 > rowCount) {
for (int row = 0; row < rowCount; ++row) { // Algorithm 1: The number of items is > 10 % of the row count. Parse all rows
const QModelIndex proxyIndex = m_proxyModel->index(row, 0); // and check whether the received row is part of the item list.
const QRect itemRect = m_view->visualRect(proxyIndex); for (int row = 0; row < rowCount; ++row) {
const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex); const QModelIndex proxyIndex = m_proxyModel->index(row, 0);
const QRect itemRect = m_view->visualRect(proxyIndex);
const QModelIndex dirIndex = m_proxyModel->mapToSource(proxyIndex);
KFileItem item = m_dolphinModel->itemForIndex(dirIndex); // O(1) KFileItem item = m_dolphinModel->itemForIndex(dirIndex); // O(1)
const KUrl url = item.url(); const KUrl url = item.url();
// check whether the item is part of the item list 'items' // check whether the item is part of the item list 'items'
int index = -1; int index = -1;
for (int i = 0; i < itemCount; ++i) { for (int i = 0; i < itemCount; ++i) {
if (items[i].url() == url) { if (items[i].url() == url) {
index = i; index = i;
break; break;
}
}
if ((index > 0) && itemRect.intersects(visibleArea)) {
// The current item is (at least partly) visible. Move it
// to the front of the list, so that the preview is
// generated earlier.
items.removeAt(index);
items.insert(0, item);
} }
} }
} else {
// Algorithm 2: The number of items is <= 10 % of the row count. In this case iterate
// all items and receive the corresponding row from the item.
for (int i = 0; i < itemCount; ++i) {
const QModelIndex dirIndex = m_dolphinModel->indexForItem(items[i]); // O(n) (n = number of rows)
const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
const QRect itemRect = m_view->visualRect(proxyIndex);
if ((index > 0) && itemRect.intersects(visibleArea)) { if (itemRect.intersects(visibleArea)) {
// The current item is (at least partly) visible. Move it // The current item is (at least partly) visible. Move it
// to the front of the list, so that the preview is // to the front of the list, so that the preview is
// generated earlier. // generated earlier.
items.removeAt(index); items.insert(0, items[i]);
items.insert(0, item); items.removeAt(i + 1);
}
} }
} }
} }