diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index e22132d..85c81ff 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -711,13 +711,13 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange } emit requestDataLoading(std::move(variableUnderGraphVector), graphRange, !impl->m_IsCalibration); + } - if (!impl->m_IsCalibration) { - qCDebug(LOG_VisualizationGraphWidget()) - << tr("TORM: VisualizationGraphWidget::Synchronize notify !!") - << QThread::currentThread()->objectName() << graphRange << oldGraphRange; - emit synchronize(graphRange, oldGraphRange); - } + if (impl->m_Flags.testFlag(GraphFlag::EnableSynchronization) && !impl->m_IsCalibration) { + qCDebug(LOG_VisualizationGraphWidget()) + << tr("TORM: VisualizationGraphWidget::Synchronize notify !!") + << QThread::currentThread()->objectName() << graphRange << oldGraphRange; + emit synchronize(graphRange, oldGraphRange); } auto pos = mapFromGlobal(QCursor::pos()); @@ -733,6 +733,9 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange else { qCWarning(LOG_VisualizationGraphWidget()) << "onMouseMove: No parent zone widget"; } + + // Quits calibration + impl->m_IsCalibration = false; } void VisualizationGraphWidget::onMouseDoubleClick(QMouseEvent *event) noexcept @@ -917,8 +920,6 @@ void VisualizationGraphWidget::onMouseRelease(QMouseEvent *event) noexcept impl->endDrawingZone(this); - impl->m_IsCalibration = false; - // Selection / Deselection auto isSelectionZoneMode = sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones; diff --git a/gui/src/Visualization/operations/RescaleAxeOperation.cpp b/gui/src/Visualization/operations/RescaleAxeOperation.cpp index c49e9c1..f9cd9ba 100644 --- a/gui/src/Visualization/operations/RescaleAxeOperation.cpp +++ b/gui/src/Visualization/operations/RescaleAxeOperation.cpp @@ -59,7 +59,9 @@ void RescaleAxeOperation::visit(VisualizationGraphWidget *graphWidget) if (graphWidget) { // If the widget contains the variable, rescale it if (impl->m_Variable && graphWidget->contains(*impl->m_Variable)) { - graphWidget->setFlags(GraphFlag::DisableAll); + // During rescale, acquisition for the graph is disabled but synchronization is still + // enabled + graphWidget->setFlags(GraphFlag::EnableSynchronization); graphWidget->setGraphRange(impl->m_Range); graphWidget->setFlags(GraphFlag::EnableAll); }