| @@ -53,17 +53,17 @@ socket.onmessage = function(m) { | |||||
| // received overview data | // received overview data | ||||
| var data = JSON.parse(msg[1]); | var data = JSON.parse(msg[1]); | ||||
| console.log(solarchart); | console.log(solarchart); | ||||
| solarchart.navigator.series[consumIdx].setData(data.consumption, false); | |||||
| solarchart.navigator.series[gridIdx].setData(data.grid, false); | |||||
| solarchart.navigator.series[prodIdx].setData(data.production, false); | |||||
| solarchart.get('consumptionNav').setData(data.consumption, false); | |||||
| solarchart.get('gridNav').setData(data.grid, false); | |||||
| solarchart.get('productionNav').setData(data.production, false); | |||||
| solarchart.redraw(); | solarchart.redraw(); | ||||
| } else if (msg[0] == 'windata') { | } else if (msg[0] == 'windata') { | ||||
| var data = JSON.parse(msg[1]); | var data = JSON.parse(msg[1]); | ||||
| console.log(data); | console.log(data); | ||||
| solarchart.sd_lastwindata = Date.now(); | solarchart.sd_lastwindata = Date.now(); | ||||
| solarchart.series[consumDataIdx].setData(data.consumption, false); | |||||
| solarchart.series[gridDataIdx].setData(data.grid, false); | |||||
| solarchart.series[prodDataIdx].setData(data.production, false); | |||||
| solarchart.get('consumption').setData(data.consumption, false); | |||||
| solarchart.get('grid').setData(data.grid, false); | |||||
| solarchart.get('production').setData(data.production, false); | |||||
| solarchart.redraw(); | solarchart.redraw(); | ||||
| solarchart.hideLoading() | solarchart.hideLoading() | ||||
| } | } | ||||
| @@ -86,18 +86,21 @@ var solarchart = Highcharts.stockChart('solarchart', { | |||||
| { | { | ||||
| type: 'bar', | type: 'bar', | ||||
| name: 'consumptionNav', | name: 'consumptionNav', | ||||
| id: 'consumptionNav', | |||||
| showInNavigator: true, | showInNavigator: true, | ||||
| data: [], | data: [], | ||||
| }, | }, | ||||
| { | { | ||||
| type: 'bar', | type: 'bar', | ||||
| name: 'gridNav', | name: 'gridNav', | ||||
| id: 'gridNav', | |||||
| showInNavigator: true, | showInNavigator: true, | ||||
| data: [], | data: [], | ||||
| }, | }, | ||||
| { | { | ||||
| type: 'bar', | type: 'bar', | ||||
| name: 'productionNav', | name: 'productionNav', | ||||
| id: 'productionNav', | |||||
| showInNavigator: true, | showInNavigator: true, | ||||
| data: [], | data: [], | ||||
| }, | }, | ||||
| @@ -137,37 +140,21 @@ var solarchart = Highcharts.stockChart('solarchart', { | |||||
| series: [ | series: [ | ||||
| { | { | ||||
| name: 'consumption', | name: 'consumption', | ||||
| id: 'consumption', | |||||
| type: 'line', | type: 'line', | ||||
| data: [ ], | data: [ ], | ||||
| }, | }, | ||||
| { | { | ||||
| name: 'grid', | name: 'grid', | ||||
| id: 'grid', | |||||
| type: 'line', | type: 'line', | ||||
| data: [ ], | data: [ ], | ||||
| }, | }, | ||||
| { | { | ||||
| name: 'production', | name: 'production', | ||||
| id: 'production', | |||||
| type: 'line', | type: 'line', | ||||
| data: [ ], | data: [ ], | ||||
| }, | }, | ||||
| ] | ] | ||||
| }); | }); | ||||
| // 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; | |||||
| } | |||||