GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1288:15741afd69db

Fix sorting with event products

trabillard -

r1288:15741afd69db

parent child

Context file:

r1288:15741afd69db

gui/src/Catalogue/CatalogueEventsModel.cpp +16 -4

                     Q_ASSERT(false);
                     return QStringLiteral("Unknown Data");
                 }
+                void refreshChildrenOfIndex(CatalogueEventsModel *model, const QModelIndex &index) const
+                {
+                    auto childCount = model->rowCount(index);
+                    auto colCount = model->columnCount();
+                    emit model->dataChanged(model->index(0, 0, index),
+                                            model->index(childCount, colCount, index));
+                }
             };
             CatalogueEventsModel::CatalogueEventsModel(QObject *parent)
             void CatalogueEventsModel::addEvent(const std::shared_ptr<DBEvent> &event)
             {
-                beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
+                beginInsertRows(QModelIndex(), impl->m_Events.count(), impl->m_Events.count());
                 impl->m_Events.append(event);
                 impl->parseEventProduct(event);
                 endInsertRows();
+                // Also refreshes its children event products
+                auto eventIndex = index(impl->m_Events.count(), 0);
+                impl->refreshChildrenOfIndex(this, eventIndex);
             }
             void CatalogueEventsModel::removeEvent(const std::shared_ptr<DBEvent> &event)
                     emit dataChanged(eventIndex, index(eventIndex.row(), colCount));
                     // Also refreshes its children event products
-                    auto childCount = rowCount(eventIndex);
+                    impl->refreshChildrenOfIndex(this, eventIndex);
-                    emit dataChanged(index(0, 0, eventIndex), index(childCount, colCount, eventIndex));
                 }
                 else {
                     qCWarning(LOG_CatalogueEventsModel()) << "refreshEvent: event not found.";
             void CatalogueEventsModel::sort(int column, Qt::SortOrder order)
             {
+                beginResetModel();
                 std::sort(impl->m_Events.begin(), impl->m_Events.end(),
                           [this, column, order](auto e1, auto e2) {
                               auto data1 = impl->sortData(column, e1);
                               return order == Qt::AscendingOrder ? result : !result;
                           });
-                emit dataChanged(QModelIndex(), QModelIndex());
+                endResetModel();
                 emit modelSorted();
             }

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages