web ui - finish

NoiseByNorthwest · Mar 10, 2018 · e0d0e8c · e0d0e8c
1 parent e1db18c
commit e0d0e8c
Show file tree

Hide file tree

Showing 34 changed files with 1,068 additions and 528 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/docs/as-fg.png b/assets/docs/as-fg.png
diff --git a/assets/docs/as-fp.png b/assets/docs/as-fp.png
diff --git a/assets/docs/as-ms.png b/assets/docs/as-ms.png
diff --git a/assets/docs/as-ov.png b/assets/docs/as-ov.png
diff --git a/assets/docs/as-tl.png b/assets/docs/as-tl.png
diff --git a/assets/docs/as.png b/assets/docs/as.png
diff --git a/assets/docs/cp-form.png b/assets/docs/cp-form.png
diff --git a/assets/docs/cp-list1.png b/assets/docs/cp-list1.png
diff --git a/assets/docs/cp-list2.png b/assets/docs/cp-list2.png
diff --git a/assets/web-ui/css/main.css b/assets/web-ui/css/main.css
@@ -122,6 +122,15 @@ table.data_table td > a {
     cursor:-moz-grabbing;
 }
 
+table.layout {
+    border-spacing: 0;
+    width: 100%;
+}
+
+table.layout td {
+    padding: 0;
+}
+
 .widget {
     border: solid 1px #022;
 }
@@ -139,7 +148,7 @@ table.data_table td > a {
     user-select: none;
 }
 
-#control-bar select {
+#metric-selector select {
     background-color: #000;
 }
 

diff --git a/assets/web-ui/index.html b/assets/web-ui/index.html
@@ -104,7 +104,7 @@ <h1>SPX Control Panel</h1>
                             ],
                         },
                         defaultValue: '0',
-                        description: 'When profiling a long running request / command, this option will allow you to contain report size and thus keeping it small enough to be exploitable.',
+                        description: 'When profiling a long running request, this option will allow you to contain report size and thus keeping it small enough to be exploitable.',
                     },
                     {
                         key: 'SPX_METRICS',

diff --git a/assets/web-ui/js/fmt.js b/assets/web-ui/js/fmt.js
@@ -13,7 +13,7 @@ function lpad(str, len, char) {
 
 export function date(d) {
     return d.getFullYear()
-        + '-' + lpad(d.getMonth(), 2, '0')
+        + '-' + lpad(d.getMonth() + 1, 2, '0')
         + '-' + lpad(d.getDate(), 2, '0')
         + ' ' + lpad(d.getHours(), 2, '0')
         + ':' + lpad(d.getMinutes(), 2, '0')
@@ -42,15 +42,19 @@ export function pct(n) {
 }
 
 export function time(n) {
+    if (n > 1000 * 1000 * 1000) {
+        return round(n / (1000 * 1000 * 1000), 2).toFixed(2) + 's';
+    }
+
     if (n > 1000 * 1000) {
-        return round(n / (1000 * 1000), 2).toFixed(2) + 's';
+        return round(n / (1000 * 1000), 2).toFixed(2) + 'ms';
     }
 
     if (n > 1000) {
-        return round(n / (1000), 2).toFixed(2) + 'ms';
+        return round(n / (1000), 2).toFixed(2) + 'us';
     }
 
-    return round(n, 0) + 'us';
+    return round(n, 0) + 'ns';
 }
 
 export function memory(n) {

diff --git a/assets/web-ui/js/math.js b/assets/web-ui/js/math.js
@@ -1,6 +1,6 @@
 
 export function round(n, d) {
-    let scale = Math.pow(10, d || 0);
+    const scale = Math.pow(10, d || 0);
 
     return Math.round(n * scale) / scale;
 }
@@ -44,7 +44,7 @@ export class Vec3 {
     }
 
     toHTMLColor() {
-        let c = this.copy().bound();
+        const c = this.copy().bound();
 
         return 'rgb(' + [
             parseInt(c.x * 255),
@@ -74,8 +74,8 @@ export class Vec3 {
     static lerpPath(vectors, dist) {
         dist = bound(dist);
 
-        let span = 1 / (vectors.length - 1);
-        let firstIdx = Math.min(vectors.length - 2, parseInt(dist / span));
+        const span = 1 / (vectors.length - 1);
+        const firstIdx = bound(parseInt(dist / span), 0, vectors.length - 2);
 
         return this.lerp(
             vectors[firstIdx],
@@ -128,7 +128,7 @@ export class Range {
     }
 
     subRange(ratio, num) {
-        let width = ratio * this.length();
+        const width = ratio * this.length();
 
         return new Range(
             Math.max(this.begin, this.begin + width * num),