diff --git a/profile_parser/js/color_cfg.js b/profile_parser/js/color_cfg.js index b95d376..fa549a8 100644 --- a/profile_parser/js/color_cfg.js +++ b/profile_parser/js/color_cfg.js @@ -5,10 +5,12 @@ const GREEN = "#388E3C"; const ORANGE = "#F9A825"; const RED = "#E53935"; const YELLOW = "#FFB300"; +const GREY = "#E0E0E0"; exports.default = { BLUE, GREEN, ORANGE, RED, YELLOW, + GREY, }; diff --git a/profile_parser/js/plot_acc_stats.js b/profile_parser/js/plot_acc_stats.js index 2b95d12..52361c6 100644 --- a/profile_parser/js/plot_acc_stats.js +++ b/profile_parser/js/plot_acc_stats.js @@ -44,7 +44,7 @@ for (let i = 0; i < benchmarks.length; ++i) { } let layout = { title: "Zoom FPS Benchmark", - yaxis: { title: "Average FPS", range: [0, 61], dtick: 5 }, + yaxis: { title: "Average FPS", range: [0, 61], dtick: 5, gridcolor: color_cfg_1.default.GREY, gridwidth: 1.5 }, }; (0, nodeplotlib_1.plot)(data, layout); // Panning @@ -86,6 +86,6 @@ for (let i = 0; i < benchmarks.length; ++i) { } layout = { title: "Panning FPS Benchmark", - yaxis: { title: "Average FPS", range: [0, 61], dtick: 5 }, + yaxis: { title: "Average FPS", range: [0, 61], dtick: 5, gridcolor: color_cfg_1.default.GREY, gridwidth: 1.5 }, }; (0, nodeplotlib_1.plot)(data, layout); diff --git a/profile_parser/js/plot_loading_time.js b/profile_parser/js/plot_loading_time.js index d0d0d59..14504f7 100644 --- a/profile_parser/js/plot_loading_time.js +++ b/profile_parser/js/plot_loading_time.js @@ -1,6 +1,10 @@ "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); const nodeplotlib_1 = require("nodeplotlib"); +const color_cfg_1 = __importDefault(require("./color_cfg")); let data = []; // Loading times for huge graph 255 MiB. JSON parsing step about 5 seconds // Standard: 48, 48, 48, 48 @@ -11,6 +15,9 @@ let bar = { y: y_values, type: 'bar', name: "Standard", + marker: { + color: color_cfg_1.default.BLUE, + }, // text: y_values.map(String), // textposition: "auto", // hoverinfo: "none", @@ -19,7 +26,10 @@ let bar = { symmetric: false, array: [0, 1], arrayminus: [0, 3], - visible: true + visible: true, + color: "black", + thickness: 1.0, + width: 10, }, }; data.push(bar); @@ -31,6 +41,9 @@ bar = { y: y_values, type: 'bar', name: "Vertical", + marker: { + color: color_cfg_1.default.GREEN, + }, // text: y_values.map(String), // textposition: "auto", // hoverinfo: "none", @@ -39,13 +52,16 @@ bar = { symmetric: false, array: [1, 1], arrayminus: [1, 3], - visible: true + visible: true, + color: "black", + thickness: 1.0, + width: 10, }, }; data.push(bar); const layout = { title: "Layout Loading Times", xaxis: { title: "Loading Scenario" }, - yaxis: { title: "Time (s)", autotick: false, dtick: 5 }, + yaxis: { title: "Time (s)", autotick: false, dtick: 5, gridcolor: color_cfg_1.default.GREY, gridwidth: 1.5 }, }; (0, nodeplotlib_1.plot)(data, layout); diff --git a/profile_parser/js/plot_stats_comparison.js b/profile_parser/js/plot_stats_comparison.js index d9d3c65..0331b96 100644 --- a/profile_parser/js/plot_stats_comparison.js +++ b/profile_parser/js/plot_stats_comparison.js @@ -94,7 +94,7 @@ for (let i = 0; i < files_in_directory.length; ++i) { } const layout = { title: PLOT_TITLE, - yaxis: { title: "Frametime (ms)", autotick: false, dtick: 5 }, + yaxis: { title: "Frametime (ms)", autotick: false, dtick: 20, gridcolor: color_cfg_1.default.GREY, gridwidth: 1.5 }, shapes: [ // 60 fps line { diff --git a/profile_parser/src/color_cfg.ts b/profile_parser/src/color_cfg.ts index 6e660bf..bce7a8d 100644 --- a/profile_parser/src/color_cfg.ts +++ b/profile_parser/src/color_cfg.ts @@ -3,6 +3,7 @@ const GREEN = "#388E3C"; const ORANGE = "#F9A825"; const RED = "#E53935"; const YELLOW = "#FFB300"; +const GREY = "#E0E0E0"; export default { @@ -11,4 +12,5 @@ export default { ORANGE, RED, YELLOW, + GREY, } \ No newline at end of file diff --git a/profile_parser/src/plot_acc_stats.ts b/profile_parser/src/plot_acc_stats.ts index c3863c7..e3c6b32 100644 --- a/profile_parser/src/plot_acc_stats.ts +++ b/profile_parser/src/plot_acc_stats.ts @@ -46,7 +46,7 @@ for (let i = 0; i < benchmarks.length; ++i) { let layout = { title: "Zoom FPS Benchmark", - yaxis: {title: "Average FPS", range: [0, 61], dtick: 5}, + yaxis: {title: "Average FPS", range: [0, 61], dtick: 5, gridcolor: colors.GREY, gridwidth: 1.5}, } plot(data, layout); @@ -96,6 +96,6 @@ for (let i = 0; i < benchmarks.length; ++i) { layout = { title: "Panning FPS Benchmark", - yaxis: {title: "Average FPS", range: [0, 61], dtick: 5}, + yaxis: {title: "Average FPS", range: [0, 61], dtick: 5, gridcolor: colors.GREY, gridwidth: 1.5}, } plot(data, layout); \ No newline at end of file diff --git a/profile_parser/src/plot_loading_time.ts b/profile_parser/src/plot_loading_time.ts index 6a3b355..1a1ff3b 100644 --- a/profile_parser/src/plot_loading_time.ts +++ b/profile_parser/src/plot_loading_time.ts @@ -1,4 +1,5 @@ import { plot, Plot } from 'nodeplotlib'; +import colors from "./color_cfg"; let data: Plot[] = []; @@ -11,6 +12,9 @@ let bar: Plot = { y: y_values, type: 'bar', name: "Standard", + marker: { + color: colors.BLUE, + }, // text: y_values.map(String), // textposition: "auto", // hoverinfo: "none", @@ -19,7 +23,10 @@ let bar: Plot = { symmetric: false, array: [0, 1], arrayminus: [0, 3], - visible: true + visible: true, + color: "black", + thickness: 1.0, + width: 10, }, }; data.push(bar); @@ -32,6 +39,9 @@ bar = { y: y_values, type: 'bar', name: "Vertical", + marker: { + color: colors.GREEN, + }, // text: y_values.map(String), // textposition: "auto", // hoverinfo: "none", @@ -40,7 +50,10 @@ bar = { symmetric: false, array: [1, 1], arrayminus: [1, 3], - visible: true + visible: true, + color: "black", + thickness: 1.0, + width: 10, }, }; data.push(bar); @@ -48,6 +61,6 @@ data.push(bar); const layout = { title: "Layout Loading Times", xaxis: {title: "Loading Scenario"}, - yaxis: {title: "Time (s)", autotick: false, dtick: 5}, + yaxis: {title: "Time (s)", autotick: false, dtick: 5, gridcolor: colors.GREY, gridwidth: 1.5}, } plot(data, layout); diff --git a/profile_parser/src/plot_stats_comparison.ts b/profile_parser/src/plot_stats_comparison.ts index 54fa49b..1fd0fef 100644 --- a/profile_parser/src/plot_stats_comparison.ts +++ b/profile_parser/src/plot_stats_comparison.ts @@ -107,7 +107,7 @@ for (let i = 0; i < files_in_directory.length; ++i) { const layout = { title: PLOT_TITLE, - yaxis: {title: "Frametime (ms)", autotick: false, dtick: 5}, + yaxis: {title: "Frametime (ms)", autotick: false, dtick: 20, gridcolor: colors.GREY, gridwidth: 1.5}, shapes: [ // 60 fps line {