GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1262:99c1ba5e139b

Updates model after an event has been created through the colored zone

trabillard -

r1262:99c1ba5e139b

parent child

Context file:

r1262:99c1ba5e139b

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

             #include <Common/spimpl.h>
+            class CatalogueExplorer;
             class CatalogueActionManager {
             public:
-                CatalogueActionManager();
+                CatalogueActionManager(CatalogueExplorer *catalogueExplorer);
                 void installSelectionZoneActions();

gui/include/Catalogue/CatalogueEventsWidget.h +6 0

                 void setVisualizationWidget(VisualizationWidget *visualization);
+                void addEvent(const std::shared_ptr<DBEvent> &event);
                 void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
+                QVector<std::shared_ptr<DBCatalogue> > displayedCatalogues() const;
+                bool isAllEventsDisplayed() const;
+                bool isEventDisplayed(const std::shared_ptr<DBEvent> &event) const;
             public slots:
                 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
                 void populateWithAllEvents();
+                void refresh();
             private:
                 Ui::CatalogueEventsWidget *ui;

gui/include/Catalogue/CatalogueExplorer.h +6 0

             class CatalogueExplorer;
             }
+            class CatalogueEventsWidget;
+            class CatalogueSideBarWidget;
             class VisualizationWidget;
             class CatalogueExplorer : public QDialog {
                 void setVisualizationWidget(VisualizationWidget *visualization);
+                CatalogueEventsWidget &eventsWidget() const;
+                CatalogueSideBarWidget &sideBarWidget() const;
             private:
                 Ui::CatalogueExplorer *ui;

gui/include/Catalogue/CatalogueSideBarWidget.h +3 0

                 explicit CatalogueSideBarWidget(QWidget *parent = 0);
                 virtual ~CatalogueSideBarWidget();
+                void 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;
             private:
                 Ui::CatalogueSideBarWidget *ui;

gui/include/Catalogue/CreateEventDialog.h +2 -1

                 Q_OBJECT
             public:
-                explicit CreateEventDialog(QWidget *parent = 0);
+                explicit CreateEventDialog(const QVector<std::shared_ptr<DBCatalogue> > &catalogues,
+                                           QWidget *parent = 0);
                 virtual ~CreateEventDialog();
                 void hideCatalogueChoice();

gui/src/Catalogue/CatalogueActionManager.cpp +30 -4

             #include <Visualization/VisualizationGraphWidget.h>
             #include <Visualization/VisualizationSelectionZoneItem.h>
+            #include <Catalogue/CatalogueEventsWidget.h>
+            #include <Catalogue/CatalogueExplorer.h>
+            #include <Catalogue/CatalogueSideBarWidget.h>
             #include <Catalogue/CreateEventDialog.h>
             #include <DBCatalogue.h>
             #include <memory>
             struct CatalogueActionManager::CatalogueActionManagerPrivate {
+                CatalogueExplorer *m_CatalogueExplorer = nullptr;
+                CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)
+                        : m_CatalogueExplorer(catalogueExplorer)
+                {
+                }
                 void createEventFromZones(const QString &eventName,
                                           const QVector<VisualizationSelectionZoneItem *> &zones,
                                           const std::shared_ptr<DBCatalogue> &catalogue = nullptr)
                     sqpApp->catalogueController().addEvent(event);
                     if (catalogue) {
                         // TODO
                         // catalogue->addEvent(event);
+                        m_CatalogueExplorer->sideBarWidget().setCatalogueChanges(catalogue, true);
+                        if (m_CatalogueExplorer->eventsWidget().displayedCatalogues().contains(catalogue)) {
+                            m_CatalogueExplorer->eventsWidget().addEvent(event);
+                            m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
+                        }
+                    }
+                    else if (m_CatalogueExplorer->eventsWidget().isAllEventsDisplayed()) {
+                        m_CatalogueExplorer->eventsWidget().addEvent(event);
+                        m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
                     }
                 }
             };
