GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1346:b5241a465dc2

refactoring + fix created graph range

trabillard -

r1346:b5241a465dc2

parent child

Context file:

r1346:b5241a465dc2

gui/include/Visualization/VisualizationGraphWidget.h +1 0

                  void setYRange(std::shared_ptr<Variable> variable);
                  SqpRange graphRange() const noexcept;
                  void setGraphRange(const SqpRange &range, bool calibration = false);
+                 void setAutoRangeOnVariableInitialization(bool value);
                  // Zones
                  /// Returns the ranges of all the selection zones on the graph

gui/src/Catalogue/CatalogueEventsWidget.cpp +80 -46

              /// Fixed size of the validation column
              const auto VALIDATION_COLUMN_SIZE = 35;
+             /// Percentage added to the range of a event when it is displayed
+             const auto EVENT_RANGE_MARGE = 30; // in %
              struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
                  CatalogueEventsModel *m_Model = nullptr;
                      }
                  }
-                 void updateForGraphMode(QTreeView *treeView)
+                 QVector<SqpRange> getGraphRanges(const std::shared_ptr<DBEvent> &event)
                  {
-                     auto selectedRows = treeView->selectionModel()->selectedRows();
-                     if (selectedRows.count() == 1) {
-                         auto event = m_Model->getEvent(selectedRows.first());
-                         if (m_VisualizationWidget && event) {
-                             if (auto tab = m_VisualizationWidget->currentTabWidget()) {
-                                 if (auto zone = tab->getZoneWithName(m_ZoneForGraphMode)) {
-                                     for (auto graph : m_CustomGraphs) {
-                                         graph->close();
-                                         auto variables = graph->variables().toVector();
-                                         QMetaObject::invokeMethod(
-                                             &sqpApp->variableController(), "deleteVariables",
-                                             Qt::QueuedConnection,
-                                             Q_ARG(QVector<std::shared_ptr<Variable> >, variables));
+                                     }
-                                     m_CustomGraphs.clear();
+                     // Retrieves the range of each product and the maximum size
-                                     QVector<SqpRange> graphRanges;
-                                     double maxDt = 0;
-                                     for (auto eventProduct : event->getEventProducts()) {
-                                         }
                                      }
+                     // Adds the marge
+                     maxDt *= (100.0 + EVENT_RANGE_MARGE) / 100.0;
+                     // Corrects the graph ranges so that they all have the same size
-                                     QVector<SqpRange> correctedGraphRanges;
-                                     for (auto range : graphRanges) {
-                                         auto dt = range.m_TEnd - range.m_TStart;
-                                         correctedGraphRanges << correctedRange;
                                      }
-                                     auto itRange = correctedGraphRanges.cbegin();
+                     return correctedGraphRanges;
+                 }
+                 void updateForGraphMode(QTreeView *treeView)
+                 {
+                     auto selectedRows = treeView->selectionModel()->selectedRows();
+                     if (selectedRows.count() != 1) {
+                         qCWarning(LOG_CatalogueEventsWidget())
+                             << "updateGraphMode: not compatible with multiple events selected";
+                         return;
+                     }
+                     if (!m_VisualizationWidget) {
+                         qCWarning(LOG_CatalogueEventsWidget())
+                             << "updateGraphMode: visualization widget not found";
+                         return;
+                     }
+                     auto event = m_Model->getEvent(selectedRows.first());
+                     if (!event) {
+                         // A event product is probably selected
+                         qCInfo(LOG_CatalogueEventsWidget()) << "updateGraphMode: no events are selected";
+                         return;
+                     }
+                     auto tab = m_VisualizationWidget->currentTabWidget();
+                     if (!tab) {
+                         qCWarning(LOG_CatalogueEventsWidget())
+                             << "updateGraphMode: no tab found in the visualization";
+                         return;
+                     }
+                     auto zone = tab->getZoneWithName(m_ZoneForGraphMode);
+                     if (!zone) {
+                         qCWarning(LOG_CatalogueEventsWidget()) << "updateGraphMode: zone not found";
+                         return;
+                     }
+                     // Close the previous graph and delete the asociated variables
+                     for (auto graph : m_CustomGraphs) {
+                         graph->close();
+                         auto variables = graph->variables().toVector();
+                         QMetaObject::invokeMethod(&sqpApp->variableController(), "deleteVariables",
+                                                   Qt::QueuedConnection,
+                                                   Q_ARG(QVector<std::shared_ptr<Variable> >, variables));
+                     }
+                     m_CustomGraphs.clear();
+                     // Calculates the range of each graph which will be created
+                     auto graphRange = getGraphRanges(event);
+                     // Loops through the event products and create the graph
+                     auto itRange = graphRange.cbegin();
-                                     for (auto eventProduct : event->getEventProducts()) {
-                                         auto productId = eventProduct.getProductId();
-                                         auto range = *itRange;
-                                         ++itRange;
+                         SqpRange productRange;
+                         productRange.m_TStart = eventProduct.getTStart();
+                         productRange.m_TEnd = eventProduct.getTEnd();
-                                         auto context = new QObject{treeView};
-                                         QObject::connect(
-                                             &sqpApp->variableController(), &VariableController::variableAdded,
-                                             context,
-                                             [this, zone, context, range, productId](auto variable) {
+                             &sqpApp->variableController(), &VariableController::variableAdded, context,
+                             [this, zone, context, range, productRange, productId](auto variable) {
-                                                 if (variable->metadata()
-                                                         .value(DataSourceItem::ID_DATA_KEY, "UnknownID")
-                                                         .toString()
+                                 if (variable->metadata().value(DataSourceItem::ID_DATA_KEY).toString()
-                                                     == productId) {
-                                                     auto graph = zone->createGraph(variable);
+                                     graph->setAutoRangeOnVariableInitialization(false);
+                                     graph->addSelectionZones({productRange});
-                                                     m_CustomGraphs << graph;
-                                                     graph->setGraphRange(range, true);
+                                     // Removes the graph from the graph list if it is closed manually
+                                     QObject::connect(graph, &VisualizationGraphWidget::destroyed,
+                                                      [this, graph]() { m_CustomGraphs.removeAll(graph); });
-                                                     delete context; // removes the connection
-                                                 }
-                                             },
-                                             Qt::QueuedConnection);
-                                         QMetaObject::invokeMethod(
-                                             &sqpApp->dataSourceController(), "requestVariableFromProductIdKey",
-                                             Qt::QueuedConnection, Q_ARG(QString, productId));
+                                     }
+                                 }
+                             }
-                             else {
-                                 qCWarning(LOG_CatalogueEventsWidget())
-                                     << "updateGraphMode: no tab found in the visualization";
+                             }
+                         }
-                         else {
-                             qCWarning(LOG_CatalogueEventsWidget())
-                                 << "updateGraphMode: visualization widget not found";
+                         }
+                     }
-                     else {
-                         qCWarning(LOG_CatalogueEventsWidget())
-                             << "updateGraphMode: not compatible with multiple events selected";
+                         QMetaObject::invokeMethod(&sqpApp->dataSourceController(),
+                                                   "requestVariableFromProductIdKey", Qt::QueuedConnection,
+                                                   Q_ARG(QString, productId));
                      }
                  }

gui/src/Visualization/VisualizationGraphWidget.cpp +11 -1

                  bool m_HasMovedMouse = false; // Indicates if the mouse moved in a releaseMouse even
+                 bool m_VariableAutoRangeOnInit = true;
                  void startDrawingRect(const QPoint &pos, QCustomPlot &plot)
                  {
                      removeDrawingRect(plot);
                              if (auto var = varW.lock()) {
                                  // If the variable is the first added in the graph, we load its range
                                  auto firstVariableInGraph = range == INVALID_RANGE;
-                                 auto loadedRange = firstVariableInGraph ? var->range() : range;
+                                 auto loadedRange = graphRange();
+                                 if (impl->m_VariableAutoRangeOnInit) {
+                                     loadedRange = firstVariableInGraph ? var->range() : range;
+                                 }
                                  loadRange(var, loadedRange);
                                  setYRange(var);
                              }
                  qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");
              }
+             void VisualizationGraphWidget::setAutoRangeOnVariableInitialization(bool value)
+             {
+                 impl->m_VariableAutoRangeOnInit = value;
+             }
              QVector<SqpRange> VisualizationGraphWidget::selectionZoneRanges() const
              {
                  QVector<SqpRange> ranges;

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