GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1088:1eed201e150e

Keep the selection zones when a graph is dropped in another synchro zone

trabillard -

r1088:1eed201e150e

parent child

Context file:

r1088:1eed201e150e

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

                  SqpRange graphRange() const noexcept;
                  void setGraphRange(const SqpRange &range);
+                 /// Returns the ranges of all the selection zones on the graph
+                 QVector<SqpRange> selectionZoneRanges() const;
+                 /// Adds new selection zones in the graph
+                 void addSelectionZones(const QVector<SqpRange> &ranges);
                  /// Undo the last zoom  done with a zoom box
                  void undoZoom();

gui/include/Visualization/VisualizationZoneWidget.h +3 0

                  VisualizationGraphWidget *createGraph(const QList<std::shared_ptr<Variable> > variables,
                                                        int index);
+                 /// Returns the first graph in the zone or nullptr if there is no graph inside
+                 VisualizationGraphWidget *firstGraph() const;
                  // IVisualizationWidget interface
                  void accept(IVisualizationWidgetVisitor *visitor) override;
                  bool canDrop(const Variable &variable) const override;

gui/src/Visualization/VisualizationDragWidget.cpp +1 -1

              {
              }
-             virtual QPixmap VisualizationDragWidget::customDragPixmap(const QPoint &dragPosition)
+             QPixmap VisualizationDragWidget::customDragPixmap(const QPoint &dragPosition)
              {
                  Q_UNUSED(dragPosition);
                  return QPixmap();

gui/src/Visualization/VisualizationGraphWidget.cpp +21 0

                  qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");
              }
+             QVector<SqpRange> VisualizationGraphWidget::selectionZoneRanges() const
+             {
+                 QVector<SqpRange> ranges;
+                 for (auto zone : impl->m_SelectionZones) {
+                     ranges << zone->range();
+                 }
+                 return ranges;
+             }
+             void VisualizationGraphWidget::addSelectionZones(const QVector<SqpRange> &ranges)
+             {
+                 for (const auto &range : ranges) {
+                     auto zone = new VisualizationSelectionZoneItem(&plot());
+                     zone->setRange(range.m_TStart, range.m_TEnd);
+                     impl->m_SelectionZones << zone;
+                 }
+                 plot().replot(QCustomPlot::rpQueuedReplot);
+             }
              void VisualizationGraphWidget::undoZoom()
              {
                  auto zoom = impl->m_ZoomStack.pop();

gui/src/Visualization/VisualizationTabWidget.cpp +10 -1

                          helper.delayedCloseWidget(graphWidget);
                      }
-                     tabWidget->createZone(variables, index);
+                     auto zoneWidget = tabWidget->createZone(variables, index);
+                     auto firstGraph = zoneWidget->firstGraph();
+                     if (firstGraph) {
+                         firstGraph->addSelectionZones(graphWidget->selectionZoneRanges());
+                     }
+                     else {
+                         qCWarning(LOG_VisualizationZoneWidget())
+                             << tr("VisualizationTabWidget::dropGraph, no graph added in the widget.");
+                         Q_ASSERT(false);
+                     }
                  }
                  else {
                      // The graph is empty, create an empty zone and move the graph inside

gui/src/Visualization/VisualizationZoneWidget.cpp +18 -18

                  QUuid m_SynchronisationGroupId;
                  std::unique_ptr<IGraphSynchronizer> m_Synchronizer;
-                 // Returns the first graph in the zone or nullptr if there is no graph inside
-                 VisualizationGraphWidget *firstGraph(const VisualizationZoneWidget *zoneWidget) const
+                 {
-                     VisualizationGraphWidget *firstGraph = nullptr;
-                     auto layout = zoneWidget->ui->dragDropContainer->layout();
-                     if (layout->count() > 0) {
-                         if (auto visualizationGraphWidget
-                             = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
-                             firstGraph = visualizationGraphWidget;
+                         }
+                     }
-                     return firstGraph;
+                 }
                  void dropGraph(int index, VisualizationZoneWidget *zoneWidget);
                  void dropVariables(const QList<std::shared_ptr<Variable> > &variables, int index,
                                     VisualizationZoneWidget *zoneWidget);
                          &VisualizationZoneWidget::onVariableAboutToBeRemoved);
                  auto range = SqpRange{};
-                 if (auto firstGraph = impl->firstGraph(this)) {
+                 if (auto firstGraph = this->firstGraph()) {
                      // Case of a new graph in a existant zone
                      range = firstGraph->graphRange();
                  }
                  return graphWidget;
              }
+             VisualizationGraphWidget *VisualizationZoneWidget::firstGraph() const
+             {
+                 VisualizationGraphWidget *firstGraph = nullptr;
+                 auto layout = ui->dragDropContainer->layout();
+                 if (layout->count() > 0) {
+                     if (auto visualizationGraphWidget
+                         = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) {
+                         firstGraph = visualizationGraphWidget;
+                     }
+                 }
+                 return firstGraph;
+             }
              void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor)
              {
                  if (visitor) {
                  auto mimeData = new QMimeData;
                  mimeData->setData(MIME_TYPE_ZONE, QByteArray{});
-                 if (auto firstGraph = impl->firstGraph(this)) {
+                 if (auto firstGraph = this->firstGraph()) {
                      auto timeRangeData = TimeController::mimeDataForTimeRange(firstGraph->graphRange());
                      mimeData->setData(MIME_TYPE_TIME_RANGE, timeRangeData);
                  }
                      }
                      // Creates the new graph in the zone
-                     zoneWidget->createGraph(variables, index);
+                     auto newGraphWidget = zoneWidget->createGraph(variables, index);
+                     newGraphWidget->addSelectionZones(graphWidget->selectionZoneRanges());
                  }
                  else {
                      // The drop occurred in the same zone or the graph is empty

General Comments 3

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	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