GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1117:eff9e479c5d5

Add action to remove the selected zone with the "del" buttons

trabillard -

r1117:eff9e479c5d5

parent child

Context file:

r1117:eff9e479c5d5

gui/include/Actions/SelectionZoneAction.h +5 0

                 /// Sets the function which determine if the action should be enabled or disabled
                 void setEnableFunction(EnableFunction fun);
+                /// Sets the shortcut displayed by the action.
+                /// Note: The shortcut is only displayed and not active because it is not permanently stored
+                void setDisplayedShortcut(const QKeySequence &shortcut);
+                QKeySequence displayedShortcut() const;
                 /// The name of the action
                 QString name() const noexcept;

gui/src/Actions/SelectionZoneAction.cpp +11 0

                 }
                 QString m_Name;
+                QKeySequence m_DisplayedShortcut;
                 SelectionZoneAction::ExecuteFunction m_Fun;
                 SelectionZoneAction::EnableFunction m_EnableFun = [](auto zones) { return true; };
             };
                 impl->m_EnableFun = std::move(fun);
             }
+            void SelectionZoneAction::setDisplayedShortcut(const QKeySequence &shortcut)
+            {
+                impl->m_DisplayedShortcut = shortcut;
+            }
+            QKeySequence SelectionZoneAction::displayedShortcut() const
+            {
+                return impl->m_DisplayedShortcut;
+            }
             QString SelectionZoneAction::name() const noexcept
             {
                 return impl->m_Name;

gui/src/Visualization/VisualizationActionManager.cpp +9 -7

@@ -11,13 +11,15 void VisualizationActionManager::installSelectionZoneActions()
11	{	11	{
12	auto &actionController = sqpApp->actionsGuiController();	12	auto &actionController = sqpApp->actionsGuiController();
13		13
14	actionController.addSectionZoneAction("Remove Selected Zone(s)", [](auto zones) {	14	auto removeZonesAction
15	for (auto selectionZone : zones) {	15	= actionController.addSectionZoneAction("Remove Selected Zone(s)", [](auto zones) {
16	if (auto ~~graph~~ = ~~selectionZone~~->~~parentGraphWidget~~()) {	16	for (auto selectionZone : zones) {
17	graph->removeSelectionZone(selectionZone);	17	if (auto graph = selectionZone->parentGraphWidget()) {
18	}	18	graph->removeSelectionZone(selectionZone);
19	}	19	}
20	});	20	}
		21	});
		22	removeZonesAction->setDisplayedShortcut(QKeySequence::Delete);
21		23
22	auto alignEnableFuntion = [](auto items) { return items.count() > 1; };	24	auto alignEnableFuntion = [](auto items) { return items.count() > 1; };
23		25

gui/src/Visualization/VisualizationGraphWidget.cpp +8 -1

             void VisualizationGraphWidget::removeSelectionZone(VisualizationSelectionZoneItem *selectionZone)
             {
+                parentVisualizationWidget()->selectionZoneManager().setSelected(selectionZone, false);
+                if (impl->m_HoveredZone == selectionZone) {
+                    impl->m_HoveredZone = nullptr;
+                    setCursor(Qt::ArrowCursor);
+                }
                 impl->m_SelectionZones.removeAll(selectionZone);
                 plot().removeItem(selectionZone);
                 plot().replot(QCustomPlot::rpQueuedReplot);
-                parentVisualizationWidget()->selectionZoneManager().setSelected(selectionZone, false);
             }
             void VisualizationGraphWidget::undoZoom()
                     for (auto zoneAction : zoneActions) {
                         auto action = graphMenu.addAction(zoneAction->name());
                         action->setEnabled(zoneAction->isEnabled(selectedItems));
+                        action->setShortcut(zoneAction->displayedShortcut());
                         QObject::connect(action, &QAction::triggered,
                                          [zoneAction, selectedItems]() { zoneAction->execute(selectedItems); });
                     }

gui/src/Visualization/VisualizationSelectionZoneManager.cpp +1 -1

             {
                 if (value != item->selected()) {
                     item->setSelected(value);
-                    item->parentPlot()->replot();
+                    item->parentPlot()->replot(QCustomPlot::rpQueuedReplot);
                 }
                 if (!value && impl->m_SelectedItems.contains(item)) {

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

             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/VisualizationActionManager.h"
             #include "Visualization/VisualizationGraphWidget.h"
+            #include "Visualization/VisualizationSelectionZoneItem.h"
             #include "Visualization/VisualizationSelectionZoneManager.h"
             #include "Visualization/VisualizationTabWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
                 sqpApp->dragDropGuiController().addDragDropTabBar(ui->tabWidget->tabBar());
+                // Actions
                 impl->m_ActionManager.installSelectionZoneActions();
+                auto removeZoneAction = new QAction("Remove selected zone(s)");
+                removeZoneAction->setShortcut(QKeySequence::Delete);
+                connect(removeZoneAction, &QAction::triggered, [this]() {
+                    auto selection = impl->m_ZoneSelectionManager->selectedItems();
+                    for (auto selectionZone : selection) {
+                        if (auto graph = selectionZone->parentGraphWidget()) {
+                            graph->removeSelectionZone(selectionZone);
+                        }
+                    }
+                });
+                addAction(removeZoneAction);
                 // Adds default tab
                 addTabView();
             }

General Comments 4

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

perrinel

|

Status change > Approved

You need to be logged in to leave comments. Login now

	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