-            CatalogueActionManager::CatalogueActionManager()
+            CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
-                    : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>()}
+                    : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}
             {
             }
                 auto createEventAction = actionController.addSectionZoneAction(
                     {QObject::tr("Catalogues")}, QObject::tr("New Event..."), [this](auto zones) {
-                        CreateEventDialog dialog;
+                        CreateEventDialog dialog(
+                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues("Default"));
                         dialog.hideCatalogueChoice();
                         if (dialog.exec() == QDialog::Accepted) {
                             impl->createEventFromZones(dialog.eventName(), zones);
                 auto createEventInCatalogueAction = actionController.addSectionZoneAction(
                     {QObject::tr("Catalogues")}, QObject::tr("New Event in Catalogue..."), [this](auto zones) {
-                        CreateEventDialog dialog;
+                        CreateEventDialog dialog(
+                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues("Default"));
                         if (dialog.exec() == QDialog::Accepted) {
                             auto selectedCatalogue = dialog.selectedCatalogue();
                             if (!selectedCatalogue) {
                                 selectedCatalogue = std::make_shared<DBCatalogue>();
                                 selectedCatalogue->setName(dialog.catalogueName());
+                                // sqpApp->catalogueController().addCatalogue(selectedCatalogue); TODO
+                                impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(selectedCatalogue,
+                                                                                        "Default");
                             }
                             impl->createEventFromZones(dialog.eventName(), zones, selectedCatalogue);

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

                 CatalogueEventsModel *m_Model = nullptr;
                 QStringList m_ZonesForTimeMode;
                 QString m_ZoneForGraphMode;
+                QVector<std::shared_ptr<DBCatalogue> > m_DisplayedCatalogues;
                 VisualizationWidget *m_VisualizationWidget = nullptr;
                 impl->m_VisualizationWidget = visualization;
             }
+            void CatalogueEventsWidget::addEvent(const std::shared_ptr<DBEvent> &event)
+            {
+                impl->addEvent(event, ui->treeView);
+            }
             void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges)
             {
                 impl->m_Model->refreshEvent(event);
                             [this, event]() { setEventChanges(event, false); });
                         ui->treeView->setIndexWidget(validationIndex, widget);
                     }
+                    impl->m_Model->setEventHasChanges(event, hasChanges);
                 }
                 else {
-                    // Note: the widget is destroyed
+                    qCWarning(LOG_CatalogueEventsWidget())
-                    ui->treeView->setIndexWidget(validationIndex, nullptr);
+                        << "setEventChanges: the event is not displayed in the model.";
                 }
+            }
+            QVector<std::shared_ptr<DBCatalogue> > CatalogueEventsWidget::displayedCatalogues() const
+            {
+                return impl->m_DisplayedCatalogues;
+            }
+            bool CatalogueEventsWidget::isAllEventsDisplayed() const
+            {
+                return impl->m_DisplayedCatalogues.isEmpty();
+            }
-                impl->m_Model->setEventHasChanges(event, hasChanges);
+            bool CatalogueEventsWidget::isEventDisplayed(const std::shared_ptr<DBEvent> &event) const
+            {
+                return impl->m_Model->indexOf(event).isValid();
             }
             void CatalogueEventsWidget::populateWithCatalogues(
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
             {
+                impl->m_DisplayedCatalogues = catalogues;
                 QSet<QUuid> eventIds;
                 QVector<std::shared_ptr<DBEvent> > events;
             void CatalogueEventsWidget::populateWithAllEvents()
             {
+                impl->m_DisplayedCatalogues.clear();
                 auto allEvents = sqpApp->catalogueController().retrieveAllEvents();
                 QVector<std::shared_ptr<DBEvent> > events;
                 impl->setEvents(events, ui->treeView);
             }
+            void CatalogueEventsWidget::refresh()
+            {
+                if (impl->m_DisplayedCatalogues.isEmpty()) {
+                    populateWithAllEvents();
+                }
+                else {
+                    populateWithCatalogues(impl->m_DisplayedCatalogues);
+                }
+            }

gui/src/Catalogue/CatalogueExplorer.cpp +16 -1

             struct CatalogueExplorer::CatalogueExplorerPrivate {
                 CatalogueActionManager m_ActionManager;
+                CatalogueExplorerPrivate(CatalogueExplorer *catalogueExplorer)
+                        : m_ActionManager(catalogueExplorer)
+                {
+                }
             };
             CatalogueExplorer::CatalogueExplorer(QWidget *parent)
                     : QDialog(parent, Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
                       ui(new Ui::CatalogueExplorer),
-                      impl{spimpl::make_unique_impl<CatalogueExplorerPrivate>()}
+                      impl{spimpl::make_unique_impl<CatalogueExplorerPrivate>(this)}
             {
                 ui->setupUi(this);
             {
                 ui->events->setVisualizationWidget(visualization);
             }
+            CatalogueEventsWidget &CatalogueExplorer::eventsWidget() const
+            {
+                return *ui->events;
+            }
+            CatalogueSideBarWidget &CatalogueExplorer::sideBarWidget() const
+            {
+                return *ui->catalogues;
+            }

gui/src/Catalogue/CatalogueSideBarWidget.cpp +25 0

@@ -154,6 +154,13 CatalogueSideBarWidget::~CatalogueSideBarWidget()
154	delete ui;	154	delete ui;
155	}	155	}
156		156
		157	void CatalogueSideBarWidget::addCatalogue(const std::shared_ptr<DBCatalogue> &catalogue,
		158	const QString &repository)
		159	{
		160	auto repositoryItem = impl->getDatabaseItem(repository);
		161	impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
		162	}
		163
157	void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,	164	void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,
158	bool hasChanges)	165	bool hasChanges)
159	{	166	{
@@ -164,6 +171,24 void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalog
164	}	171	}
165	}	172	}
166		173
		174	QVector<std::shared_ptr<DBCatalogue> >
		175	CatalogueSideBarWidget::getCatalogues(const QString &repository) const
		176	{
		177	QVector<std::shared_ptr<DBCatalogue> > result;
		178	auto repositoryItem = impl->getDatabaseItem(repository);
		179	for (auto child : repositoryItem->children()) {
		180	if (child->type() == CATALOGUE_ITEM_TYPE) {
		181	auto catalogueItem = static_cast<CatalogueTreeItem *>(child);
		182	result << catalogueItem->catalogue();
		183	}
		184	else {
		185	qCWarning(LOG_CatalogueSideBarWidget()) << "getCatalogues: invalid structure";
		186	}
		187	}
		188
		189	return result;
		190	}
		191
167	void CatalogueSideBarWidget::onContextMenuRequested(const QPoint &pos)	192	void CatalogueSideBarWidget::onContextMenuRequested(const QPoint &pos)
168	{	193	{
169	QMenu menu{this};	194	QMenu menu{this};

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

                 QVector<std::shared_ptr<DBCatalogue> > m_DisplayedCatalogues;
             };
-            CreateEventDialog::CreateEventDialog(QWidget *parent)
+            CreateEventDialog::CreateEventDialog(const QVector<std::shared_ptr<DBCatalogue> > &catalogues,
+                                                 QWidget *parent)
                     : QDialog(parent),
                       ui(new Ui::CreateEventDialog),
                       impl{spimpl::make_unique_impl<CreateEventDialogPrivate>()}
                 connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
                 connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-                auto catalogues = sqpApp->catalogueController().retrieveCatalogues();
+                impl->m_DisplayedCatalogues = catalogues;
-                for (auto cat : catalogues) {
+                for (auto cat : impl->m_DisplayedCatalogues) {
                     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