GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r414:4b445d4313d1

Limits requests on mouse wheels/pans

Alexandre Leroux -

r414:4b445d4313d1 feature/AltAcquis...

parent child

Context file:

r414:4b445d4313d1

Collapse all files

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

                  void onGraphMenuRequested(const QPoint &pos) noexcept;
                  /// Rescale the X axe to range parameter
-                 void onRangeChanged(const QCPRange &t1, const QCPRange &t2);
+                 void processRangeChange();
                  /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done
                  void onMouseWheel(QWheelEvent *event) noexcept;

gui/src/Visualization/VisualizationGraphWidget.cpp +28 -9

              namespace {
+             /// Timeout from which the mouse wheel is considered completed (in ms)
+             const auto MOUSE_WHEEL_TIMEOUT = 250;
              /// Key pressed to enable zoom on horizontal axis
              const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
              struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
-                 explicit VisualizationGraphWidgetPrivate() : m_DoSynchronize{true}, m_IsCalibration{false} {}
+                 explicit VisualizationGraphWidgetPrivate()
+                         : m_DoSynchronize{true}, m_IsCalibration{false}, m_RefRange{}, m_MouseWheelTimer{}
+                 {
+                     m_MouseWheelTimer.setSingleShot(true);
+                 }
                  // Return the operation when range changed
                  bool m_DoSynchronize;
                  bool m_IsCalibration;
+                 QCPRange m_RefRange;
+                 QTimer m_MouseWheelTimer;
              };
              VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
                  connect(ui->widget, &QCustomPlot::mouseRelease, this,
                          &VisualizationGraphWidget::onMouseRelease);
                  connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
-                 connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
-                                                &QCPAxis::rangeChanged),
-                         this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
+                 // Connects mouse wheel timer
+                 connect(&impl->m_MouseWheelTimer, &QTimer::timeout, this,
+                         &VisualizationGraphWidget::processRangeChange);
                  // Activates menu when right clicking on the graph
                  ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
                  }
              }
-             void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
+             void VisualizationGraphWidget::processRangeChange()
              {
-                 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
+                 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::processRangeChange")
                                                         << QThread::currentThread()->objectName();
-                 auto dateTimeRange = SqpDateTime{t1.lower, t1.upper};
+                 auto oldRange = impl->m_RefRange;
+                 auto newRange = ui->widget->xAxis->range();
-                 auto zoomType = impl->getZoomType(t1, t2);
+                 auto dateTimeRange = SqpDateTime{newRange.lower, newRange.upper};
+                 auto zoomType = impl->getZoomType(newRange, impl->m_RefRange);
                  for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                       it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                  }
                  if (impl->m_DoSynchronize && !impl->m_IsCalibration) {
-                     auto oldDateTime = SqpDateTime{t2.lower, t2.upper};
+                     auto oldDateTime = SqpDateTime{oldRange.lower, oldRange.upper};
                      qCDebug(LOG_VisualizationGraphWidget())
                          << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
                          << QThread::currentThread()->objectName();
                      emit synchronize(dateTimeRange, oldDateTime, zoomType);
                  }
+                 impl->m_RefRange = newRange;
              }
              void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
              {
+                 impl->m_MouseWheelTimer.start(MOUSE_WHEEL_TIMEOUT);
                  auto zoomOrientations = QFlags<Qt::Orientation>{};
                  // Lambda that enables a zoom orientation if the key modifier related to this orientation
              void VisualizationGraphWidget::onMousePress(QMouseEvent *event) noexcept
              {
+                 impl->m_RefRange = ui->widget->xAxis->range();
                  impl->m_IsCalibration = event->modifiers().testFlag(Qt::ControlModifier);
              }
              void VisualizationGraphWidget::onMouseRelease(QMouseEvent *event) noexcept
              {
                  impl->m_IsCalibration = false;
+                 processRangeChange();
              }
              void VisualizationGraphWidget::onDataCacheVariableUpdated()

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