mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-10-17 15:55:02 +02:00
Add colors for #180
This commit is contained in:
parent
9e76dfdb4d
commit
f31aa57795
@ -36,6 +36,8 @@ public enum Settings {
|
|||||||
PROCESS_GET_LIMIT("Settings.Cache.Processing.GetLimit"),
|
PROCESS_GET_LIMIT("Settings.Cache.Processing.GetLimit"),
|
||||||
PROCESS_SAVE_LIMIT("Settings.Cache.Processing.SaveLimit"),
|
PROCESS_SAVE_LIMIT("Settings.Cache.Processing.SaveLimit"),
|
||||||
PROCESS_CLEAR_LIMIT("Settings.Cache.Processing.ClearLimit"),
|
PROCESS_CLEAR_LIMIT("Settings.Cache.Processing.ClearLimit"),
|
||||||
|
TPS_GRAPH_HIGH("Customization.Colors.HTML.TPSGraph.TPSHigh"),
|
||||||
|
TPS_GRAPH_MED("Customization.Colors.HTML.TPSGraph.TPSMedium"),
|
||||||
// String
|
// String
|
||||||
DEBUG("Settings.Debug"),
|
DEBUG("Settings.Debug"),
|
||||||
ALTERNATIVE_IP("Settings.WebServer.AlternativeIP"),
|
ALTERNATIVE_IP("Settings.WebServer.AlternativeIP"),
|
||||||
@ -73,6 +75,9 @@ public enum Settings {
|
|||||||
HCOLOR_SEC("Customization.Colors.HTML.UI.Secondary"),
|
HCOLOR_SEC("Customization.Colors.HTML.UI.Secondary"),
|
||||||
HCOLOR_TER("Customization.Colors.HTML.UI.Tertiary"),
|
HCOLOR_TER("Customization.Colors.HTML.UI.Tertiary"),
|
||||||
HCOLOR_TER_DARK("Customization.Colors.HTML.UI.TertiaryDark"),
|
HCOLOR_TER_DARK("Customization.Colors.HTML.UI.TertiaryDark"),
|
||||||
|
HCOLOR_TPS_HIGH("Customization.Colors.HTML.TPSGraph.TPSHighCol"),
|
||||||
|
HCOLOR_TPS_MED("Customization.Colors.HTML.TPSGraph.TPSMediumCol"),
|
||||||
|
HCOLOR_TPS_LOW("Customization.Colors.HTML.TPSGraph.TPSLowCol"),
|
||||||
HCOLOR_ACT_ONL("Customization.Colors.HTML.ActivityGraph.OnlinePlayers"),
|
HCOLOR_ACT_ONL("Customization.Colors.HTML.ActivityGraph.OnlinePlayers"),
|
||||||
HCOLOR_ACTP_ACT("Customization.Colors.HTML.ActivityPie.Active"),
|
HCOLOR_ACTP_ACT("Customization.Colors.HTML.ActivityPie.Active"),
|
||||||
HCOLOR_ACTP_BAN("Customization.Colors.HTML.ActivityPie.Banned"),
|
HCOLOR_ACTP_BAN("Customization.Colors.HTML.ActivityPie.Banned"),
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package main.java.com.djrapitops.plan.data.analysis;
|
package main.java.com.djrapitops.plan.data.analysis;
|
||||||
|
|
||||||
import com.djrapitops.plugin.api.TimeAmount;
|
import com.djrapitops.plugin.api.TimeAmount;
|
||||||
|
import main.java.com.djrapitops.plan.Settings;
|
||||||
import main.java.com.djrapitops.plan.data.TPS;
|
import main.java.com.djrapitops.plan.data.TPS;
|
||||||
import main.java.com.djrapitops.plan.ui.html.graphs.CPUGraphCreator;
|
import main.java.com.djrapitops.plan.ui.html.graphs.CPUGraphCreator;
|
||||||
import main.java.com.djrapitops.plan.ui.html.graphs.RamGraphCreator;
|
import main.java.com.djrapitops.plan.ui.html.graphs.RamGraphCreator;
|
||||||
@ -40,6 +41,11 @@ public class TPSPart extends RawData {
|
|||||||
List<TPS> week = TPSGraphCreator.filterTPS(tpsData, now - TimeAmount.WEEK.ms());
|
List<TPS> week = TPSGraphCreator.filterTPS(tpsData, now - TimeAmount.WEEK.ms());
|
||||||
List<TPS> day = TPSGraphCreator.filterTPS(tpsData, now - TimeAmount.DAY.ms());
|
List<TPS> day = TPSGraphCreator.filterTPS(tpsData, now - TimeAmount.DAY.ms());
|
||||||
|
|
||||||
|
addValue("tpshighcol", "#"+ Settings.HCOLOR_TPS_HIGH);
|
||||||
|
addValue("tpsmediumcol", "#"+ Settings.HCOLOR_TPS_MED);
|
||||||
|
addValue("tpslowcol", "#"+ Settings.HCOLOR_TPS_LOW);
|
||||||
|
addValue("tpsmedium", Settings.TPS_GRAPH_MED.getNumber());
|
||||||
|
addValue("tpshigh", Settings.TPS_GRAPH_HIGH.getNumber());
|
||||||
|
|
||||||
addValue("tpsseries", TPSGraphCreator.buildSeriesDataString(tpsData));
|
addValue("tpsseries", TPSGraphCreator.buildSeriesDataString(tpsData));
|
||||||
addValue("cpuseries", CPUGraphCreator.buildSeriesDataString(tpsData));
|
addValue("cpuseries", CPUGraphCreator.buildSeriesDataString(tpsData));
|
||||||
|
@ -691,18 +691,27 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
var tpsSeries = {
|
var tpsSeries = {
|
||||||
name: 'TPS',
|
name: 'TPS',
|
||||||
data: %tpsseries%,
|
data: %tpsseries%,
|
||||||
type: 'spline',
|
type: 'spline',
|
||||||
color: '#b74343',
|
zones: [{
|
||||||
|
value: 0,
|
||||||
|
color: '%tpslowcol%'
|
||||||
|
}, {
|
||||||
|
value: %tpsmedium%,
|
||||||
|
color: '%tpsmediumcol%'
|
||||||
|
}, {
|
||||||
|
value: %tpshigh%,
|
||||||
|
color: '%tpshighcol%'
|
||||||
|
}]
|
||||||
tooltip: {
|
tooltip: {
|
||||||
valueDecimals: 2
|
valueDecimals: 2
|
||||||
},
|
},
|
||||||
yAxis: 1
|
yAxis: 1
|
||||||
};
|
};
|
||||||
var cpuSeries = {
|
var cpuSeries = {
|
||||||
name: 'CPU Usage',
|
name: 'CPU Usage',
|
||||||
data: %cpuseries%,
|
data: %cpuseries%,
|
||||||
type: 'areaspline',
|
type: 'areaspline',
|
||||||
color: '#e0d264',
|
color: '#e0d264',
|
||||||
tooltip: {
|
tooltip: {
|
||||||
@ -710,8 +719,8 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
var ramSeries = {
|
var ramSeries = {
|
||||||
name: 'RAM Usage',
|
name: 'RAM Usage',
|
||||||
data: %ramseries%,
|
data: %ramseries%,
|
||||||
type: 'areaspline',
|
type: 'areaspline',
|
||||||
color: '#7dcc24',
|
color: '#7dcc24',
|
||||||
tooltip: {
|
tooltip: {
|
||||||
@ -720,8 +729,8 @@
|
|||||||
yAxis: 1
|
yAxis: 1
|
||||||
};
|
};
|
||||||
var entitySeries = {
|
var entitySeries = {
|
||||||
name: 'Loaded Entities',
|
name: 'Loaded Entities',
|
||||||
data: %entityseries%,
|
data: %entityseries%,
|
||||||
type: 'areaspline',
|
type: 'areaspline',
|
||||||
color: '#ac69ef',
|
color: '#ac69ef',
|
||||||
tooltip: {
|
tooltip: {
|
||||||
@ -730,8 +739,8 @@
|
|||||||
yAxis: 1
|
yAxis: 1
|
||||||
};
|
};
|
||||||
var chunkSeries = {
|
var chunkSeries = {
|
||||||
name: 'Loaded Chunks',
|
name: 'Loaded Chunks',
|
||||||
data: %chunkseries%,
|
data: %chunkseries%,
|
||||||
type: 'areaspline',
|
type: 'areaspline',
|
||||||
color: '#b58310',
|
color: '#b58310',
|
||||||
tooltip: {
|
tooltip: {
|
||||||
@ -744,18 +753,18 @@
|
|||||||
data: [{
|
data: [{
|
||||||
name: 'Active',
|
name: 'Active',
|
||||||
y: %active%
|
y: %active%
|
||||||
}, {
|
}, {
|
||||||
name: 'Inactive',
|
name: 'Inactive',
|
||||||
y: %inactive%,
|
y: %inactive%,
|
||||||
sliced: true,
|
sliced: true,
|
||||||
selected: true
|
selected: true
|
||||||
}, {
|
}, {
|
||||||
name: 'Single Join',
|
name: 'Single Join',
|
||||||
y: %joinleaver%
|
y: %joinleaver%
|
||||||
}, {
|
}, {
|
||||||
name: 'Banned',
|
name: 'Banned',
|
||||||
y: %banned%
|
y: %banned%
|
||||||
}]
|
}]
|
||||||
};
|
};
|
||||||
var gmData = %gmdata%;
|
var gmData = %gmdata%;
|
||||||
var gmSeries = {
|
var gmSeries = {
|
||||||
|
@ -70,6 +70,12 @@ Customization:
|
|||||||
Secondary: 5cb239
|
Secondary: 5cb239
|
||||||
Tertiary: 89c471
|
Tertiary: 89c471
|
||||||
TertiaryDark: 5da341
|
TertiaryDark: 5da341
|
||||||
|
TPSGraph:
|
||||||
|
TPSHigh: 18
|
||||||
|
TPSMedium: 10
|
||||||
|
TPSHighCol: 267F00
|
||||||
|
TPSMediumCol: e5cc12
|
||||||
|
TPSLowCol: b74343
|
||||||
ActivityGraph:
|
ActivityGraph:
|
||||||
OnlinePlayers: '1E90FF'
|
OnlinePlayers: '1E90FF'
|
||||||
NewPlayers: '228B22'
|
NewPlayers: '228B22'
|
||||||
|
Loading…
Reference in New Issue
Block a user