github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-07-18 01:12:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

modellist: emit layoutChanged when sorting, but not otherwise

Browse Source 
Also, hint to layoutChanged about the specific way in which the model
was sorted.

Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2024-10-04 18:48:42 -04:00
parent 62186a007e
commit 348c0515d8
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gpt4all-chat/src/modellist.cpp
View File

@ -1008,24 +1008,22 @@ void ModelList::updateDataInternal(const QString &id, const QVector<QPair<int, Q
info->checkedEmbeddingModel = true; info->checkedEmbeddingModel = true;
} }
if (shouldSort) {
auto s = m_discoverSort;
auto d = m_discoverSortDirection;
std::stable_sort(m_models.begin(), m_models.end(), [s, d](const ModelInfo* lhs, const ModelInfo* rhs) {
return ModelList::lessThan(lhs, rhs, s, d);
});
}
lock.unlock(); lock.unlock();
if (shouldSort)
resortModel();
emit dataChanged(createIndex(index, 0), createIndex(index, 0)); emit dataChanged(createIndex(index, 0), createIndex(index, 0));
emit selectableModelListChanged(); emit selectableModelListChanged();
if (relock) if (relock)
lock.relock(); lock.relock();
} }
void ModelList::resortModel() void ModelList::resortModel()
{ {
emit layoutAboutToBeChanged(); const QList<QPersistentModelIndex> parents { QModelIndex() };
emit layoutAboutToBeChanged(parents, QAbstractItemModel::VerticalSortHint);
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
auto s = m_discoverSort; auto s = m_discoverSort;
@ -1034,7 +1032,7 @@ void ModelList::resortModel()
return ModelList::lessThan(lhs, rhs, s, d); return ModelList::lessThan(lhs, rhs, s, d);
}); });
} }
emit layoutChanged(); emit layoutChanged(parents, QAbstractItemModel::VerticalSortHint);
} }
void ModelList::updateDataByFilename(const QString &filename, QVector<QPair<int, QVariant>> data) void ModelList::updateDataByFilename(const QString &filename, QVector<QPair<int, QVariant>> data)
@ -1938,7 +1936,6 @@ void ModelList::clearDiscoveredModels()
} }
for (auto &info : std::as_const(infos)) for (auto &info : std::as_const(infos))
removeInternal(info); removeInternal(info);
emit layoutChanged();
} }
float ModelList::discoverProgress() const float ModelList::discoverProgress() const
@ -2187,7 +2184,6 @@ void ModelList::handleDiscoveryItemFinished()
emit discoverProgressChanged(); emit discoverProgressChanged();
if (discoverProgress() >= 1.0) { if (discoverProgress() >= 1.0) {
emit layoutChanged();
m_discoverInProgress = false; m_discoverInProgress = false;
emit discoverInProgressChanged(); emit discoverInProgressChanged();
} }