HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1327:07b2554d7734

Refresh catalogue menu when the catalogue list changed

trabillard -

r1327:07b2554d7734

parent child

Context file:

r1327:07b2554d7734

gui/include/Actions/ActionsGuiController.h +2 0

                 QVector<std::shared_ptr<SelectionZoneAction> > selectionZoneActions() const;
+                void removeAction(const std::shared_ptr<SelectionZoneAction> &action);
             private:
                 class ActionsGuiControllerPrivate;
                 spimpl::unique_impl_ptr<ActionsGuiControllerPrivate> impl;

gui/include/Catalogue/CatalogueActionManager.h +1 0

                 CatalogueActionManager(CatalogueExplorer *catalogueExplorer);
                 void installSelectionZoneActions();
+                void refreshCreateInCatalogueAction();
             private:
                 class CatalogueActionManagerPrivate;

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

                 void trashSelected();
                 void selectionCleared();
                 void catalogueSaved(const std::shared_ptr<DBCatalogue> &catalogue);
+                void catalogueListChanged();
             public:
                 explicit CatalogueSideBarWidget(QWidget *parent = 0);

gui/src/Actions/ActionsGuiController.cpp +5 0

@@ -34,3 +34,8 QVector<std::shared_ptr<SelectionZoneAction> > ActionsGuiController::selectionZo
34	{	34	{
35	return impl->m_SelectionZoneActions;	35	return impl->m_SelectionZoneActions;
36	}	36	}
		37
		38	void ActionsGuiController::removeAction(const std::shared_ptr<SelectionZoneAction> &action)
		39	{
		40	impl->m_SelectionZoneActions.removeAll(action);
		41	}

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

@@ -25,14 +25,15
25	#include <memory>	25	#include <memory>
26		26
27	const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");	27	const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");
28	const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event");	28	const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event...");
29		29
30	const auto DEFAULT_EVENT_NAME = QObject::tr("~~New~~ Event");	30	const auto DEFAULT_EVENT_NAME = QObject::tr("Event");
31	const auto DEFAULT_CATALOGUE_NAME = QObject::tr("~~New~~ Catalogue");	31	const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
32		32
33	struct CatalogueActionManager::CatalogueActionManagerPrivate {	33	struct CatalogueActionManager::CatalogueActionManagerPrivate {
34		34
35	CatalogueExplorer *m_CatalogueExplorer = nullptr;	35	CatalogueExplorer *m_CatalogueExplorer = nullptr;
		36	QVector<std::shared_ptr<SelectionZoneAction> > m_CreateInCatalogueActions;
36		37
37	CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)	38	CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)
38	: m_CatalogueExplorer(catalogueExplorer)	39	: m_CatalogueExplorer(catalogueExplorer)
@@ -85,6 +86,32 struct CatalogueActionManager::CatalogueActionManagerPrivate {
85	m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);	86	m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
86	}	87	}
87	}	88	}
		89
		90	SelectionZoneAction::EnableFunction createEventEnableFuntion() const
		91	{
		92	return [](auto zones) {
		93
		94	// Checks that all variables in the zones doesn't refer to the same product
		95	QSet<QString> usedDatasource;
		96	for (auto zone : zones) {
		97	auto graph = zone->parentGraphWidget();
		98	auto variables = graph->variables();
		99
		100	for (auto var : variables) {
		101	auto datasourceId
		102	= var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
		103	if (!usedDatasource.contains(datasourceId)) {
		104	usedDatasource.insert(datasourceId);
		105	}
		106	else {
		107	return false;
		108	}
		109	}
		110	}
		111
		112	return true;
		113	};
		114	}
