GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1326:2f3864d52888

Corrects the problem of refreshing synchronized graphs from TimeWidget (2)...

Alexandre Leroux -

r1326:2f3864d52888

parent child

Context file:

r1326:2f3864d52888

Collapse all files

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

                     }
                     emit requestDataLoading(std::move(variableUnderGraphVector), graphRange,
                                             !impl->m_IsCalibration);
+                }
-                    if (!impl->m_IsCalibration) {
+                if (impl->m_Flags.testFlag(GraphFlag::EnableSynchronization) && !impl->m_IsCalibration) {
-                        qCDebug(LOG_VisualizationGraphWidget())
+                    qCDebug(LOG_VisualizationGraphWidget())
-                            << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
+                        << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
-                            << QThread::currentThread()->objectName() << graphRange << oldGraphRange;
+                        << QThread::currentThread()->objectName() << graphRange << oldGraphRange;
-                        emit synchronize(graphRange, oldGraphRange);
+                    emit synchronize(graphRange, oldGraphRange);
                 }
                 auto pos = mapFromGlobal(QCursor::pos());
                 else {
                     qCWarning(LOG_VisualizationGraphWidget()) << "onMouseMove: No parent zone widget";
                 }
+                // Quits calibration
+                impl->m_IsCalibration = false;
             }
             void VisualizationGraphWidget::onMouseDoubleClick(QMouseEvent *event) noexcept
                 impl->endDrawingZone(this);
-                impl->m_IsCalibration = false;
                 // Selection / Deselection
                 auto isSelectionZoneMode
                     = sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones;

gui/src/Visualization/operations/RescaleAxeOperation.cpp +3 -1

                 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);
                     }

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