GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1315:7185ea8182da

Merge branch 'develop' of...

perrinel -

r1315:7185ea8182da

parent child

Context file:

r1315:7185ea8182da

core/src/Catalogue/CatalogueController.cpp +3 -2

                     impl->m_CatalogueDao.updateEvent(eventTemp);
                 }
                 // update event parameter
                 auto uniqIdPredicate = std::make_shared<ComparaisonPredicate>(
                     QString{"uniqId"}, event->getUniqId(), ComparaisonOperation::EQUALEQUAL);
                 workPred->AddRequestPredicate(uniqIdPredicate);
                 workPred->AddRequestPredicate(workRepositoryPredicate);
                 auto workEvent = impl->m_CatalogueDao.getEvent(workPred);
                 *event = workEvent;
+                auto uniqueId = impl->eventUniqueKey(event);
+                impl->m_EventKeysWithChanges.insert(uniqueId);
             }
             void CatalogueController::saveEvent(std::shared_ptr<DBEvent> event)

gui/src/Catalogue/CatalogueActionManager.cpp +10 -3

                 auto &actionController = sqpApp->actionsGuiController();
                 auto createEventEnableFuntion = [](auto zones) {
-                    QSet<VisualizationGraphWidget *> usedGraphs;
+                    // Checks that all variables in the zones doesn't refer to the same product
+                    QSet<QString> usedDatasource;
                     for (auto zone : zones) {
                         auto graph = zone->parentGraphWidget();
-                        if (!usedGraphs.contains(graph)) {
+                        auto variables = graph->variables();
-                            usedGraphs.insert(graph);
+                        for (auto var : variables) {
+                            auto datasourceId = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
+                            if (!usedDatasource.contains(datasourceId)) {
+                                usedDatasource.insert(datasourceId);
                             }
                             else {
                                 return false;
                             }
                         }
+                    }
                     return true;
                 };

gui/src/Catalogue/CatalogueEventsWidget.cpp +7 -3

                 QStringList m_ZonesForTimeMode;
                 QString m_ZoneForGraphMode;
                 QVector<std::shared_ptr<DBCatalogue> > m_DisplayedCatalogues;
+                bool m_AllEventDisplayed = false;
                 VisualizationWidget *m_VisualizationWidget = nullptr;
             bool CatalogueEventsWidget::isAllEventsDisplayed() const
             {
-                return impl->m_DisplayedCatalogues.isEmpty() && !impl->m_Model->events().isEmpty();
+                return impl->m_AllEventDisplayed;
             }
             bool CatalogueEventsWidget::isEventDisplayed(const std::shared_ptr<DBEvent> &event) const
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
             {
                 impl->m_DisplayedCatalogues = catalogues;
+                impl->m_AllEventDisplayed = false;
                 QSet<QUuid> eventIds;
                 QVector<std::shared_ptr<DBEvent> > events;
             void CatalogueEventsWidget::populateWithAllEvents()
             {
                 impl->m_DisplayedCatalogues.clear();
+                impl->m_AllEventDisplayed = true;
                 auto allEvents = sqpApp->catalogueController().retrieveAllEvents();
             void CatalogueEventsWidget::clear()
             {
                 impl->m_DisplayedCatalogues.clear();
+                impl->m_AllEventDisplayed = false;
                 impl->setEvents({}, this);
             }
             void CatalogueEventsWidget::refresh()
             {
-                if (impl->m_DisplayedCatalogues.isEmpty()) {
+                if (isAllEventsDisplayed()) {
                     populateWithAllEvents();
                 }
-                else {
+                else if (!impl->m_DisplayedCatalogues.isEmpty()) {
                     populateWithCatalogues(impl->m_DisplayedCatalogues);
                 }
             }

General Comments 0

Write
Preview

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

No TODOs yet

	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