UniqueSoft/swirl
3
0
Fork 0
mirror of https://github.com/cuigh/swirl synced 2024-12-28 23:02:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve chart unit formatting

Browse Source
This commit is contained in:
cuigh 2018-04-10 12:15:56 +08:00
parent 536dc59cc6
commit a10053168a
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/swirl/js/swirl.js
View File

@ -1203,6 +1203,12 @@ var Swirl;
return value.toFixed(1) + "%";
case "percent:1":
return (value * 100).toFixed(1) + "%";
case "time:ns":
return value + 'ns';
case "time:µs":
return value.toFixed(2) + 'µs';
case "time:ms":
return value.toFixed(2) + 'ms';
case "time:s":
if (value < 1) {
return (value * 1000).toFixed(0) + 'ms';
@ -1210,6 +1216,14 @@ var Swirl;
else {
return value.toFixed(2) + 's';
}
case "time:m":
return value.toFixed(2) + 'm';
case "time:h":
return value.toFixed(2) + 'h';
case "time:d":
return value.toFixed(2) + 'd';
case "size:bits":
value = value / 8;
case "size:bytes":
if (value < 1024) {
return value.toString() + 'B';
@ -1223,6 +1237,12 @@ var Swirl;
else {
return (value / 1073741824).toFixed(2) + 'G';
}
case "size:kilobytes":
return value.toFixed(2) + 'K';
case "size:megabytes":
return value.toFixed(2) + 'M';
case "size:gigabytes":
return value.toFixed(2) + 'G';
default:
return value.toFixed(2);
}

2
assets/swirl/js/swirl.js.map
View File

File diff suppressed because one or more lines are too long

22
assets/swirl/ts/core/chart.ts
View File

@ -104,12 +104,26 @@ namespace Swirl.Core {
return value.toFixed(1) + "%";
case "percent:1":
return (value * 100).toFixed(1) + "%";
case "time:ns":
return value + 'ns';
case "time:µs":
return value.toFixed(2) + 'µs';
case "time:ms":
return value.toFixed(2) + 'ms';
case "time:s":
if (value < 1) { // 1
return (value * 1000).toFixed(0) + 'ms';
} else {
return value.toFixed(2) + 's';
}
case "time:m":
return value.toFixed(2) + 'm';
case "time:h":
return value.toFixed(2) + 'h';
case "time:d":
return value.toFixed(2) + 'd';
case "size:bits":
value = value / 8; // fall-through
case "size:bytes":
if (value < 1024) { // 1K
return value.toString() + 'B';
@ -120,6 +134,12 @@ namespace Swirl.Core {
} else {
return (value / 1073741824).toFixed(2) + 'G';
}
case "size:kilobytes":
return value.toFixed(2) + 'K';
case "size:megabytes":
return value.toFixed(2) + 'M';
case "size:gigabytes":
return value.toFixed(2) + 'G';
default:
return value.toFixed(2);
}
@ -447,7 +467,7 @@ namespace Swirl.Core {
let charts: any = [];
this.$panel.children().each((index: number, elem: Element) => {
let name = $(elem).data("name");
for (let i=0;i<this.charts.length; i++) {
for (let i = 0; i < this.charts.length; i++) {
let c = this.charts[i];
if (c.getOptions().name === name) {
charts.push({