From e7907c494f7f78831c2e2d523f7eb43e25ee77c0 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Thu, 7 Jan 2021 14:38:37 +0100 Subject: statistics: convert chart to QQuickItem It turns out that the wrong base class was used for the chart. QQuickWidget can only be used on desktop, not in a mobile UI. Therefore, turn this into a QQuickItem and move the container QQuickWidget into desktop-only code. Currently, this code is insane: The chart is rendered onto a QGraphicsScene (as it was before), which is then rendered into a QImage, which is transformed into a QSGTexture, which is then projected onto the device. This is performed on every mouse move event, since these events in general change the position of the info-box. The plan is to slowly convert elements such as the info-box into QQuickItems. Browsing the QtQuick documentation, this will not be much fun. Also note that the rendering currently tears, flickers and has antialiasing artifacts, most likely owing to integer (QImage) to floating point (QGraphicsScene, QQuickItem) conversion problems. The data flow is QGraphicsScene (float) -> QImage (int) -> QQuickItem (float). Signed-off-by: Berthold Stoeger --- stats/statsseries.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'stats/statsseries.h') diff --git a/stats/statsseries.h b/stats/statsseries.h index 5c1833c8a..2494569e6 100644 --- a/stats/statsseries.h +++ b/stats/statsseries.h @@ -4,26 +4,20 @@ #ifndef STATS_SERIES_H #define STATS_SERIES_H -#include +#include -namespace QtCharts { - class QChart; -} +class QGraphicsScene; class StatsAxis; -// We derive from a proper scatter series to get access to the map-to -// and map-from coordinates calls. But we don't use any of its functionality. -// This should be removed in due course. - -class StatsSeries : public QtCharts::QScatterSeries { +class StatsSeries { public: - StatsSeries(QtCharts::QChart *chart, StatsAxis *xAxis, StatsAxis *yAxis); + StatsSeries(QGraphicsScene *scene, StatsAxis *xAxis, StatsAxis *yAxis); virtual ~StatsSeries(); virtual void updatePositions() = 0; // Called if chart geometry changes. virtual bool hover(QPointF pos) = 0; // Called on mouse movement. Return true if an item of this series is highlighted. virtual void unhighlight() = 0; // Unhighlight any highlighted item. protected: - QtCharts::QChart *chart; + QGraphicsScene *scene; StatsAxis *xAxis, *yAxis; // May be zero for charts without axes (pie charts). QPointF toScreen(QPointF p); }; -- cgit v1.2.3-70-g09d2