GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r265:3a544b0581a5

Handles multi-selection when displaying the menu of the variable widget...

Alexandre Leroux -

r265:3a544b0581a5

parent child

Context file:

r265:3a544b0581a5

Collapse all files

gui/src/Variable/VariableInspectorWidget.cpp +14 -13

              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 selectedRows = ui->tableView->selectionModel()->selectedRows();
+                 // Gets the model to retrieve the underlying selected variables
-                     auto model = sqpApp->variableController().variableModel();
-                     if (auto selectedVariable = model->variable(selectedIndex.row())) {
+                 auto selectedVariables = QVector<std::shared_ptr<Variable> >{};
+                 for (const auto &selectedRow : qAsConst(selectedRows)) {
+                     if (auto selectedVariable = model->variable(selectedRow.row())) {
+                         selectedVariables.push_back(selectedVariable);
+                     }
+                 }
-                         QMenu tableMenu{};
-                         // Emit a signal so that potential receivers can populate the menu before displaying it
-                         emit tableMenuAboutToBeDisplayed(&tableMenu, selectedVariable);
+                 // Emits a signal so that potential receivers can populate the menu before displaying it
+                 /// @todo ALX : handles list of variables in the signal
+                 emit tableMenuAboutToBeDisplayed(&tableMenu, selectedVariables);
-                         if (!tableMenu.isEmpty()) {
+                     // Displays menu
-                             tableMenu.exec(mapToGlobal(pos));
                          }
                      }
+                 }
-                 else {
-                     qCCritical(LOG_VariableInspectorWidget())
-                         << tr("Can't display menu : invalid index (%1;%2)")
-                                .arg(selectedIndex.row(), selectedIndex.column());
+                 }
+             }

General Comments 1

perrinel

|

Status change > Approved

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