From 7e61e717128b050c04ec87fd16eab75fe365c55d Mon Sep 17 00:00:00 2001 From: miguel <31931809+miguelvaca@users.noreply.github.com> Date: Tue, 23 Nov 2021 22:14:23 +1100 Subject: [PATCH] Fix bug in percent. Do not use getMetricPrefix for percent. --- magloop.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/magloop.html b/magloop.html index da590a8..7c86412 100644 --- a/magloop.html +++ b/magloop.html @@ -1450,7 +1450,7 @@ } function justifyText(pre, post) { - var whitespace = 20 - pre.length - post.length; + var whitespace = 22 - pre.length - post.length; return pre + ' '.repeat(whitespace) + post; } @@ -1760,41 +1760,40 @@ } if(context.dataset.label == "Tuning Cap (pF)") { var num = getMetricPrefix(value * 1e-12); - label = justifyText("Tuning Cap: ", Math.round(num.val).toString() + ' ' + num.pfx + 'F'); + label = justifyText("Tuning Cap: ", Math.round(num.val).toString() + ' ' + num.pfx + 'F'); } else if(label[0] == "Q"){ - label = justifyText("Q: ", Math.round(value).toString() + " "); + label = justifyText("Q: ", Math.round(value).toString() + " "); } else if(label[0] == 'V'){ var num = getMetricPrefix(value * 1e3); - label = justifyText("Vcap: ", num.val.toFixed(1).toString() + ' ' + num.pfx + 'V'); + label = justifyText("Vcap: ", num.val.toFixed(1).toString() + ' ' + num.pfx + 'V'); } else if(label[0] == 'B'){ var num = getMetricPrefix(value * 1e3); label = justifyText("Bandwidth: ", num.val.toFixed(1).toString() + ' ' + num.pfx + 'Hz'); } else if(label[0] == 'E'){ - var num = getMetricPrefix(value); - label = justifyText("Efficiency: ", num.val.toFixed(1).toString() + ' ' + ' %'); + label = justifyText("Efficiency: ", value.toFixed(2).toString() + ' ' + ' %'); } else if((label[0] == 'R') && (label[2] == 'r')){ var num = getMetricPrefix(value); - label = justifyText("R-rad: ", num.val.toFixed(1).toString() + ' ' + num.pfx + '\u03A9'); + label = justifyText("R-rad: ", num.val.toFixed(1).toString() + ' ' + num.pfx + '\u03A9'); } else if((label[0] == 'R') && (label[2] == 'l')){ var num = getMetricPrefix(value); - label = justifyText("R-loop: ", num.val.toFixed(1).toString() + ' ' + num.pfx + '\u03A9'); + label = justifyText("R-loop: ", num.val.toFixed(1).toString() + ' ' + num.pfx + '\u03A9'); } else if((label[0] == 'R') && (label[1] == 'e')){ var num = getMetricPrefix(value); - label = justifyText("Reactance: ", 'j' + num.val.toFixed(1) + ' ' + num.pfx + '\u03A9'); + label = justifyText("Reactance: ", 'j' + num.val.toFixed(1) + ' ' + num.pfx + '\u03A9'); } else if(label[0] == 'I'){ var num = getMetricPrefix(value); - label = justifyText("I\u2092: ", num.val.toFixed(1).toString() + ' ' + num.pfx + 'A'); + label = justifyText("I\u2092: ", num.val.toFixed(1).toString() + ' ' + num.pfx + 'A'); } else if(label[0] == 'P'){ - label = justifyText("Perimeter: ", value.toFixed(3).toString() + ' ' + '\u03BB'); + label = justifyText("Perimeter: ", value.toFixed(3).toString() + ' ' + '\u03BB'); } else { label += value.toFixed(3).toString(); }