GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1347:12c6415397ca

Link between selection zone item and event

trabillard -

r1347:12c6415397ca

parent child

Context file:

r1347:12c6415397ca

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

             class DBEvent;
             class DBEventProduct;
             class VisualizationWidget;
+            class VisualizationSelectionZoneItem;
             namespace Ui {
             class CatalogueEventsWidget;
             signals:
                 void eventsSelected(const QVector<std::shared_ptr<DBEvent> > &event);
+                void eventsRemoved(const QVector<std::shared_ptr<DBEvent> > &event);
                 void eventProductsSelected(
                     const QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > >
                         &eventproducts);
                 void selectionCleared();
+                void selectionZoneAdded(const std::shared_ptr<DBEvent> &event, const QString &productId,
+                                        VisualizationSelectionZoneItem *selectionZone);
             public:
                 explicit CatalogueEventsWidget(QWidget *parent = 0);
                 bool isAllEventsDisplayed() const;
                 bool isEventDisplayed(const std::shared_ptr<DBEvent> &event) const;
+                void refreshEvent(const std::shared_ptr<DBEvent> &event);
             public slots:
                 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
                 void populateWithAllEvents();

gui/include/Catalogue/CatalogueInspectorWidget.h +2 0

                                      const std::shared_ptr<DBEventProduct> &eventProduct);
                 void setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue);
+                void refresh();
             public slots:
                 void showPage(Page page);

gui/include/Visualization/VisualizationGraphWidget.h +2 0

                 QVector<SqpRange> selectionZoneRanges() const;
                 /// Adds new selection zones in the graph
                 void addSelectionZones(const QVector<SqpRange> &ranges);
+                /// Adds a new selection zone in the graph
+                VisualizationSelectionZoneItem *addSelectionZone(const QString &name, const SqpRange &range);
                 /// Removes the specified selection zone
                 void removeSelectionZone(VisualizationSelectionZoneItem *selectionZone);

gui/include/Visualization/VisualizationSelectionZoneItem.h +5 0

             class VisualizationGraphWidget;
             class VisualizationSelectionZoneItem : public QCPItemRect {
+                Q_OBJECT
+            signals:
+                /// Signal emitted when the zone range is edited manually
+                void rangeEdited(const SqpRange &range);
             public:
                 VisualizationSelectionZoneItem(QCustomPlot *plot);

gui/meson.build +1 0

               'include/Visualization/VisualizationDragDropContainer.h',
               'include/Visualization/VisualizationDragWidget.h',
               'include/Visualization/ColorScaleEditor.h',
+              'include/Visualization/VisualizationSelectionZoneItem.h',
               'include/Actions/SelectionZoneAction.h',
               'include/Visualization/VisualizationMultiZoneSelectionDialog.h',
               'include/Catalogue/CatalogueExplorer.h',

gui/src/Catalogue/CatalogueEventsWidget.cpp +18 -7

                     return correctedGraphRanges;
                 }
-                void updateForGraphMode(QTreeView *treeView)
+                void updateForGraphMode(CatalogueEventsWidget *catalogueEventWidget)
                 {
-                    auto selectedRows = treeView->selectionModel()->selectedRows();
+                    auto selectedRows = catalogueEventWidget->ui->treeView->selectionModel()->selectedRows();
                     if (selectedRows.count() != 1) {
                         qCWarning(LOG_CatalogueEventsWidget())
                             << "updateGraphMode: not compatible with multiple events selected";
                         productRange.m_TStart = eventProduct.getTStart();
                         productRange.m_TEnd = eventProduct.getTEnd();
-                        auto context = new QObject{treeView};
+                        auto context = new QObject{catalogueEventWidget};
                         QObject::connect(
                             &sqpApp->variableController(), &VariableController::variableAdded, context,
-                            [this, zone, context, range, productRange, productId](auto variable) {
+                            [this, catalogueEventWidget, zone, context, event, range, productRange,
+                             productId](auto variable) {
                                 if (variable->metadata().value(DataSourceItem::ID_DATA_KEY).toString()
                                     == productId) {
                                     auto graph = zone->createGraph(variable);
                                     graph->setAutoRangeOnVariableInitialization(false);
-                                    graph->addSelectionZones({productRange});
+                                    auto selectionZone
+                                        = graph->addSelectionZone(event->getName(), productRange);
+                                    emit catalogueEventWidget->selectionZoneAdded(event, productId,
+                                                                                  selectionZone);
                                     m_CustomGraphs << graph;
                                     graph->setGraphRange(range, true);
                                                this->mapToGlobal(ui->btnChart->frameGeometry().center()))
                                   .value(0);
-                        impl->updateForGraphMode(ui->treeView);
+                        impl->updateForGraphMode(this);
                     }
                 });
                                 sqpApp->catalogueController().removeEvent(event);
                                 impl->removeEvent(event, ui->treeView);
                             }
+                            emit this->eventsRemoved(events);
                         }
                     }
                 });
                         impl->updateForTimeMode(ui->treeView);
                     }
                     else if (isNotMultiSelection && ui->btnChart->isChecked()) {
-                        impl->updateForGraphMode(ui->treeView);
+                        impl->updateForGraphMode(this);
                     }
                     QVector<std::shared_ptr<DBEvent> > events;
                 return impl->m_Model->indexOf(event).isValid();
             }
