Browse Source

HighStocks always adds a navigator series that isn't defined, so it

messes up the indexes...  find the indexes that we want, and store
them so that any other crazy things that the library does hopefully
won't screw us up..
main
John-Mark Gurney 5 years ago
parent
commit
e904b0d08d
1 changed files with 22 additions and 8 deletions
  1. +22
    -8
      root/js/solardash.base.js

+ 22
- 8
root/js/solardash.base.js View File

@@ -8,11 +8,6 @@ socket.onopen = function() {
// connected
}

// Indexes for chart series
consumIdx = 0;
gridIdx = 1;
prodIdx = 2;

var msgNumbs = {
p: "#production",
ng: "#netgrid",
@@ -63,9 +58,9 @@ socket.onmessage = function(m) {
var data = JSON.parse(msg[1]);
console.log(data);
solarchart.sd_lastwindata = Date.now();
solarchart.series[consumIdx].setData(data.consumption, false);
solarchart.series[gridIdx].setData(data.grid, false);
solarchart.series[prodIdx].setData(data.production, false);
solarchart.series[consumDataIdx].setData(data.consumption, false);
solarchart.series[gridDataIdx].setData(data.grid, false);
solarchart.series[prodDataIdx].setData(data.production, false);
solarchart.redraw();
solarchart.hideLoading()
}
@@ -153,3 +148,22 @@ var solarchart = Highcharts.stockChart('solarchart', {
},
]
});

// Indexes for chart series
delete solarchart.navigator.series[0];
for (var idx in solarchart.navigator.series) {
if (solarchart.navigator.series[idx].name == 'consumptionNav')
consumIdx = idx;
else if (solarchart.navigator.series[idx].name == 'gridNav')
gridIdx = idx;
else if (solarchart.navigator.series[idx].name == 'productionNav')
prodIdx = idx;
}
for (var idx in solarchart.series) {
if (solarchart.series[idx].name == 'consumption')
consumDataIdx = idx;
else if (solarchart.series[idx].name == 'grid')
gridDataIdx = idx;
else if (solarchart.series[idx].name == 'production')
prodDataIdx = idx;
}

Loading…
Cancel
Save