GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1115:c55ac7376de6

Add a lambda in SeletionZoneAction to enable or disable the action

trabillard -

r1115:c55ac7376de6

parent child

Context file:

r1115:c55ac7376de6

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

                 using ExecuteFunction
                     = std::function<void(const QVector<VisualizationSelectionZoneItem *> &item)>;
+                using EnableFunction
+                    = std::function<bool(const QVector<VisualizationSelectionZoneItem *> &item)>;
                 /**
                  * @param name the name of the action, displayed to the user
                  * @param fun the function that will be called when the action is executed
                  */
                 explicit SelectionZoneAction(const QString &name, ExecuteFunction fun);
+                /// Sets the function which determine if the action should be enabled or disabled
+                void setEnableFunction(EnableFunction fun);
                 /// The name of the action
                 QString name() const noexcept;
                 /// Executes the action
                 void execute(const QVector<VisualizationSelectionZoneItem *> &item);
+                /// Returns true if the action is enabled
+                bool isEnabled(const QVector<VisualizationSelectionZoneItem *> &item);
             private:
                 class SelectionZoneActionPrivate;
                 spimpl::unique_impl_ptr<SelectionZoneActionPrivate> impl;

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

                 QString m_Name;
                 SelectionZoneAction::ExecuteFunction m_Fun;
+                SelectionZoneAction::EnableFunction m_EnableFun = [](auto zones) { return true; };
             };
             SelectionZoneAction::SelectionZoneAction(const QString &name, ExecuteFunction fun)
             {
             }
+            void SelectionZoneAction::setEnableFunction(EnableFunction fun)
+            {
+                impl->m_EnableFun = std::move(fun);
+            }
             QString SelectionZoneAction::name() const noexcept
             {
                 return impl->m_Name;
             {
                 impl->m_Fun(item);
             }
+            bool SelectionZoneAction::isEnabled(const QVector<VisualizationSelectionZoneItem *> &item)
+            {
+                return impl->m_EnableFun(item);
+            }

gui/src/Visualization/VisualizationActionManager.cpp +10 -2

             void VisualizationActionManager::installSelectionZoneActions()
             {
                 auto &actionController = sqpApp->actionsGuiController();
                 actionController.addSectionZoneAction("Remove Selected Zone(s)", [](auto &zones) {
                     for (auto selectionZone : zones) {
                         if (auto graph = selectionZone->parentGraphWidget()) {
                         }
                     }
                 });
-                actionController.addSectionZoneAction("Align Left", [](auto &zones) {});
-                actionController.addSectionZoneAction("Align Right", [](auto &zones) {});
+                auto alignEnableFuntion = [](auto &items) { return items.count() > 0; };
+                auto alignLeftAction = actionController.addSectionZoneAction("Align Left Vertically", [](auto &zones) {});
+                alignLeftAction->setEnableFunction(alignEnableFuntion);
+                auto alignRightAction
+                    = actionController.addSectionZoneAction("Align Right vertically", [](auto &zones) {});
+                alignRightAction->setEnableFunction(alignEnableFuntion);
             }

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

                     for (auto zoneAction : zoneActions) {
                         auto action = graphMenu.addAction(zoneAction->name());
+                        action->setEnabled(zoneAction->isEnabled(selectedItems));
                         QObject::connect(action, &QAction::triggered, [zoneAction, &selectedItems]() {
                             zoneAction->execute(selectedItems);
                         });

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