fix(data): correctly bind dynamically sensors

Fix #27
orblazer · Jan 15, 2022 · 70a4208 · 70a4208
1 parent 04da31f
commit 70a4208
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/package/contents/ui/components/NetworkGraph.qml b/package/contents/ui/components/NetworkGraph.qml
@@ -38,7 +38,7 @@ Item {
     property bool secondLabelWhenZero: true
 
     // Bind properties
-    onIgnoredNetworkInterfacesChanged: sensorsModel.updateSensors()
+    onIgnoredNetworkInterfacesChanged: sensorsModel._updateSensors()
 
     onNetworkReceivingTotalChanged: {
         downloadChart.yRange.to = networkReceivingTotal * dialect.multiplier
@@ -123,7 +123,7 @@ Item {
     // Graph data
     RMComponents.NetworkInterfaceDetector {
         id: networkInterfaces
-        onModelChanged: sensorsModel.updateSensors()
+        onModelChanged: sensorsModel._updateSensors()
     }
 
     Sensors.SensorDataModel {
@@ -142,7 +142,11 @@ Item {
             return value
         }
 
-        function updateSensors() {
+        function _updateSensors() {
+            if (!chart.visible) {
+                return
+            }
+
             var sensors = []
             for (var i = 0; i < networkInterfaces.model.count; i++) {
                 var name = networkInterfaces.model.get(i).name
@@ -156,6 +160,7 @@ Item {
             sensorsModel.sensors = sensors
         }
     }
+    onVisibleChanged: sensorsModel._updateSensors()
 
     function _dataTick() {
         var sensorsLength = sensorsModel.sensors.length

diff --git a/package/contents/ui/components/SensorGraph.qml b/package/contents/ui/components/SensorGraph.qml
@@ -13,6 +13,7 @@ RMComponents.BaseSensorGraph {
     id: chart
 
     readonly property alias sensorsModel: sensorsModel
+    property var sensors: []
 
     property bool customFormatter: false
     property var lastRun: -1
@@ -36,10 +37,18 @@ RMComponents.BaseSensorGraph {
             }
             return data(indexVar, role)
         }
+        function _setSensors(sensors) {
+            if (chart.visible && sensors.length > 0) {
+                sensorsModel.sensors = sensors
+            }
+        }
     }
+    onSensorsChanged: sensorsModel._setSensors(sensors)
+    onVisibleChanged: sensorsModel._setSensors(sensors)
 
     Instantiator {
         model: sensorsModel.sensors
+        active: chart.visible
         delegate: Charts.HistoryProxySource {
             id: history
 

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -112,7 +112,7 @@ Item {
     // Graphs
     RMComponents.SensorGraph {
         id: cpuGraph
-        sensorsModel.sensors: ["cpu/all/usage"]
+        sensors: ["cpu/all/usage"]
         colors: [cpuColor]
 
         visible: showCpuMonitor
@@ -216,9 +216,9 @@ Item {
             var suffix = showMemoryInPercent ? "Percent" : ""
 
             if (showSwapGraph) {
-                sensorsModel.sensors = ["memory/physical/used" + suffix, "memory/swap/used" + suffix]
+                sensors = ["memory/physical/used" + suffix, "memory/swap/used" + suffix]
             } else {
-                sensorsModel.sensors = ["memory/physical/used" + suffix]
+                sensors = ["memory/physical/used" + suffix]
             }
         }
     }