From c03a8c41703445b273eec64127b36ee02f7f3a9b Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 18 May 2020 18:35:03 +0200
Subject: [PATCH] Bug Fixed decimals on formulas

---
 CanvasApp/CockpitSpace/Speedometer.js | 28 +++++++++++++++------------
 CanvasApp/FloatingSpace/UiObject.js   |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CanvasApp/CockpitSpace/Speedometer.js b/CanvasApp/CockpitSpace/Speedometer.js
index 12f8cc14e..b2e26df1f 100644
--- a/CanvasApp/CockpitSpace/Speedometer.js
+++ b/CanvasApp/CockpitSpace/Speedometer.js
@@ -181,18 +181,6 @@ function newSpeedometer () {
 
     /* We put the thisObject.params.VALUE in the middle */
 
-    fontSize = 22
-    if (thisObject.params.VALUE > 999) {
-      fontSize = 18
-    }
-    if (thisObject.params.VALUE > 9999) {
-      fontSize = 14
-    }
-    if (thisObject.params.VALUE > 99999) {
-      fontSize = 10
-    }
-    browserCanvasContext.font = 'bold  ' + fontSize + 'px ' + UI_FONT.PRIMARY
-
     label = thisObject.params.VALUE
 
     if (isNaN(label) === false) {
@@ -202,6 +190,22 @@ function newSpeedometer () {
       if (label === 0) { label = label.toFixed(2) }
     }
 
+    fontSize = 22
+    if (label.length > 8) {
+      fontSize = 18
+    }
+    if (label.length > 10) {
+      fontSize = 14
+    }
+    if (label.length > 12) {
+      fontSize = 10
+    }
+    if (label.length > 14) {
+      fontSize = 8
+    }
+
+    browserCanvasContext.font = 'bold  ' + fontSize + 'px ' + UI_FONT.PRIMARY
+
     // label = label.substring(0, 6)
 
     xOffset = label.length / 2 * fontSize * FONT_ASPECT_RATIO + 7
diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js
index 2dd1f2db3..1739df110 100644
--- a/CanvasApp/FloatingSpace/UiObject.js
+++ b/CanvasApp/FloatingSpace/UiObject.js
@@ -1351,7 +1351,7 @@ function newUiObject () {
       label = currentValue
       if (!isNaN(label)) {
         if (currentValue.toFixed !== undefined) {
-          label = currentValue.toFixed(2)
+          label = dynamicDecimals(currentValue, 2)
         }
       }