From 20294bb49a24665f2f54b163524f5fe968b3533c 2017-12-13 11:20:48
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-12-13 11:20:48
Subject: [PATCH] Adaptation to the shared pointers of catalogue controller

---

diff --git a/core/include/Catalogue/CatalogueController.h b/core/include/Catalogue/CatalogueController.h
index b503555..9d839af 100644
--- a/core/include/Catalogue/CatalogueController.h
+++ b/core/include/Catalogue/CatalogueController.h
@@ -41,8 +41,7 @@ public:
     std::list<std::shared_ptr<DBEvent> > retrieveEvents(const QString &repository) const;
     std::list<std::shared_ptr<DBEvent> > retrieveAllEvents() const;
     std::list<std::shared_ptr<DBEvent> >
-    retrieveEventsFromCatalogue(const QString &repository,
-                                std::shared_ptr<DBCatalogue> catalogue) const;
+    retrieveEventsFromCatalogue(std::shared_ptr<DBCatalogue> catalogue) const;
     //    void updateEvent(std::shared_ptr<DBEvent> event);
     //    void trashEvent(std::shared_ptr<DBEvent> event);
     //    void removeEvent(std::shared_ptr<DBEvent> event);
diff --git a/core/src/Catalogue/CatalogueController.cpp b/core/src/Catalogue/CatalogueController.cpp
index 3c995db..9e2ad7c 100644
--- a/core/src/Catalogue/CatalogueController.cpp
+++ b/core/src/Catalogue/CatalogueController.cpp
@@ -103,8 +103,7 @@ std::list<std::shared_ptr<DBEvent> > CatalogueController::retrieveAllEvents() co
 }
 
 std::list<std::shared_ptr<DBEvent> >