+            void CatalogueEventsWidget::refreshEvent(const std::shared_ptr<DBEvent> &event)
+            {
+                impl->m_Model->refreshEvent(event, true);
+            }
             void CatalogueEventsWidget::populateWithCatalogues(
                 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
             {

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

@@ -4,13 +4,20
4	#include <Catalogue/CatalogueActionManager.h>	4	#include <Catalogue/CatalogueActionManager.h>
5	#include <Catalogue/CatalogueController.h>	5	#include <Catalogue/CatalogueController.h>
6	#include <SqpApplication.h>	6	#include <SqpApplication.h>
		7	#include <Visualization/VisualizationGraphWidget.h>
		8	#include <Visualization/VisualizationSelectionZoneItem.h>
7	#include <Visualization/VisualizationWidget.h>	9	#include <Visualization/VisualizationWidget.h>
8		10
9	#include <DBCatalogue.h>	11	#include <DBCatalogue.h>
10	#include <DBEvent.h>	12	#include <DBEvent.h>
		13	#include <DBEventProduct.h>
		14
		15	#include <unordered_map>
11		16
12	struct CatalogueExplorer::CatalogueExplorerPrivate {	17	struct CatalogueExplorer::CatalogueExplorerPrivate {
13	CatalogueActionManager m_ActionManager;	18	CatalogueActionManager m_ActionManager;
		19	std::unordered_map<std::shared_ptr<DBEvent>, QVector<VisualizationSelectionZoneItem *> >
		20	m_SelectionZonesPerEvents;
14		21
15	CatalogueExplorerPrivate(CatalogueExplorer *catalogueExplorer)	22	CatalogueExplorerPrivate(CatalogueExplorer *catalogueExplorer)
16	: m_ActionManager(catalogueExplorer)	23	: m_ActionManager(catalogueExplorer)
@@ -27,6 +34,7 CatalogueExplorer::CatalogueExplorer(QWidget *parent)
27		34
28	impl->m_ActionManager.installSelectionZoneActions();	35	impl->m_ActionManager.installSelectionZoneActions();
29		36
		37	// Updates events and inspector when something is selected in the catalogue widget
30	connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto catalogues) {	38	connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto catalogues) {
31	if (catalogues.count() == 1) {	39	if (catalogues.count() == 1) {
32	ui->inspector->setCatalogue(catalogues.first());	40	ui->inspector->setCatalogue(catalogues.first());
@@ -66,6 +74,7 CatalogueExplorer::CatalogueExplorer(QWidget *parent)
66	ui->events->clear();	74	ui->events->clear();
67	});	75	});
68		76
		77	// Updates the inspectot when something is selected in the events
69	connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {	78	connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
70	if (events.count() == 1) {	79	if (events.count() == 1) {
71	ui->inspector->setEvent(events.first());	80	ui->inspector->setEvent(events.first());
@@ -88,6 +97,42 CatalogueExplorer::CatalogueExplorer(QWidget *parent)
88	connect(ui->events, &CatalogueEventsWidget::selectionCleared,	97	connect(ui->events, &CatalogueEventsWidget::selectionCleared,
89	[this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });	98	[this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
90		99
		100	// Manage Selection Zones associated to events
		101	connect(ui->events, &CatalogueEventsWidget::selectionZoneAdded,
		102	[this](auto event, auto productId, auto zone) {
		103	impl->m_SelectionZonesPerEvents[event] << zone;
		104	connect(zone, &VisualizationSelectionZoneItem::rangeEdited,
		105	[event, productId, this](auto range) {
		106	auto productList = event->getEventProducts();
		107	for (auto &product : productList) {
		108	if (product.getProductId() == productId) {
		109	product.setTStart(range.m_TStart);
		110	product.setTEnd(range.m_TEnd);
		111	}
		112	}
		113	event->setEventProducts(productList);
		114	sqpApp->catalogueController().updateEvent(event);
		115	ui->events->refreshEvent(event);
		116	ui->events->setEventChanges(event, true);
		117	ui->inspector->refresh();
		118	});
		119	});
		120
		121	connect(ui->events, &CatalogueEventsWidget::eventsRemoved, [this](auto events) {
		122	for (auto event : events) {
		123	auto associatedSelectionZonesIt = impl->m_SelectionZonesPerEvents.find(event);
		124	if (associatedSelectionZonesIt != impl->m_SelectionZonesPerEvents.cend()) {
		125	for (auto selectionZone : associatedSelectionZonesIt->second) {
		126	auto parentGraph = selectionZone->parentGraphWidget();
		127	parentGraph->removeSelectionZone(selectionZone);
		128	}
		129
		130	impl->m_SelectionZonesPerEvents.erase(event);
		131	}
		132	}
		133	});
		134
		135	// Updates changes from the inspector
91	connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {	136	connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
92	sqpApp->catalogueController().updateCatalogue(catalogue);	137	sqpApp->catalogueController().updateCatalogue(catalogue);
93	ui->catalogues->setCatalogueChanges(catalogue, true);	138	ui->catalogues->setCatalogueChanges(catalogue, true);

gui/src/Catalogue/CatalogueInspectorWidget.cpp +16 0

@@ -209,3 +209,19 void CatalogueInspectorWidget::setCatalogue(const std::shared_ptr<DBCatalogue> &
209		209
210	blockSignals(false);	210	blockSignals(false);
211	}	211	}
		212
		213	void CatalogueInspectorWidget::refresh()
		214	{
		215	switch (static_cast<Page>(ui->stackedWidget->currentIndex())) {
		216	case Page::CatalogueProperties:
		217	setCatalogue(impl->m_DisplayedCatalogue);
		218	break;
		219	case Page::EventProperties: {
		220	auto isEventShowed = ui->leEventName->isEnabled();
		221	setEvent(impl->m_DisplayedEvent);
		222	if (!isEventShowed && impl->m_DisplayedEvent) {
		223	setEventProduct(impl->m_DisplayedEvent, impl->m_DisplayedEventProduct);
		224	}
		225	}
		226	}
		227	}

gui/src/Visualization/VisualizationGraphWidget.cpp +14 0

@@ -438,6 +438,20 void VisualizationGraphWidget::addSelectionZones(const QVector<SqpRange> &ranges
438	plot().replot(QCustomPlot::rpQueuedReplot);	438	plot().replot(QCustomPlot::rpQueuedReplot);
439	}	439	}
440		440
		441	VisualizationSelectionZoneItem *VisualizationGraphWidget::addSelectionZone(const QString &name,
		442	const SqpRange &range)
		443	{
		444	// note: ownership is transfered to QCustomPlot
		445	auto zone = new VisualizationSelectionZoneItem(&plot());
		446	zone->setName(name);
		447	zone->setRange(range.m_TStart, range.m_TEnd);
		448	impl->addSelectionZone(zone);
		449
		450	plot().replot(QCustomPlot::rpQueuedReplot);
		451
		452	return zone;
		453	}
		454
441	void VisualizationGraphWidget::removeSelectionZone(VisualizationSelectionZoneItem *selectionZone)	455	void VisualizationGraphWidget::removeSelectionZone(VisualizationSelectionZoneItem *selectionZone)
442	{	456	{
443	parentVisualizationWidget()->selectionZoneManager().setSelected(selectionZone, false);	457	parentVisualizationWidget()->selectionZoneManager().setSelected(selectionZone, false);

gui/src/Visualization/VisualizationSelectionZoneItem.cpp +3 0

                             break;
                     }
+                    emit rangeEdited(range());
                     for (auto associatedZone : impl->m_AssociatedEditedZones) {
                         associatedZone->parentPlot()->replot();
+                        emit associatedZone->rangeEdited(associatedZone->range());
                     }
                 }
                 else {

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