GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1292:1ee6a92bae00

store events with changes in the catalogue controller

trabillard -

r1292:1ee6a92bae00

parent child

Context file:

r1292:1ee6a92bae00

core/include/Catalogue/CatalogueController.h +1 0

                 //    void trashEvent(std::shared_ptr<DBEvent> event);
                 //    void restore(QUuid eventId);
                 void saveEvent(std::shared_ptr<DBEvent> event);
+                bool eventHasChanges(std::shared_ptr<DBEvent> event) const;
                 // Catalogue
                 //    bool createCatalogue(const QString &name, QVector<QUuid> eventList);

core/src/Catalogue/CatalogueController.cpp +20 0

                 QStringList m_RepositoryList;
                 CatalogueController *m_Q;
+                QSet<QString> m_EventKeysWithChanges;
+                QString eventUniqueKey(const std::shared_ptr<DBEvent> &event) const;
                 void copyDBtoDB(const QString &dbFrom, const QString &dbTo);
                 QString toWorkRepository(QString repository);
                 QString toSyncRepository(QString repository);
             {
                 event->setRepository(impl->toWorkRepository(event->getRepository()));
+                auto uniqueId = impl->eventUniqueKey(event);
+                impl->m_EventKeysWithChanges.insert(uniqueId);
                 impl->m_CatalogueDao.updateEvent(*event);
             }
             void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)
             {
                 impl->saveEvent(event, true);
+                impl->m_EventKeysWithChanges.remove(impl->eventUniqueKey(event));
+            }
+            bool CatalogueController::eventHasChanges(std::shared_ptr<DBEvent> event) const
+            {
+                return impl->m_EventKeysWithChanges.contains(impl->eventUniqueKey(event));
             }
             std::list<std::shared_ptr<DBCatalogue> >
                 }
                 impl->savAllDB();
+                impl->m_EventKeysWithChanges.clear();
             }
             QByteArray
                 qCDebug(LOG_CatalogueController()) << tr("CatalogueController init END");
             }
+            QString CatalogueController::CatalogueControllerPrivate::eventUniqueKey(
+                const std::shared_ptr<DBEvent> &event) const
+            {
+                return event->getUniqId().toString().append(event->getRepository());
+            }
             void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                              const QString &dbTo)
             {

gui/src/Catalogue/CatalogueEventsModel.cpp +2 -21

             struct CatalogueEventsModel::CatalogueEventsModelPrivate {
                 QVector<std::shared_ptr<DBEvent> > m_Events;
                 std::unordered_map<DBEvent *, QVector<std::shared_ptr<DBEventProduct> > > m_EventProducts;
-                std::unordered_set<std::shared_ptr<DBEvent> > m_EventsWithChanges;
                 QStringList columnNames()
                 {
                 QVariant sortData(int col, const std::shared_ptr<DBEvent> &event) const
                 {
                     if (col == (int)CatalogueEventsModel::Column::Validation) {
-                        return m_EventsWithChanges.find(event) != m_EventsWithChanges.cend() ? true
+                        auto hasChanges = sqpApp->catalogueController().eventHasChanges(event);
-                                                                                             : QVariant();
+                        return hasChanges ? true : QVariant();
                     }
                     return eventData(col, event);
                 impl->m_Events = events;
                 impl->m_EventProducts.clear();
-                impl->m_EventsWithChanges.clear();
                 for (auto event : events) {
                     impl->parseEventProduct(event);
                 }
                     beginRemoveRows(QModelIndex(), index, index);
                     impl->m_Events.removeAt(index);
                     impl->m_EventProducts.erase(event.get());
-                    impl->m_EventsWithChanges.erase(event);
                     endRemoveRows();
                 }
             }
                 return QModelIndex();
             }
-            void CatalogueEventsModel::setEventHasChanges(const std::shared_ptr<DBEvent> &event,
-                                                          bool hasChanges)
-                if (hasChanges) {
-                    impl->m_EventsWithChanges.insert(event);
-                else {
-                    impl->m_EventsWithChanges.erase(event);
-            bool CatalogueEventsModel::eventsHasChanges(const std::shared_ptr<DBEvent> &event) const
-                return impl->m_EventsWithChanges.find(event) != impl->m_EventsWithChanges.cend();
             QModelIndex CatalogueEventsModel::index(int row, int column, const QModelIndex &parent) const
             {
                 if (!hasIndex(row, column, parent)) {

gui/src/Catalogue/CatalogueEventsWidget.cpp +18 -9

                 VisualizationWidget *m_VisualizationWidget = nullptr;
-                void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, QTreeView *treeView)
+                void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, CatalogueEventsWidget *widget)
                 {
-                    treeView->setSortingEnabled(false);
+                    widget->ui->treeView->setSortingEnabled(false);
                     m_Model->setEvents(events);
-                    treeView->setSortingEnabled(true);
+                    widget->ui->treeView->setSortingEnabled(true);
+                    for (auto event : events) {
+                        if (sqpApp->catalogueController().eventHasChanges(event)) {
+                            auto index = m_Model->indexOf(event);
+                            widget->setEventChanges(event, true);
+                        }
+                    }
                 }
                 void addEvent(const std::shared_ptr<DBEvent> &event, QTreeView *treeView)
                 connect(impl->m_Model, &CatalogueEventsModel::modelSorted, [this]() {
                     auto allEvents = impl->m_Model->events();
                     for (auto event : allEvents) {
-                        setEventChanges(event, impl->m_Model->eventsHasChanges(event));
+                        setEventChanges(event, sqpApp->catalogueController().eventHasChanges(event));
                     }
                 });
                                 [this, event]() { setEventChanges(event, false); });
                             ui->treeView->setIndexWidget(validationIndex, widget);
                         }
+                    }
-                        impl->m_Model->setEventHasChanges(event, hasChanges);
+                    else {
+                        // Note: the widget is destroyed
+                        ui->treeView->setIndexWidget(validationIndex, nullptr);
                     }
                 }
                 else {
                     }
                 }
-                impl->setEvents(events, ui->treeView);
+                impl->setEvents(events, this);
             }
             void CatalogueEventsWidget::populateWithAllEvents()
                     events << event;
                 }
-                impl->setEvents(events, ui->treeView);
+                impl->setEvents(events, this);
             }
             void CatalogueEventsWidget::clear()
             {
                 impl->m_DisplayedCatalogues.clear();
-                impl->setEvents({}, ui->treeView);
+                impl->setEvents({}, this);
             }
             void CatalogueEventsWidget::refresh()

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