GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1377:13ac2b0ff0d5

graph mode with a "New Zone"

trabillard -

r1377:13ac2b0ff0d5

parent child

Context file:

r1377:13ac2b0ff0d5

gui/src/Catalogue/CatalogueEventsWidget.cpp +27 -9

             /// Percentage added to the range of a event when it is displayed
             const auto EVENT_RANGE_MARGE = 30; // in %
+            const QString NEW_ZONE_TEXT = QStringLiteral("New Zone");
             struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
                 CatalogueEventsModel *m_Model = nullptr;
                 }
                 QStringList selectZone(QWidget *parent, const QStringList &selectedZones,
-                                       bool allowMultiSelection, const QPoint &location)
+                                       bool allowMultiSelection, bool addNewZoneOption, const QPoint &location)
                 {
                     auto availableZones = getAvailableVisualizationZoneList();
-                    if (availableZones.isEmpty()) {
+                    if (!addNewZoneOption && availableZones.isEmpty()) {
                         return QStringList{};
                     }
                     QActionGroup actionGroup{parent};
                     actionGroup.setExclusive(!allowMultiSelection);
+                    QVector<QAction *> zoneActions;
                     QMenu selectionMenu{parent};
+                    if (addNewZoneOption) {
+                        availableZones.prepend(NEW_ZONE_TEXT);
+                    }
                     selectionMenu.addSeparator();
-                    QVector<QAction *> zoneActions;
                     for (auto zone : availableZones) {
                         auto zoneAction = selectionMenu.addAction(zone);
                         zoneAction->setCheckable(true);
                         zoneActions << zoneAction;
                     }
-                    auto action = selectionMenu.exec(QCursor::pos());
+                    auto resultAction = selectionMenu.exec(QCursor::pos());
                     QStringList result;
-                    if (action == nullptr) {
+                    if (resultAction == nullptr) {
                         result = selectedZones;
                     }
                     else {
                         return;
                     }
+                    auto isNewZone = m_ZoneForGraphMode == NEW_ZONE_TEXT;
                     auto zone = tab->getZoneWithName(m_ZoneForGraphMode);
-                    if (!zone) {
+                    if (!isNewZone && !zone) {
                         qCWarning(LOG_CatalogueEventsWidget()) << "updateGraphMode: zone not found";
                         return;
                     }
                     m_CustomGraphs.clear();
                     // Closes the remaining graphs inside the zone
-                    zone->closeAllGraphs();
+                    if (zone) {
+                        zone->closeAllGraphs();
+                    }
+                    // Creates the zone if needed
+                    if (isNewZone) {
+                        zone = tab->createEmptyZone(0);
+                        m_ZoneForGraphMode = zone->name();
+                    }
                     // Calculates the range of each graph which will be created
                     auto graphRange = getGraphRanges(event);
                     if (checked) {
                         ui->btnChart->setChecked(false);
                         impl->m_ZonesForTimeMode
-                            = impl->selectZone(this, impl->m_ZonesForTimeMode, true,
+                            = impl->selectZone(this, impl->m_ZonesForTimeMode, true, false,
                                                this->mapToGlobal(ui->btnTime->frameGeometry().center()));
                         impl->updateForTimeMode(ui->treeView);
                 connect(ui->btnChart, &QToolButton::clicked, [this](auto checked) {
                     if (checked) {
                         ui->btnTime->setChecked(false);
                         impl->m_ZoneForGraphMode
-                            = impl->selectZone(this, {impl->m_ZoneForGraphMode}, false,
+                            = impl->selectZone(this, {impl->m_ZoneForGraphMode}, false, true,
                                                this->mapToGlobal(ui->btnChart->frameGeometry().center()))
                                   .value(0);

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