HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1164:b6390f556418

Adaptation to last version of catalogue controller

trabillard -

r1164:b6390f556418

parent child

Context file:

r1164:b6390f556418

core/include/Catalogue/CatalogueController.h +2 -1

                 // Catalogue
                 //    bool createCatalogue(const QString &name, QVector<QUuid> eventList);
                 /// retrieveEvents with empty repository retrieve them from the default repository
-                std::list<std::shared_ptr<DBCatalogue> > retrieveCatalogues(const QString &repository) const;
+                std::list<std::shared_ptr<DBCatalogue> > retrieveCatalogues(const QString &repository
+                                                                            = QString()) const;
                 void updateCatalogue(std::shared_ptr<DBCatalogue> catalogue);
                 void removeCatalogue(std::shared_ptr<DBCatalogue> catalogue);
                 void saveCatalogue(std::shared_ptr<DBCatalogue> catalogue);

core/src/Catalogue/CatalogueController.cpp +14 -5

             void CatalogueController::addEvent(std::shared_ptr<DBEvent> event)
             {
-                event->setRepository(impl->toSyncRepository(event->getRepository()));
+                event->setRepository(impl->toWorkRepository(event->getRepository()));
                 impl->m_CatalogueDao.addEvent(*event);
             void CatalogueController::CatalogueControllerPrivate::copyDBtoDB(const QString &dbFrom,
                                                                              const QString &dbTo)
             {
-                auto catalogues = m_Q->retrieveCatalogues(dbFrom);
+                auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
-                auto events = m_Q->retrieveEvents(dbFrom);
+                auto catalogues = m_CatalogueDao.getCatalogues(dbFrom);
                 for (auto catalogue : catalogues) {
-                    m_CatalogueDao.copyCatalogue(*catalogue, dbTo, true);
+                    cataloguesShared.push_back(std::make_shared<DBCatalogue>(catalogue));
                 }
+                auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
+                auto events = m_CatalogueDao.getEvents(dbFrom);
                 for (auto event : events) {
+                    eventsShared.push_back(std::make_shared<DBEvent>(event));
+                }
+                for (auto catalogue : cataloguesShared) {
+                    m_CatalogueDao.copyCatalogue(*catalogue, dbTo, true);
+                }
+                for (auto event : eventsShared) {
                     m_CatalogueDao.copyEvent(*event, dbTo, true);
                 }
             }

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

                     event->setEventProducts(productList);
-                    // TODO
+                    sqpApp->catalogueController().addEvent(event);
                     if (catalogue) {
+                        // TODO
                         // catalogue->addEvent(event);
                     }
-                    else {
                 }
             };

gui/src/Catalogue/CatalogueExplorer.cpp +10 -4

             #include "ui_CatalogueExplorer.h"
             #include <Catalogue/CatalogueActionManager.h>
+            #include <Catalogue/CatalogueController.h>
+            #include <SqpApplication.h>
             #include <Visualization/VisualizationWidget.h>
             #include <DBCatalogue.h>
                 connect(ui->events, &CatalogueEventsWidget::selectionCleared,
                         [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
-                connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated,
+                connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
-                        [this](auto catalogue) { ui->catalogues->setCatalogueChanges(catalogue, true); });
+                    sqpApp->catalogueController().updateCatalogue(catalogue);
+                    ui->catalogues->setCatalogueChanges(catalogue, true);
+                });
-                connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated,
+                connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated, [this](auto event) {
-                        [this](auto event) { ui->events->setEventChanges(event, true); });
+                    sqpApp->catalogueController().updateEvent(event);
+                    ui->events->setEventChanges(event, true);
+                });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventProductUpdated,
                         [this](auto event, auto eventProduct) { ui->events->setEventChanges(event, true); });

gui/src/Catalogue/CatalogueSideBarWidget.cpp +7 -4

                 treeWidget->addTopLevelItem(separatorItem);
                 treeWidget->setItemWidget(separatorItem, 0, separator);
-                auto db = addDatabaseItem("Default", treeWidget);
+                auto repositories = sqpApp->catalogueController().getRepositories();
+                for (auto dbname : repositories) {
+                    auto db = addDatabaseItem(dbname, treeWidget);
-                auto catalogues = sqpApp->catalogueController().retrieveCatalogues("Default");
+                    auto catalogues = sqpApp->catalogueController().retrieveCatalogues(dbname);
-                for (auto catalogue : catalogues) {
+                    for (auto catalogue : catalogues) {
-                    addCatalogueItem(catalogue, db);
+                        addCatalogueItem(catalogue, db);
+                    }
                 }
                 treeWidget->expandAll();

gui/src/Catalogue/CatalogueTreeWidgetItem.cpp +4 0

             #include "Catalogue/CatalogueTreeWidgetItem.h"
             #include <Catalogue/CatalogueExplorerHelper.h>
+            #include <Catalogue/CatalogueController.h>
+            #include <SqpApplication.h>
             #include <memory>
             #include <DBCatalogue.h>
                     if (newName != impl->m_Catalogue->getName()) {
                         setText(0, newName);
                         impl->m_Catalogue->setName(newName);
+                        sqpApp->catalogueController().updateCatalogue(impl->m_Catalogue);
                         setHasChanges(true);
                     }
                 }

gui/src/Catalogue/CreateEventDialog.cpp +1 -1

                 connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
                 connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-                auto catalogues = sqpApp->catalogueController().getCatalogues("Default");
+                auto catalogues = sqpApp->catalogueController().retrieveCatalogues();
                 for (auto cat : catalogues) {
                     ui->cbCatalogue->addItem(cat->getName());
                     impl->m_DisplayedCatalogues << cat;

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