88	};	115	};
89		116
90	CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)	117	CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
@@ -96,33 +123,10 void CatalogueActionManager::installSelectionZoneActions()
96	{	123	{
97	auto &actionController = sqpApp->actionsGuiController();	124	auto &actionController = sqpApp->actionsGuiController();
98		125
99	auto createEventEnableFuntion = [](auto zones) {
100
101	// Checks that all variables in the zones doesn't refer to the same product
102	QSet<QString> usedDatasource;
103	for (auto zone : zones) {
104	auto graph = zone->parentGraphWidget();
105	auto variables = graph->variables();
106
107	for (auto var : variables) {
108	auto datasourceId = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
109	if (!usedDatasource.contains(datasourceId)) {
110	usedDatasource.insert(datasourceId);
111	}
112	else {
113	return false;
114	}
115	}
116	}
117
118	return true;
119	};
120
121
122	auto createEventAction = actionController.addSectionZoneAction(	126	auto createEventAction = actionController.addSectionZoneAction(
123	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),	127	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),
124	[this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });	128	[this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });
125	createEventAction->setEnableFunction(createEventEnableFuntion);	129	createEventAction->setEnableFunction(impl->createEventEnableFuntion());
126		130
127	auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(	131	auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(
128	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),	132	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),
@@ -136,18 +140,32 void CatalogueActionManager::installSelectionZoneActions()
136		140
137	impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, newCatalogue);	141	impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, newCatalogue);
138	});	142	});
139	createEventInNewCatalogueAction->setEnableFunction(createEventEnableFuntion);	143	createEventInNewCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
		144
		145
		146	refreshCreateInCatalogueAction();
		147	}
		148
		149	void CatalogueActionManager::refreshCreateInCatalogueAction()
		150	{
		151	auto &actionController = sqpApp->actionsGuiController();
140		152
		153	for (auto action : impl->m_CreateInCatalogueActions) {
		154	actionController.removeAction(action);
		155	}
		156	impl->m_CreateInCatalogueActions.clear();
141		157
142	auto allCatalogues	158	auto allCatalogues
143	= impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);	159	= impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);
		160
144	for (auto catalogue : allCatalogues) {	161	for (auto catalogue : allCatalogues) {
145	auto catalogueName = catalogue->getName();	162	auto catalogueName = catalogue->getName();
146	auto createEventInCatalogueAction = actionController.addSectionZoneAction(	163	auto createEventInCatalogueAction = actionController.addSectionZoneAction(
147	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},	164	{CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},
148	QObject::tr("In ").append(catalogueName), [this, catalogue](auto zones) {	165	QObject::tr("In \"").append(catalogueName).append("\""), [this, catalogue](auto zones) {
149	impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);	166	impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);
150	});	167	});
151	createEventInCatalogueAction->setEnableFunction(createEventEnableFuntion);	168	createEventInCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
		169	impl->m_CreateInCatalogueActions << createEventInCatalogueAction;
152	}	170	}
153	}	171	}

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

                 connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSaved, ui->events,
                         &CatalogueEventsWidget::refresh);
+                connect(ui->catalogues, &CatalogueSideBarWidget::catalogueListChanged,
+                        [this]() { impl->m_ActionManager.refreshCreateInCatalogueAction(); });
                 // Updates the inspectot when something is selected in the events
                 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
                     if (events.count() == 1) {
                 connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
                     sqpApp->catalogueController().updateCatalogue(catalogue);
                     ui->catalogues->setCatalogueChanges(catalogue, true);
+                    impl->m_ActionManager.refreshCreateInCatalogueAction();
                 });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated, [this](auto event) {

gui/src/Catalogue/CatalogueSideBarWidget.cpp +12 -2

             constexpr auto CATALOGUE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 3;
             constexpr auto DATABASE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 4;
+            const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
             struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
                 ui->treeView->setModel(impl->m_TreeModel);
                 impl->configureTreeWidget(ui->treeView);
+                emit catalogueListChanged();
                 ui->treeView->header()->setStretchLastSection(false);
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
                 connect(ui->btnAdd, &QToolButton::clicked, [this]() {
                     auto catalogue = std::make_shared<DBCatalogue>();
-                    catalogue->setName(QString("Cat"));
+                    catalogue->setName(DEFAULT_CATALOGUE_NAME);
                     sqpApp->catalogueController().addCatalogue(catalogue);
                     auto item = this->addCatalogue(catalogue, REPOSITORY_DEFAULT);
                     this->setCatalogueChanges(catalogue, true);
                                     impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
                             }
                             emitSelection();
+                            emit catalogueListChanged();
                         }
                     }
                 });
                         this->emitSelection();
                     }
                     impl->setHasChanges(true, index, this);
+                    emit this->catalogueListChanged();
                 });
                 ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
                                                  const QString &repository)
             {
                 auto repositoryItem = impl->getDatabaseItem(repository);
-                return impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
+                auto catalogueItem
+                    = impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
+                emit catalogueListChanged();
+                return catalogueItem;
             }
             void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,

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