-CatalogueController::retrieveEventsFromCatalogue(const QString &repository,
-                                                 std::shared_ptr<DBCatalogue> catalogue) const
+CatalogueController::retrieveEventsFromCatalogue(std::shared_ptr<DBCatalogue> catalogue) const
 {
     auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
     auto events = impl->m_CatalogueDao.getCatalogueEvents(*catalogue);
diff --git a/gui/include/Catalogue/CatalogueEventsTableModel.h b/gui/include/Catalogue/CatalogueEventsTableModel.h
index de4f031..9bab0a7 100644
--- a/gui/include/Catalogue/CatalogueEventsTableModel.h
+++ b/gui/include/Catalogue/CatalogueEventsTableModel.h
@@ -4,17 +4,17 @@
 #include <Common/spimpl.h>
 #include <QAbstractTableModel>
 
-#include <DBEvent.h>
+class DBEvent;
 
 class CatalogueEventsTableModel : public QAbstractTableModel {
 public:
     CatalogueEventsTableModel(QObject *parent = nullptr);
 
-    void setEvents(const QVector<DBEvent> &events);
-    DBEvent getEvent(int row) const;
+    void setEvents(const QVector<std::shared_ptr<DBEvent> > &events);
+    std::shared_ptr<DBEvent> getEvent(int row) const;
 
-    void addEvent(const DBEvent &events);
-    void removeEvent(const DBEvent &events);
+    void addEvent(const std::shared_ptr<DBEvent> &events);
+    void removeEvent(const std::shared_ptr<DBEvent> &events);
 
     // Model
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
diff --git a/gui/include/Catalogue/CatalogueEventsWidget.h b/gui/include/Catalogue/CatalogueEventsWidget.h
index 76fbb71..04fa2af 100644
--- a/gui/include/Catalogue/CatalogueEventsWidget.h
+++ b/gui/include/Catalogue/CatalogueEventsWidget.h
@@ -19,7 +19,7 @@ class CatalogueEventsWidget : public QWidget {
     Q_OBJECT
 
 signals:
-    void eventsSelected(const QVector<DBEvent> &event);
+    void eventsSelected(const QVector<std::shared_ptr<DBEvent> > &event);
 
 public:
     explicit CatalogueEventsWidget(QWidget *parent = 0);
@@ -28,7 +28,7 @@ public:
     void setVisualizationWidget(VisualizationWidget *visualization);
 
 public slots:
-    void populateWithCatalogues(const QVector<DBCatalogue> &catalogues);
+    void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
 
 private:
     Ui::CatalogueEventsWidget *ui;
diff --git a/gui/include/Catalogue/CatalogueInspectorWidget.h b/gui/include/Catalogue/CatalogueInspectorWidget.h
index 2fbe0fd..c049a81 100644
--- a/gui/include/Catalogue/CatalogueInspectorWidget.h
+++ b/gui/include/Catalogue/CatalogueInspectorWidget.h
@@ -2,6 +2,7 @@
 #define SCIQLOP_CATALOGUEINSPECTORWIDGET_H
 
 #include <QWidget>
+#include <memory>
 
 namespace Ui {
 class CatalogueInspectorWidget;
@@ -22,8 +23,8 @@ public:
 
     Page currentPage() const;
 
-    void setEvent(const DBEvent &event);
-    void setCatalogue(const DBCatalogue &catalogue);
+    void setEvent(const std::shared_ptr<DBEvent> &event);
+    void setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue);
 
 public slots:
     void showPage(Page page);
diff --git a/gui/include/Catalogue/CatalogueSideBarWidget.h b/gui/include/Catalogue/CatalogueSideBarWidget.h
index 5be7225..f762c3b 100644
--- a/gui/include/Catalogue/CatalogueSideBarWidget.h
+++ b/gui/include/Catalogue/CatalogueSideBarWidget.h
@@ -5,7 +5,7 @@
 #include <QTreeWidgetItem>
 #include <QWidget>
 
-#include <DBCatalogue.h>
+class DBCatalogue;
 
 namespace Ui {
 class CatalogueSideBarWidget;
@@ -15,7 +15,7 @@ class CatalogueSideBarWidget : public QWidget {
     Q_OBJECT
 
 signals:
-    void catalogueSelected(const QVector<DBCatalogue> &catalogues);
+    void catalogueSelected(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
     void databaseSelected(const QStringList &databases);
     void allEventsSelected();
     void trashSelected();
diff --git a/gui/include/Catalogue/CatalogueTreeWidgetItem.h b/gui/include/Catalogue/CatalogueTreeWidgetItem.h
index 95be5d6..60ea055 100644
--- a/gui/include/Catalogue/CatalogueTreeWidgetItem.h
+++ b/gui/include/Catalogue/CatalogueTreeWidgetItem.h
@@ -4,18 +4,19 @@
 #include <Common/spimpl.h>
 #include <QTreeWidgetItem>
 
-#include <DBCatalogue.h>
+class DBCatalogue;
 
 
 class CatalogueTreeWidgetItem : public QTreeWidgetItem {
 public:
-    CatalogueTreeWidgetItem(DBCatalogue catalogue, int type = QTreeWidgetItem::Type);
+    CatalogueTreeWidgetItem(std::shared_ptr<DBCatalogue> catalogue,
+                            int type = QTreeWidgetItem::Type);
 
     QVariant data(int column, int role) const override;
     void setData(int column, int role, const QVariant &value) override;
 
     /// Returns the catalogue represented by the item
-    DBCatalogue catalogue() const;
+    std::shared_ptr<DBCatalogue> catalogue() const;
 
     void setHasChanges(bool value);
 
diff --git a/gui/src/Catalogue/CatalogueEventsTableModel.cpp b/gui/src/Catalogue/CatalogueEventsTableModel.cpp
index 3e423e3..54994b7 100644
--- a/gui/src/Catalogue/CatalogueEventsTableModel.cpp
+++ b/gui/src/Catalogue/CatalogueEventsTableModel.cpp
@@ -10,7 +10,7 @@
 #include <Time/TimeController.h>
 
 struct CatalogueEventsTableModel::CatalogueEventsTableModelPrivate {
-    QVector<DBEvent> m_Events;
+    QVector<std::shared_ptr<DBEvent> > m_Events;
 
     enum class Column { Event, TStart, TEnd, Tags, Product, NbColumn };
     QStringList columnNames()
@@ -18,20 +18,20 @@ struct CatalogueEventsTableModel::CatalogueEventsTableModelPrivate {
         return QStringList{tr("Event"), tr("TStart"), tr("TEnd"), tr("Tags"), tr("Product")};
     }
 
-    QVariant eventData(int col, const DBEvent &event) const
+    QVariant eventData(int col, const std::shared_ptr<DBEvent> &event) const
     {
         switch (static_cast<Column>(col)) {
             case Column::Event:
-                return event.getName();
+                return event->getName();
             case Column::TStart:
-                return DateUtils::dateTime(event.getTStart());
+                return DateUtils::dateTime(event->getTStart());
             case Column::TEnd:
-                return DateUtils::dateTime(event.getTEnd());
+                return DateUtils::dateTime(event->getTEnd());
             case Column::Product:
-                return event.getProduct();
+                return event->getProduct();
             case Column::Tags: {
                 QString tagList;
-                auto tags = const_cast<DBEvent *>(&event)->getTags();
+                auto tags = event->getTags();
                 for (auto tag : tags) {
                     tagList += tag.getName();
                     tagList += ' ';
@@ -54,26 +54,26 @@ CatalogueEventsTableModel::CatalogueEventsTableModel(QObject *parent)
 {
 }
 
-void CatalogueEventsTableModel::setEvents(const QVector<DBEvent> &events)
+void CatalogueEventsTableModel::setEvents(const QVector<std::shared_ptr<DBEvent> > &events)
 {
     beginResetModel();
     impl->m_Events = events;
     endResetModel();
 }
 
-DBEvent CatalogueEventsTableModel::getEvent(int row) const
+std::shared_ptr<DBEvent> CatalogueEventsTableModel::getEvent(int row) const
 {
     return impl->m_Events.value(row);
 }
 
-void CatalogueEventsTableModel::addEvent(const DBEvent &events)
+void CatalogueEventsTableModel::addEvent(const std::shared_ptr<DBEvent> &events)
 {
     beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
     // impl->m_Events.append(event); TODO
     endInsertRows();
 }
 
-void CatalogueEventsTableModel::removeEvent(const DBEvent &events)
+void CatalogueEventsTableModel::removeEvent(const std::shared_ptr<DBEvent> &events)
 {
     // TODO
     auto index = -1; // impl->m_Events.indexOf(event);
@@ -155,7 +155,7 @@ QMimeData *CatalogueEventsTableModel::mimeData(const QModelIndexList &indexes) c
 {
     auto mimeData = new QMimeData;
 
-    QVector<DBEvent> eventList;
+    QVector<std::shared_ptr<DBEvent> > eventList;
 
     SqpRange firstTimeRange;
     for (const auto &index : indexes) {
@@ -163,8 +163,8 @@ QMimeData *CatalogueEventsTableModel::mimeData(const QModelIndexList &indexes) c
             auto event = getEvent(index.row());
             if (eventList.isEmpty()) {
                 // Gets the range of the first variable
-                firstTimeRange.m_TStart = event.getTStart();
-                firstTimeRange.m_TEnd = event.getTEnd();
+                firstTimeRange.m_TStart = event->getTStart();
+                firstTimeRange.m_TEnd = event->getTEnd();
             }
 
             eventList << event;
diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp
index fbd9f7a..82cf681 100644
--- a/gui/src/Catalogue/CatalogueEventsWidget.cpp
+++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp
@@ -27,21 +27,21 @@ struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
 
     VisualizationWidget *m_VisualizationWidget = nullptr;
 
-    void setEvents(const QVector<DBEvent> &events, QTableView *tableView)
+    void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, QTableView *tableView)
     {
         tableView->setSortingEnabled(false);
         m_Model->setEvents(events);
         tableView->setSortingEnabled(true);
     }
 
-    void addEvent(const DBEvent &event, QTableView *tableView)
+    void addEvent(const std::shared_ptr<DBEvent> &event, QTableView *tableView)
     {
         tableView->setSortingEnabled(false);
         m_Model->addEvent(event);
         tableView->setSortingEnabled(true);
     }
 
-    void removeEvent(const DBEvent &event, QTableView *tableView)
+    void removeEvent(const std::shared_ptr<DBEvent> &event, QTableView *tableView)
     {
         tableView->setSortingEnabled(false);
         m_Model->removeEvent(event);
@@ -143,8 +143,8 @@ struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
                     for (auto zoneName : m_ZonesForTimeMode) {
                         if (auto zone = tab->getZoneWithName(zoneName)) {
                             SqpRange eventRange;
-                            eventRange.m_TStart = event.getTStart();
-                            eventRange.m_TEnd = event.getTEnd();
+                            eventRange.m_TStart = event->getTStart();
+                            eventRange.m_TEnd = event->getTEnd();
                             zone->setZoneRange(eventRange);
                         }
                     }
@@ -232,7 +232,7 @@ CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
     });
 
     auto emitSelection = [this]() {
-        QVector<DBEvent> events;
+        QVector<std::shared_ptr<DBEvent> > events;
         for (auto rowIndex : ui->tableView->selectionModel()->selectedRows()) {
             events << impl->m_Model->getEvent(rowIndex.row());
         }
@@ -271,19 +271,18 @@ void CatalogueEventsWidget::setVisualizationWidget(VisualizationWidget *visualiz
     impl->m_VisualizationWidget = visualization;
 }
 
-void CatalogueEventsWidget::populateWithCatalogues(const QVector<DBCatalogue> &catalogues)
+void CatalogueEventsWidget::populateWithCatalogues(
+    const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
 {
-    auto &dao = sqpApp->catalogueController().getDao();
-
     QSet<QUuid> eventIds;
-    QVector<DBEvent> events;
+    QVector<std::shared_ptr<DBEvent> > events;
 
     for (auto catalogue : catalogues) {
-        auto catalogueEvents = dao.getCatalogueEvents(catalogue);
+        auto catalogueEvents = sqpApp->catalogueController().retrieveEventsFromCatalogue(catalogue);
         for (auto event : catalogueEvents) {
-            if (!eventIds.contains(event.getUniqId())) {
+            if (!eventIds.contains(event->getUniqId())) {
                 events << event;
-                eventIds.insert(event.getUniqId());
+                eventIds.insert(event->getUniqId());
             }
         }
     }
diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
index 269bd50..e605cc8 100644
--- a/gui/src/Catalogue/CatalogueInspectorWidget.cpp
+++ b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
@@ -28,15 +28,15 @@ CatalogueInspectorWidget::Page CatalogueInspectorWidget::currentPage() const
     return static_cast<Page>(ui->stackedWidget->currentIndex());
 }
 
-void CatalogueInspectorWidget::setEvent(const DBEvent &event)
+void CatalogueInspectorWidget::setEvent(const std::shared_ptr<DBEvent> &event)
 {
     showPage(Page::EventProperties);
-    ui->leEventName->setText(event.getName());
-    ui->leEventMission->setText(event.getMission());
-    ui->leEventProduct->setText(event.getProduct());
+    ui->leEventName->setText(event->getName());
+    ui->leEventMission->setText(event->getMission());
+    ui->leEventProduct->setText(event->getProduct());
 
     QString tagList;
-    auto tags = const_cast<DBEvent *>(&event)->getTags();
+    auto tags = event->getTags();
     for (auto tag : tags) {
         tagList += tag.getName();
         tagList += ' ';
@@ -44,13 +44,13 @@ void CatalogueInspectorWidget::setEvent(const DBEvent &event)
 
     ui->leEventTags->setText(tagList);
 
-    ui->dateTimeEventTStart->setDateTime(DateUtils::dateTime(event.getTStart()));
-    ui->dateTimeEventTEnd->setDateTime(DateUtils::dateTime(event.getTEnd()));
+    ui->dateTimeEventTStart->setDateTime(DateUtils::dateTime(event->getTStart()));
+    ui->dateTimeEventTEnd->setDateTime(DateUtils::dateTime(event->getTEnd()));
 }
 
-void CatalogueInspectorWidget::setCatalogue(const DBCatalogue &catalogue)
+void CatalogueInspectorWidget::setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue)
 {
     showPage(Page::CatalogueProperties);
-    ui->leCatalogueName->setText(catalogue.getName());
-    ui->leCatalogueAuthor->setText(catalogue.getAuthor());
+    ui->leCatalogueName->setText(catalogue->getName());
+    ui->leCatalogueAuthor->setText(catalogue->getAuthor());
 }
diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
index 68d6659..4951da3 100644
--- a/gui/src/Catalogue/CatalogueSideBarWidget.cpp
+++ b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
@@ -19,12 +19,11 @@ constexpr auto DATABASE_ITEM_TYPE = QTreeWidgetItem::UserType + 3;
 
 struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
 
-    QHash<QTreeWidgetItem *, DBCatalogue> m_CatalogueMap;
-
     void configureTreeWidget(QTreeWidget *treeWidget);
     QTreeWidgetItem *addDatabaseItem(const QString &name, QTreeWidget *treeWidget);
     QTreeWidgetItem *getDatabaseItem(const QString &name, QTreeWidget *treeWidget);
-    void addCatalogueItem(const DBCatalogue &catalogue, QTreeWidgetItem *parentDatabaseItem);
+    void addCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue,
+                          QTreeWidgetItem *parentDatabaseItem);
 };
 
 CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
@@ -47,7 +46,7 @@ CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
             emit this->selectionCleared();
         }
         else {
-            QVector<DBCatalogue> catalogues;
+            QVector<std::shared_ptr<DBCatalogue> > catalogues;
             QStringList databases;
             int selectionType = selectedItems.first()->type();
 
@@ -155,13 +154,9 @@ void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::configureTreeWidget(
     treeWidget->addTopLevelItem(separatorItem);
     treeWidget->setItemWidget(separatorItem, 0, separator);
 
-    auto &dao = sqpApp->catalogueController().getDao();
-    auto allPredicate = std::make_shared<ComparaisonPredicate>(QString{"uniqId"}, "-1",
-                                                               ComparaisonOperation::DIFFERENT);
-
     auto db = addDatabaseItem("Default", treeWidget);
 
-    auto catalogues = dao.getCatalogues(allPredicate);
+    auto catalogues = sqpApp->catalogueController().getCatalogues("Default");
     for (auto catalogue : catalogues) {
         addCatalogueItem(catalogue, db);
     }
@@ -195,7 +190,7 @@ CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getDatabaseItem(const QSt
 }
 
 void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
-    const DBCatalogue &catalogue, QTreeWidgetItem *parentDatabaseItem)
+    const std::shared_ptr<DBCatalogue> &catalogue, QTreeWidgetItem *parentDatabaseItem)
 {
     auto catalogueItem = new CatalogueTreeWidgetItem{catalogue, CATALOGUE_ITEM_TYPE};
     catalogueItem->setIcon(0, QIcon{":/icones/catalogue.png"});
diff --git a/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp b/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
index 8bffae8..ac2a607 100644
--- a/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
+++ b/gui/src/Catalogue/CatalogueTreeWidgetItem.cpp
@@ -2,6 +2,7 @@
 
 #include <memory>
 
+#include <DBCatalogue.h>
 #include <QBoxLayout>
 #include <QToolButton>
 
@@ -9,13 +10,15 @@ const auto VALIDATION_BUTTON_ICON_SIZE = 12;
 
 struct CatalogueTreeWidgetItem::CatalogueTreeWidgetItemPrivate {
 
-    DBCatalogue m_Catalogue;
+    std::shared_ptr<DBCatalogue> m_Catalogue;
 
-    CatalogueTreeWidgetItemPrivate(DBCatalogue catalogue) : m_Catalogue(catalogue) {}
+    CatalogueTreeWidgetItemPrivate(std::shared_ptr<DBCatalogue> catalogue) : m_Catalogue(catalogue)
+    {
+    }
 };
 
 
-CatalogueTreeWidgetItem::CatalogueTreeWidgetItem(DBCatalogue catalogue, int type)
+CatalogueTreeWidgetItem::CatalogueTreeWidgetItem(std::shared_ptr<DBCatalogue> catalogue, int type)
         : QTreeWidgetItem(type),
           impl{spimpl::make_unique_impl<CatalogueTreeWidgetItemPrivate>(catalogue)}
 {
@@ -28,7 +31,7 @@ QVariant CatalogueTreeWidgetItem::data(int column, int role) const
         switch (role) {
             case Qt::EditRole: // fallthrough
             case Qt::DisplayRole:
-                return impl->m_Catalogue.getName();
+                return impl->m_Catalogue->getName();
             default:
                 break;
         }
@@ -41,9 +44,9 @@ void CatalogueTreeWidgetItem::setData(int column, int role, const QVariant &valu
 {
     if (role == Qt::EditRole && column == 0) {
         auto newName = value.toString();
-        if (newName != impl->m_Catalogue.getName()) {
+        if (newName != impl->m_Catalogue->getName()) {
             setText(0, newName);
-            impl->m_Catalogue.setName(newName);
+            impl->m_Catalogue->setName(newName);
             setHasChanges(true);
         }
     }
@@ -52,7 +55,7 @@ void CatalogueTreeWidgetItem::setData(int column, int role, const QVariant &valu
     }
 }
 
-DBCatalogue CatalogueTreeWidgetItem::catalogue() const
+std::shared_ptr<DBCatalogue> CatalogueTreeWidgetItem::catalogue() const
 {
     return impl->m_Catalogue;
 }