GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r250:aa2508ab83a4

Merge branch 'feature/VariableMenu2' into develop

Alexandre Leroux -

r250:aa2508ab83a4

parent child

Context file:

r250:aa2508ab83a4

Collapse all files

app/src/MainWindow.cpp +9 -3

                  connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
                          SLOT(onTimeToUpdate(SqpDateTime)));
-                 // Variable
+                 // Widgets / widgets connections
                  qRegisterMetaType<std::shared_ptr<Variable> >();
-                 connect(&sqpApp->visualizationController(), SIGNAL(variableCreated(std::shared_ptr<Variable>)),
-                         m_Ui->view, SLOT(displayVariable(std::shared_ptr<Variable>)));
+                 // For the following connections, we use DirectConnection to allow each widget that can
+                 // potentially attach a menu to the variable's menu to do so before this menu is displayed.
+                 // The order of connections is also important, since it determines the order in which each
+                 // widget will attach its menu
+                 connect(m_Ui->variableInspectorWidget,
+                         SIGNAL(tableMenuAboutToBeDisplayed(QMenu *, std::shared_ptr<Variable>)), m_Ui->view,
+                         SLOT(attachVariableMenu(QMenu *, std::shared_ptr<Variable>)), Qt::DirectConnection);
                  /*    QLopGUI::registerMenuBar(menuBar());
                      this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));

core/include/Variable/VariableModel.h +2 0

                  createVariable(const QString &name, const SqpDateTime &dateTime,
                                 std::unique_ptr<IDataSeries> defaultDataSeries) noexcept;
+                 std::shared_ptr<Variable> variable(int index) const;
                  // /////////////////////////// //
                  // QAbstractTableModel methods //
                  // /////////////////////////// //

core/src/Variable/VariableModel.cpp +5 0

                  return variable;
              }
+             std::shared_ptr<Variable> VariableModel::variable(int index) const
+             {
+                 return (index >= 0 && index < impl->m_Variables.size()) ? impl->m_Variables.at(index) : nullptr;
+             }
              int VariableModel::columnCount(const QModelIndex &parent) const
              {
                  Q_UNUSED(parent);

gui/include/Variable/VariableInspectorWidget.h +20 0

              #ifndef SCIQLOP_VARIABLEINSPECTORWIDGET_H
              #define SCIQLOP_VARIABLEINSPECTORWIDGET_H
+             #include <QMenu>
              #include <QWidget>
+             #include <memory>
+             class Variable;
              namespace Ui {
              class VariableInspectorWidget;
              } // Ui
                  explicit VariableInspectorWidget(QWidget *parent = 0);
                  virtual ~VariableInspectorWidget();
+             signals:
+                 /**
+                  * Signal emitted before a menu concerning a variable is displayed. It is used for other widgets
+                  * to complete the menu.
+                  * @param tableMenu the menu to be completed
+                  * @param variable the variable concerned by the menu
+                  * @remarks To make the dynamic addition of menus work, the connections to this signal must be
+                  * in Qt :: DirectConnection
+                  */
+                 void tableMenuAboutToBeDisplayed(QMenu *tableMenu, std::shared_ptr<Variable> variable);
              private:
                  Ui::VariableInspectorWidget *ui;
+             private slots:
+                 /// Slot called when right clicking on an variable in the table (displays a menu)
+                 void onTableMenuRequested(const QPoint &pos) noexcept;
              };
              #endif // SCIQLOP_VARIABLEINSPECTORWIDGET_H

gui/include/Visualization/VisualizationWidget.h +5 -5

              Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget)
+             class QMenu;
              class Variable;
              class VisualizationTabWidget;
              public slots:
                  /**
-                  * Displays a variable in a new graph of a new zone of the current tab
-                  * @param variable the variable to display
-                  * @todo this is a temporary method that will be replaced by own actions for each type of
-                  * visualization widget
+                  * Attaches to a menu the menu relating to the visualization of a variable
+                  * @param menu the parent menu of the generated menu
+                  * @param variable the variable for which to generate the menu
                   */
-                 void displayVariable(std::shared_ptr<Variable> variable) noexcept;
+                 void attachVariableMenu(QMenu *menu, std::shared_ptr<Variable> variable) noexcept;
              private:
                  Ui::VisualizationWidget *ui;

gui/src/Variable/VariableInspectorWidget.cpp +24 0

                  sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
                  ui->tableView->setModel(sortFilterModel);
+                 // Connection to show a menu when right clicking on the tree
+                 ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu);
+                 connect(ui->tableView, &QTableView::customContextMenuRequested, this,
+                         &VariableInspectorWidget::onTableMenuRequested);
              }
              VariableInspectorWidget::~VariableInspectorWidget()
              {
                  delete ui;
              }
+             void VariableInspectorWidget::onTableMenuRequested(const QPoint &pos) noexcept
+             {
+                 auto selectedIndex = ui->tableView->indexAt(pos);
+                 if (selectedIndex.isValid()) {
+                     // Gets the model to retrieve the underlying selected variable
+                     auto model = sqpApp->variableController().variableModel();
+                     if (auto selectedVariable = model->variable(selectedIndex.row())) {
+                         QMenu tableMenu{};
+                         // Emit a signal so that potential receivers can populate the menu before displaying it
+                         emit tableMenuAboutToBeDisplayed(&tableMenu, selectedVariable);
+                         if (!tableMenu.isEmpty()) {
+                             tableMenu.exec(mapToGlobal(pos));
+                         }
+                     }
+                 }
+             }

gui/src/Visualization/VisualizationWidget.cpp +6 -11

              #include "Visualization/VisualizationGraphWidget.h"
              #include "Visualization/VisualizationTabWidget.h"
              #include "Visualization/VisualizationZoneWidget.h"
+             #include "Visualization/operations/GenerateVariableMenuOperation.h"
              #include "Visualization/qcustomplot.h"
              #include "ui_VisualizationWidget.h"
                  return QStringLiteral("MainView");
              }
-             void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept
+             void VisualizationWidget::attachVariableMenu(QMenu *menu,
+                                                          std::shared_ptr<Variable> variable) noexcept
              {
-                 if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) {
-                     if (!currentTab->createZone(variable)) {
-                         qCCritical(LOG_VisualizationWidget())
-                             << tr("Can't display the variable : can't create a new zone in the current tab");
+                     }
+                 }
-                 else {
-                     qCCritical(LOG_VisualizationWidget())
-                         << tr("Can't display the variable : there is no current tab");
+                 }
+                 // Generates the actions that make it possible to visualize the variable
+                 auto generateVariableMenuOperation = GenerateVariableMenuOperation{menu, variable};
+                 accept(&generateVariableMenuOperation);
              }

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