HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r876:da9523540c62

prevent dropping an variable without data in the visu

trabillard -

r876:da9523540c62

parent child

Context file:

r876:da9523540c62

gui/src/DragDropHelper.cpp +37 -20

              #include "Visualization/VisualizationWidget.h"
              #include "Visualization/operations/FindVariableOperation.h"
+             #include "Variable/Variable.h"
              #include "Variable/VariableController.h"
              #include "Common/MimeTypesDef.h"
                      sqpApp->installEventFilter(m_DragDropScroller.get());
-                     m_ImageTempUrl = QDir::temp().absoluteFilePath("Scqlop_graph.png");
+                     m_ImageTempUrl = QDir::temp().absoluteFilePath("Sciqlop_graph.png");
                  }
                  void preparePlaceHolder() const
                      qCWarning(LOG_DragDropHelper()) << QObject::tr(
                          "DragDropHelper::checkMimeDataForVisualization, invalid input parameters.");
                      Q_ASSERT(false);
+                     return false;
                  }
-                 auto result = true;
+                 auto result = false;
                  if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
                      auto variables = sqpApp->variableController().variablesForMimeData(
                          mimeData->data(MIME_TYPE_VARIABLE_LIST));
                      if (variables.count() == 1) {
-                         // Check that the viariable is not already in a graph
-                         // Search for the top level VisualizationWidget
-                         auto parent = dropContainer->parentWidget();
-                         while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) {
-                             parent = parent->parentWidget();
+                         }
+                         auto variable = variables.first();
+                         if (variable->dataSeries() != nullptr) {
+                             // Check that the variable is not already in a graph
-                         if (parent) {
-                             auto visualizationWidget = static_cast<VisualizationWidget *>(parent);
+                             auto parent = dropContainer->parentWidget();
+                             while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) {
+                                 parent = parent->parentWidget(); // Search for the top level VisualizationWidget
+                             }
-                             FindVariableOperation findVariableOperation{variables.first()};
-                             visualizationWidget->accept(&findVariableOperation);
-                             auto variableContainers = findVariableOperation.result();
-                             if (!variableContainers.empty()) {
-                                 result = false;
+                             if (parent) {
+                                 auto visualizationWidget = static_cast<VisualizationWidget *>(parent);
+                                 FindVariableOperation findVariableOperation{variable};
+                                 visualizationWidget->accept(&findVariableOperation);
+                                 auto variableContainers = findVariableOperation.result();
+                                 if (variableContainers.empty()) {
+                                     result = true;
+                                 }
+                                 else {
+                                     // result = false: the variable already exist in the visualisation
+                                 }
+                             }
+                             else {
+                                 qCWarning(LOG_DragDropHelper()) << QObject::tr(
+                                     "DragDropHelper::checkMimeDataForVisualization, the parent "
+                                     "VisualizationWidget cannot be found. Cannot check if the variable is "
+                                     "already used or not.");
                              }
                          }
                          else {
-                             qCWarning(LOG_DragDropHelper()) << QObject::tr(
-                                 "DragDropHelper::checkMimeDataForVisualization, the parent "
-                                 "VisualizationWidget cannot be found.");
-                             result = false;
+                             // result = false: the variable is not fully loaded
                          }
                      }
                      else {
-                         result = false;
+                         // result = false: cannot drop multiple variables in the visualisation
                      }
                  }
+                 else {
+                     // Other MIME data
+                     // no special rules, accepted by default
+                     result = true;
+                 }
                  return result;
              }

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