live plot improvements

Author: alaurenzi

xbot2_gui/CMakeLists.txt

@@ -18,6 +18,7 @@ find_package(Qt6 COMPONENTS
     ShaderTools
     DataVisualization
     TextToSpeech
+    Charts
     REQUIRED)
 
 if(NOT EMSCRIPTEN)

xbot2_gui/LivePlot/CMakeLists.txt

@@ -7,6 +7,9 @@ qt_add_qml_module(xbot2_gui_liveplot
     Plotter.qml
     PlotterLegend.qml
     Plot.qml
+    SOURCES plotrebuilder.h plotrebuilder.cpp
 )
 
+target_link_libraries(xbot2_gui_liveplot PRIVATE Qt6::Charts)
+
 target_link_libraries(xbot2_gui PRIVATE xbot2_gui_liveplotplugin)

xbot2_gui/LivePlot/Plot.qml

@@ -63,6 +63,7 @@ MultiPaneResponsiveLayout {
                     spacing: 3
 
                     Button {
+                        width: parent.width
                         text: 'Reset'
                         onClicked: livePlot.resetView()
                     }
@@ -78,11 +79,10 @@ MultiPaneResponsiveLayout {
                         font.pointSize: 10
                     }
 
-                    DoubleSpinBox {
+                    SpinBox {
                         id: rangeSpin
                         from: 0
                         to: 1000
-                        stepSize: 1
                         value: 10
                     }
                 }

xbot2_gui/LivePlot/Plotter.qml

@@ -2,10 +2,15 @@ import QtQuick
 import QtCharts
 import QtQuick.Controls
 import QtQuick.Layouts
+
 import Common
 
 Item {
 
+    PlotRebuilder {
+        id: rebuilder
+    }
+
     // public
     property Item plotterLegend
 
@@ -46,17 +51,22 @@ Item {
     }
 
     function rebuild() {
+
+        if(_rebuilding) {
+            return
+        }
+
         _rebuilding = true
+
+
+
         for(let i = 0; i < chart.count; i++) {
 
             // save points, type, name
             let series = chart.series(i)
             console.log(series, series.name)
 
-            let points = Array(series.count)
-            for(var k = 0; k < series.count; k++) {
-                points[k] = series.at(k)
-            }
+            let points = rebuilder.getPoints(series)
             let type = series.type
             let name = series.name
 
@@ -66,15 +76,14 @@ Item {
             // create
             series = chart.createSeries(type,
                                         name);
+
             series.useOpenGL = true
             series.antialiasing = false
             series.axisX = axisTime
             series.axisY = axisValueLeft
 
             // fill with saved points
-            for(let k = 0; k < points.length; k++) {
-                series.append(points[k].x, points[k].y)
-            }
+            rebuilder.setPoints(series, points)
 
             // update seriesdata
             currSeries[name].series = series

xbot2_gui/LivePlot/plotrebuilder.cpp

@@ -0,0 +1,2 @@
+#include "plotrebuilder.h"
+

xbot2_gui/LivePlot/plotrebuilder.h

@@ -0,0 +1,29 @@
+#ifndef PLOTREBUILDER_H
+#define PLOTREBUILDER_H
+
+#include <QtCharts/QtCharts>
+#include <QtCharts/QXYSeries>
+#include <QtQmlCore/QtQmlCore>
+
+class PlotRebuilder: public QObject
+{
+    Q_OBJECT
+
+public:
+
+    QML_ELEMENT
+
+    Q_INVOKABLE static QList<QPointF> getPoints(const QXYSeries* s)
+    {
+        qInfo() << "saving" << s->points().size() << "points from" << (void*)s;
+        return s->points();
+    }
+
+    Q_INVOKABLE static void setPoints(QXYSeries* s, const QList<QPointF>& points)
+    {
+        qInfo() << "appending" << points.size() << "points to" << (void*)s;
+        s->append(points);
+    }
+};
+
+#endif // PLOTREBUILDER_H