Fix retransmit scaling on the tree

LibreQoE · Dec 10, 2024 · 6b7bdcb · 6b7bdcb
1 parent b659268
commit 6b7bdcb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/rust/lqosd/src/node_manager/js_build/src/helpers/scaling.js b/src/rust/lqosd/src/node_manager/js_build/src/helpers/scaling.js
@@ -66,6 +66,13 @@ export function formatRetransmit(retransmits) {
     return "<span class='muted' style='color: " + color + "'>■</span>" + retransmits.toFixed(1) + "%</span>";
 }
 
+export function formatRetransmitRaw(retransmits) {
+    retransmits *= 100;
+    let percent = Math.min(100, retransmits);
+    let color = lerpColor([0, 255, 0], [255, 0, 0], percent);
+    return "<span class='muted' style='color: " + color + "'>■</span>" + retransmits.toFixed(0) + "</span>";
+}
+
 export function formatCakeStat(n) {
     let percent = Math.min(100, n) / 100;
     let color = lerpColor([128, 128, 0], [255, 255, 255], percent);

diff --git a/src/rust/lqosd/src/node_manager/js_build/src/tree.js b/src/rust/lqosd/src/node_manager/js_build/src/tree.js
@@ -1,7 +1,7 @@
 import {clearDiv, clientTableHeader, formatLastSeen, simpleRow, simpleRowHtml, theading} from "./helpers/builders";
 import {
     formatCakeStat,
-    formatRetransmit,
+    formatRetransmit, formatRetransmitRaw,
     formatRtt,
     formatThroughput,
 } from "./helpers/scaling";
@@ -166,7 +166,7 @@ function buildRow(i, depth=0) {
     col = document.createElement("td");
     col.id = "re-xmit-down-" + nodeId;
     if (node.current_retransmits[0] !== undefined) {
-        col.innerHTML = formatRetransmit(node.current_retransmits[0]);
+        col.innerHTML = formatRetransmitRaw(node.current_retransmits[0]);
     } else {
         col.textContent = "-";
     }
@@ -175,7 +175,7 @@ function buildRow(i, depth=0) {
     col = document.createElement("td");
     col.id = "re-xmit-up-" + nodeId;
     if (node.current_retransmits[1] !== undefined) {
-        col.innerHTML = formatRetransmit(node.current_retransmits[1]);
+        col.innerHTML = formatRetransmitRaw(node.current_retransmits[1]);
     } else {
         col.textContent = "-";
     }
@@ -249,15 +249,15 @@ function treeUpdate(msg) {
         col = document.getElementById("re-xmit-down-" + nodeId);
         if (col !== null) {
             if (node.current_retransmits[0] !== undefined) {
-                col.innerHTML = formatRetransmit(node.current_retransmits[0]);
+                col.innerHTML = formatRetransmitRaw(node.current_retransmits[0]);
             } else {
                 col.textContent = "-";
             }
         }
         col = document.getElementById("re-xmit-up-" + nodeId);
         if (col !== null) {
             if (node.current_retransmits[1] !== undefined) {
-                col.innerHTML = formatRetransmit(node.current_retransmits[1]);
+                col.innerHTML = formatRetransmitRaw(node.current_retransmits[1]);
             } else {
                 col.textContent = "-";
             }