From 12842f4a86761569d867e54a523a586409a03dc5 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Tue, 12 Jan 2021 10:28:04 -0800
Subject: mobile/statistics: make charts model available to UI

Create a QML ChartListModel in the StatisticsPage and pass that to the
StatsManager on initialization.

[extracted from a slightly larger commit]

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 mobile-widgets/statsmanager.cpp | 20 +++++++++++++++-----
 mobile-widgets/statsmanager.h   |  6 +++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mobile-widgets/statsmanager.cpp b/mobile-widgets/statsmanager.cpp
index 54fc804fd..a49259ff9 100644
--- a/mobile-widgets/statsmanager.cpp
+++ b/mobile-widgets/statsmanager.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "statsmanager.h"
+#include "stats/chartlistmodel.h"
 
-StatsManager::StatsManager() : view(nullptr)
+StatsManager::StatsManager() : view(nullptr), charts(nullptr)
 {
 	updateUi();
 }
@@ -10,18 +11,19 @@ StatsManager::~StatsManager()
 {
 }
 
-void StatsManager::init(StatsView *v, QObject *o)
+void StatsManager::init(StatsView *v, ChartListModel *m)
 {
 	if (!v)
 		fprintf(stderr, "StatsManager::init(): no StatsView - statistics will not work.\n");
+	if (!m)
+		fprintf(stderr, "StatsManager::init(): no ChartListModel - statistics will not work.\n");
 	view = v;
+	charts = m;
 }
 
 void StatsManager::doit()
 {
-	if (!view)
-		return;
-	view->plot(state);
+	updateUi();
 }
 
 static void setVariableList(const StatsState::VariableList &list, QStringList &stringList, int &idx)
@@ -59,6 +61,8 @@ void StatsManager::updateUi()
 	binner2IndexChanged();
 	operation2IndexChanged();
 
+	if (charts)
+		charts->update(uiState.charts);
 	if (view)
 		view->plot(state);
 }
@@ -101,3 +105,9 @@ void StatsManager::var2OperationChanged(int idx)
 	state.var2OperationChanged(uiState.operations2.variables[idx].id);
 	updateUi();
 }
+
+void StatsManager::setChart(int idx)
+{
+	state.chartChanged(idx);
+	updateUi();
+}
diff --git a/mobile-widgets/statsmanager.h b/mobile-widgets/statsmanager.h
index 82c7a6b89..6023342ff 100644
--- a/mobile-widgets/statsmanager.h
+++ b/mobile-widgets/statsmanager.h
@@ -7,6 +7,8 @@
 
 #include <QStringList>
 
+class ChartListModel;
+
 class StatsManager : public QObject {
 	Q_OBJECT
 public:
@@ -23,13 +25,14 @@ public:
 
 	StatsManager();
 	~StatsManager();
-	Q_INVOKABLE void init(StatsView *v, QObject *o);
+	Q_INVOKABLE void init(StatsView *v, ChartListModel *charts);
 	Q_INVOKABLE void doit();
 	Q_INVOKABLE void var1Changed(int idx);
 	Q_INVOKABLE void var1BinnerChanged(int idx);
 	Q_INVOKABLE void var2Changed(int idx);
 	Q_INVOKABLE void var2BinnerChanged(int idx);
 	Q_INVOKABLE void var2OperationChanged(int idx);
+	Q_INVOKABLE void setChart(int idx);
 signals:
 	void var1ListChanged();
 	void binner1ListChanged();
@@ -43,6 +46,7 @@ signals:
 	void operation2IndexChanged();
 private:
 	StatsView *view;
+	ChartListModel *charts;
 	StatsState state;
 	QStringList var1List;
 	QStringList binner1List;
-- 
cgit v1.2.3-70-g09d2