From 62a900ad03728053ccd53deaf86251bf9fbcfea5 Mon Sep 17 00:00:00 2001 From: consti10 Date: Fri, 24 Nov 2023 15:00:45 +0100 Subject: [PATCH] add charts back in, link it --- QOpenHD.pro | 1 + .../openhd_settings/PopupAnalyzeChannels.qml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/QOpenHD.pro b/QOpenHD.pro index 3d0ef89d6..b8a5680fd 100755 --- a/QOpenHD.pro +++ b/QOpenHD.pro @@ -71,6 +71,7 @@ LinuxBuild { QT +=core quick qml gui \ widgets QT += opengl +QT += charts INCLUDEPATH += $$PWD/lib INCLUDEPATH += $$PWD/app diff --git a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml index 2fa727c0f..76971d8e1 100644 --- a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml +++ b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml @@ -14,7 +14,7 @@ import OpenHD 1.0 import "../../../ui" as Ui import "../../elements" -//import QtCharts 2.0 +import QtCharts 2.15 Rectangle{ id: main_background @@ -121,7 +121,7 @@ Rectangle{ model: model_filter textRole: "title" onCurrentIndexChanged: { - //pollution_chart.update_pollution_graph(); + pollution_chart.update_pollution_graph(); } } Switch{ @@ -129,7 +129,7 @@ Rectangle{ checked: m_normalize_data onCheckedChanged: { m_normalize_data=checked - //pollution_chart.update_pollution_graph(); + pollution_chart.update_pollution_graph(); } } Text{ @@ -169,7 +169,7 @@ Rectangle{ ScrollBar.horizontal.interactive: true clip: true - /*ChartView { + ChartView { id: pollution_chart //width: main_background.width>m_chart_view_minimum_width ? main_background.width : m_chart_view_minimum_width; width: { @@ -215,7 +215,7 @@ Rectangle{ color: "red" } } - }*/ + } } // Filler //Item{