GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1357:249463e2afcf

Add addCatalogue method

perrinel -

r1357:249463e2afcf

parent child

Context file:

r1357:249463e2afcf

gui/include/Catalogue/CatalogueSideBarWidget.h +3 -1

             #include <QTreeWidgetItem>
             #include <QWidget>
+            class CatalogueAbstractTreeItem;
             class DBCatalogue;
             namespace Ui {
                 explicit CatalogueSideBarWidget(QWidget *parent = 0);
                 virtual ~CatalogueSideBarWidget();
-                void addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue, const QString &repository);
+                CatalogueAbstractTreeItem *addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
+                                                        const QString &repository);
                 void setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue, bool hasChanges);
                 QVector<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;

gui/src/Catalogue/CatalogueSideBarWidget.cpp +17 -25

                 void configureTreeWidget(QTreeView *treeView);
                 QModelIndex addDatabaseItem(const QString &name);
                 CatalogueAbstractTreeItem *getDatabaseItem(const QString &name);
-                void addCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue,
+                CatalogueAbstractTreeItem *addCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue,
-                                      const QModelIndex &databaseIndex);
+                                                            const QModelIndex &databaseIndex);
                 CatalogueTreeItem *getCatalogueItem(const std::shared_ptr<DBCatalogue> &catalogue) const;
                 void setHasChanges(bool value, const QModelIndex &index, CatalogueSideBarWidget *sideBarWidget);
                         &CatalogueSideBarWidget::emitSelection);
-                //    connect(ui->btnAdd, &QToolButton::clicked, [this]() {
+                connect(ui->btnAdd, &QToolButton::clicked, [this]() {
-                //        QVector<std::shared_ptr<DBCatalogue> > catalogues;
+                    auto catalogue = std::make_shared<DBCatalogue>();
-                //        impl->getSelectedItems(ui->treeView, events, eventProducts);
+                    catalogue->setName(QString("Cat"));
+                    sqpApp->catalogueController().addCatalogue(catalogue);
+                    auto item = this->addCatalogue(catalogue, REPOSITORY_DEFAULT);
+                    this->setCatalogueChanges(catalogue, true);
+                    ui->treeView->edit(impl->m_TreeModel->indexOf(item));
-                //        if (!events.isEmpty() && eventProducts.isEmpty()) {
+                });
-                //            if (QMessageBox::warning(this, tr("Remove Event(s)"),
-                //                                     tr("The selected event(s) will be completly removed "
-                //                                        "from the repository!\nAre you sure you want to
-                //                                        continue?"),
-                //                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
-                //                == QMessageBox::Yes) {
-                //                for (auto event : events) {
-                //                    sqpApp->catalogueController().removeEvent(event);
-                //                    impl->removeEvent(event, ui->treeView);
-                //                }
-                //            }
-                //        }
-                //    });
                 connect(impl->m_TreeModel, &CatalogueTreeModel::itemDropped, [this](auto index) {
                 delete ui;
             }
-            void CatalogueSideBarWidget::addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
+            CatalogueAbstractTreeItem *
-                                                      const QString &repository)
+            CatalogueSideBarWidget::addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
+                                                 const QString &repository)
             {
                 auto repositoryItem = impl->getDatabaseItem(repository);
-                impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
+                return impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
             }
             void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,
                 return nullptr;
             }
-            void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
+            CatalogueAbstractTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::addCatalogueItem(
                 const std::shared_ptr<DBCatalogue> &catalogue, const QModelIndex &databaseIndex)
             {
                 auto catalogueItem
                     = new CatalogueTreeItem{catalogue, QIcon{":/icones/catalogue.png"}, CATALOGUE_ITEM_TYPE};
                 m_TreeModel->addChildItem(catalogueItem, databaseIndex);
+                return catalogueItem;
             }
             CatalogueTreeItem *CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::getCatalogueItem(

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