GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r675:bca343a0ae6b

Prohibits the plot of a variable in several graphs (2)...

Alexandre Leroux -

r675:bca343a0ae6b

parent child

Context file:

r675:bca343a0ae6b

Collapse all files

gui/include/Visualization/operations/GenerateVariableMenuOperation.h +7 -1

              #include <QLoggingCategory>
+             #include <set>
              class QMenu;
+             class IVisualizationWidget;
              class Variable;
              Q_DECLARE_LOGGING_CATEGORY(LOG_GenerateVariableMenuOperation)
                   * Ctor
                   * @param menu the menu to which to attach the generated menu
                   * @param variable the variable for which to generate the menu
+                  * @param variableContainers the containers that already contain the variable for which to
+                  * generate the menu
                   */
-                 explicit GenerateVariableMenuOperation(QMenu *menu, std::shared_ptr<Variable> variable);
+                 explicit GenerateVariableMenuOperation(QMenu *menu, std::shared_ptr<Variable> variable,
+                                                        std::set<IVisualizationWidget *> variableContainers);
                  void visitEnter(VisualizationWidget *widget) override final;
                  void visitLeave(VisualizationWidget *widget) override final;

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

              #include "Visualization/VisualizationGraphWidget.h"
              #include "Visualization/VisualizationTabWidget.h"
              #include "Visualization/VisualizationZoneWidget.h"
+             #include "Visualization/operations/FindVariableOperation.h"
              #include "Visualization/operations/GenerateVariableMenuOperation.h"
              #include "Visualization/operations/RemoveVariableOperation.h"
              #include "Visualization/operations/RescaleAxeOperation.h"
                  // Menu is generated only if there is a single variable
                  if (variables.size() == 1) {
                      if (auto variable = variables.first()) {
+                         // Gets the containers of the variable
+                         FindVariableOperation findVariableOperation{variable};
+                         accept(&findVariableOperation);
+                         auto variableContainers = findVariableOperation.result();
                          // Generates the actions that make it possible to visualize the variable
-                         auto generateVariableMenuOperation = GenerateVariableMenuOperation{menu, variable};
+                         GenerateVariableMenuOperation generateVariableMenuOperation{
+                             menu, variable, std::move(variableContainers)};
                          accept(&generateVariableMenuOperation);
                      }
                      else {

gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp +26 -11

              Q_LOGGING_CATEGORY(LOG_GenerateVariableMenuOperation, "GenerateVariableMenuOperation")
              struct GenerateVariableMenuOperation::GenerateVariableMenuOperationPrivate {
-                 explicit GenerateVariableMenuOperationPrivate(QMenu *menu, std::shared_ptr<Variable> variable)
-                         : m_Variable{variable}, m_PlotMenuBuilder{menu}, m_UnplotMenuBuilder{menu}
+                 explicit GenerateVariableMenuOperationPrivate(
+                     QMenu *menu, std::shared_ptr<Variable> variable,
+                     std::set<IVisualizationWidget *> variableContainers)
+                         : m_Variable{variable},
+                           m_PlotMenuBuilder{menu},
+                           m_UnplotMenuBuilder{menu},
+                           m_VariableContainers{std::move(variableContainers)}
                  {
                  }
                  void visitNodeLeavePlot(const IVisualizationWidget &container, const QString &actionName,
                                          ActionFun actionFunction)
                  {
-                     if (m_Variable && container.canDrop(*m_Variable)) {
+                     if (isValidContainer(container)) {
                          m_PlotMenuBuilder.addSeparator();
                          m_PlotMenuBuilder.addAction(actionName, actionFunction);
                      }
                  void visitLeafPlot(const IVisualizationWidget &container, const QString &actionName,
                                     ActionFun actionFunction)
                  {
-                     if (m_Variable && container.canDrop(*m_Variable)) {
+                     if (isValidContainer(container)) {
                          m_PlotMenuBuilder.addAction(actionName, actionFunction);
                      }
                  }
                  template <typename ActionFun>
-                 void visitLeafUnplot(const IVisualizationWidget &container, const QString &actionName,
+                 void visitLeafUnplot(IVisualizationWidget *container, const QString &actionName,
                                       ActionFun actionFunction)
                  {
-                     if (m_Variable && container.contains(*m_Variable)) {
+                     // If the container contains the variable, we generate 'unplot' action
+                     if (m_VariableContainers.count(container) == 1) {
                          m_UnplotMenuBuilder.addAction(actionName, actionFunction);
                      }
                  }
+                 bool isValidContainer(const IVisualizationWidget &container) const noexcept
+                 {
+                     // A container is valid if it can contain the variable and if the variable is not already
+                     // contained in another container
+                     return m_Variable && m_VariableContainers.size() == 0 && container.canDrop(*m_Variable);
+                 }
                  std::shared_ptr<Variable> m_Variable;
+                 std::set<IVisualizationWidget *> m_VariableContainers;
                  MenuBuilder m_PlotMenuBuilder;   ///< Builder for the 'Plot' menu
                  MenuBuilder m_UnplotMenuBuilder; ///< Builder for the 'Unplot' menu
              };
-             GenerateVariableMenuOperation::GenerateVariableMenuOperation(QMenu *menu,
-                                                                          std::shared_ptr<Variable> variable)
-                     : impl{spimpl::make_unique_impl<GenerateVariableMenuOperationPrivate>(menu, variable)}
+             GenerateVariableMenuOperation::GenerateVariableMenuOperation(
+                 QMenu *menu, std::shared_ptr<Variable> variable,
+                 std::set<IVisualizationWidget *> variableContainers)
+                     : impl{spimpl::make_unique_impl<GenerateVariableMenuOperationPrivate>(
+                           menu, variable, std::move(variableContainers))}
              {
              }
              void GenerateVariableMenuOperation::visitLeave(VisualizationZoneWidget *zoneWidget)
              {
-                 qCCritical(LOG_GenerateVariableMenuOperation(), "Open in a new graph DETECTED !!");
                  if (zoneWidget) {
                      // 'Plot' menu
                      impl->visitNodeLeavePlot(
                                          });
                      // 'Unplot' menu
-                     impl->visitLeafUnplot(*graphWidget, QObject::tr("Remove from %1").arg(graphWidget->name()),
+                     impl->visitLeafUnplot(graphWidget, QObject::tr("Remove from %1").arg(graphWidget->name()),
                                            [ varW = std::weak_ptr<Variable>{impl->m_Variable}, graphWidget ]() {
                                                if (auto var = varW.lock()) {
                                                    graphWidget->removeVariable(var);

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