mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-18 23:33:12 +09:00
Tweaked slaveDisplay.js to use 92% less data to draw a chart. This is projected to speed up chart loading significantly, from 3.4s to about 0.5s.
- Added copper-cable to the list of hidables on the chart, and removed copper-wire which isn't a thing. - Don't display items as hidable that aren't being produced. It's confusing. - Added /getTimelineStats, because /getStats is used by another view that I don't feel like converting to not require the 0-production data points.
This commit is contained in:
1 parent
000b2fc147
commit
49887012f7
2 files changed
+76
-32
No files matched your search
+33
-32
@@ -44,32 +44,34 @@ let chartIgnoreList = [
|
||||
|
||||
// ID of slave, ID of canvasjs div without #
|
||||
function makeGraph(slaveID, selector) {
|
||||
post("api/getStats", {slaveID: slaveID}, function(data){
|
||||
post("api/getTimelineStats", {slaveID: slaveID}, function(pointsInTime) {
|
||||
//console.log("Building chart " + slaveID + " with this data:")
|
||||
//console.log(data)
|
||||
if(data.length > 0) {
|
||||
// find keys
|
||||
let itemNames = [];
|
||||
for(let key in data[data.length - 1].data) {
|
||||
itemNames[itemNames.length] = key
|
||||
|
||||
//Find all keys at all points in time.
|
||||
let itemNames = {};
|
||||
pointsInTime.forEach(function(point) {
|
||||
for(let key in point.data) {
|
||||
itemNames[key] = true;
|
||||
}
|
||||
let chartData = [];
|
||||
for(let o = 0; o < itemNames.length; o++) {
|
||||
if(!chartIgnoreList.includes(itemNames[o])){
|
||||
chartData[chartData.length] = generateLineChartArray(data, itemNames[o]);
|
||||
}
|
||||
}
|
||||
//console.log(chartData)
|
||||
drawChart(selector, chartData)
|
||||
}
|
||||
// callback(data);
|
||||
});
|
||||
itemNames = Object.keys(itemNames);
|
||||
|
||||
//Generate a chart list for each item.
|
||||
const displayNames = itemNames.filter(function(name) {
|
||||
return !chartIgnoreList.includes(name);
|
||||
});
|
||||
const chartData = displayNames.map(function(name) {
|
||||
return generateLineChartArray(pointsInTime, name)
|
||||
});
|
||||
|
||||
chartData.length && drawChart(selector, chartData)
|
||||
})
|
||||
}
|
||||
|
||||
// production info
|
||||
// string, object, function(object)
|
||||
function post(url, data, callback) {
|
||||
console.log("POST " + url + JSON.stringify(data))
|
||||
console.log("POST " + url, data);
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open("POST", url, true);
|
||||
xhr.setRequestHeader("Content-type", "application/json");
|
||||
@@ -83,27 +85,26 @@ function post(url, data, callback) {
|
||||
}
|
||||
|
||||
function generateLineChartArray(data, nameKey) {
|
||||
const legendKeys = ["copper-cable", "iron-plate", "copper-plate", "electronic-circuit", "steel-plate", "advanced-circuit", "crude-oil", "petroleum-gas"];
|
||||
let chartData = [];
|
||||
for(let i = 0; i < data.length; i++) {
|
||||
// only show recent data
|
||||
if(data[i].timestamp > Date.now() - (24*60*60*1000)){
|
||||
let y = data[i].data[nameKey]
|
||||
if(!data[i].data[nameKey]) {
|
||||
y = 0;
|
||||
} else if(y < 0) {
|
||||
y = 0;
|
||||
}
|
||||
chartData[chartData.length] = {
|
||||
x: new Date(data[i].timestamp),
|
||||
y: Number(y)
|
||||
}
|
||||
let y = data[i].data[nameKey]
|
||||
if(!data[i].data[nameKey]) {
|
||||
y = 0;
|
||||
} else if(y < 0) {
|
||||
y = 0;
|
||||
}
|
||||
chartData[chartData.length] = {
|
||||
x: new Date(data[i].timestamp),
|
||||
y: Number(y)
|
||||
}
|
||||
}
|
||||
chartData = sortByKey(chartData, "x");
|
||||
let xyz = {};
|
||||
xyz.name = nameKey;
|
||||
xyz.type = "line";
|
||||
if(nameKey == "copper-wire"||nameKey == "iron-plate"||nameKey == "copper-plate"||nameKey == "electronic-circuit"||nameKey == "steel-plate"||nameKey == "advanced-circuit"||nameKey == "crude-oil"||nameKey == "petroleum-gas"){
|
||||
|
||||
if(legendKeys.indexOf(nameKey) >= 0){
|
||||
xyz.showInLegend = true;
|
||||
}
|
||||
xyz.dataPoints = chartData;
|
||||
@@ -113,7 +114,7 @@ function generateLineChartArray(data, nameKey) {
|
||||
var chartsByID = {};
|
||||
function drawChart(selector, chartData) {
|
||||
// selector is ID of element, ex "chartContainer" or "-123199123"
|
||||
console.log(chartData)
|
||||
// console.log(chartData)
|
||||
chartsByID[selector] = new CanvasJS.Chart(selector, {
|
||||
title:{
|
||||
text: "Production graph"
|
||||
|
||||
Reference in new issue
Block a user