Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 11:37:41 +01:00
Code Issues Projects Releases Wiki Activity

Add colors for #180

Browse Source
This commit is contained in:
Rsl1122 2017-08-18 10:18:12 +03:00
parent 9e76dfdb4d
commit f31aa57795
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/src/main/java/com/djrapitops/plan/Settings.java
View File

@ -36,6 +36,8 @@ public enum Settings {
PROCESS_GET_LIMIT("Settings.Cache.Processing.GetLimit"),
PROCESS_SAVE_LIMIT("Settings.Cache.Processing.SaveLimit"),
PROCESS_CLEAR_LIMIT("Settings.Cache.Processing.ClearLimit"),
TPS_GRAPH_HIGH("Customization.Colors.HTML.TPSGraph.TPSHigh"),
TPS_GRAPH_MED("Customization.Colors.HTML.TPSGraph.TPSMedium"),
// String
DEBUG("Settings.Debug"),
ALTERNATIVE_IP("Settings.WebServer.AlternativeIP"),
@ -73,6 +75,9 @@ public enum Settings {
HCOLOR_SEC("Customization.Colors.HTML.UI.Secondary"),
HCOLOR_TER("Customization.Colors.HTML.UI.Tertiary"),
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_ACTP_ACT("Customization.Colors.HTML.ActivityPie.Active"),
HCOLOR_ACTP_BAN("Customization.Colors.HTML.ActivityPie.Banned"),

6
Plan/src/main/java/com/djrapitops/plan/data/analysis/TPSPart.java
View File

@ -1,6 +1,7 @@
package main.java.com.djrapitops.plan.data.analysis;
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.ui.html.graphs.CPUGraphCreator;
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> 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("cpuseries", CPUGraphCreator.buildSeriesDataString(tpsData));

55
Plan/src/main/resources/analysis.html
View File

@ -691,18 +691,27 @@
}
};
var tpsSeries = {
name: 'TPS',
data: %tpsseries%,
name: 'TPS',
data: %tpsseries%,
type: 'spline',
color: '#b74343',
zones: [{
value: 0,
color: '%tpslowcol%'
}, {
value: %tpsmedium%,
color: '%tpsmediumcol%'
}, {
value: %tpshigh%,
color: '%tpshighcol%'
}]
tooltip: {
valueDecimals: 2
},
yAxis: 1
};
var cpuSeries = {
name: 'CPU Usage',
data: %cpuseries%,
name: 'CPU Usage',
data: %cpuseries%,
type: 'areaspline',
color: '#e0d264',
tooltip: {
@ -710,8 +719,8 @@
}
};
var ramSeries = {
name: 'RAM Usage',
data: %ramseries%,
name: 'RAM Usage',
data: %ramseries%,
type: 'areaspline',
color: '#7dcc24',
tooltip: {
@ -720,8 +729,8 @@
yAxis: 1
};
var entitySeries = {
name: 'Loaded Entities',
data: %entityseries%,
name: 'Loaded Entities',
data: %entityseries%,
type: 'areaspline',
color: '#ac69ef',
tooltip: {
@ -730,8 +739,8 @@
yAxis: 1
};
var chunkSeries = {
name: 'Loaded Chunks',
data: %chunkseries%,
name: 'Loaded Chunks',
data: %chunkseries%,
type: 'areaspline',
color: '#b58310',
tooltip: {
@ -744,18 +753,18 @@
data: [{
name: 'Active',
y: %active%
}, {
name: 'Inactive',
y: %inactive%,
sliced: true,
selected: true
}, {
name: 'Single Join',
y: %joinleaver%
}, {
name: 'Banned',
y: %banned%
}]
}, {
name: 'Inactive',
y: %inactive%,
sliced: true,
selected: true
}, {
name: 'Single Join',
y: %joinleaver%
}, {
name: 'Banned',
y: %banned%
}]
};
var gmData = %gmdata%;
var gmSeries = {

6
Plan/src/main/resources/config.yml
View File

@ -70,6 +70,12 @@ Customization:
Secondary: 5cb239
Tertiary: 89c471
TertiaryDark: 5da341
TPSGraph:
TPSHigh: 18
TPSMedium: 10
TPSHighCol: 267F00
TPSMediumCol: e5cc12
TPSLowCol: b74343
ActivityGraph:
OnlinePlayers: '1E90FF'
NewPlayers: '228B22'