Use auto-calculated precision instead of custom fractional digits in …

…the `VeryGenericIndicator`
bluerobotics · Nov 28, 2023 · 02502ec · 02502ec
1 parent 6c5270c
commit 02502ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 34 deletions.
diff --git a/src/assets/defaults.ts b/src/assets/defaults.ts
@@ -94,7 +94,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Pilot Gain',
                   variableName: 'PilotGain',
-                  fractionalDigits: 1,
                   iconName: 'mdi-account-hard-hat',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -107,7 +106,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Lights (1)',
                   variableName: 'Lights1',
-                  fractionalDigits: 1,
                   iconName: 'mdi-flashlight',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -120,7 +118,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Cam Tilt',
                   variableName: 'CamTilt',
-                  fractionalDigits: 1,
                   iconName: 'mdi-camera-retake',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -144,7 +141,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Water Temp',
                   variableName: 'SCALED_PRESSURE2.temperature',
-                  fractionalDigits: 1,
                   iconName: 'mdi-thermometer',
                   variableUnit: '°C',
                   variableMultiplier: '.01',
@@ -267,7 +263,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Pilot Gain',
                   variableName: 'PilotGain',
-                  fractionalDigits: 1,
                   iconName: 'mdi-account-hard-hat',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -280,7 +275,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Lights (1)',
                   variableName: 'Lights1',
-                  fractionalDigits: 1,
                   iconName: 'mdi-flashlight',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -293,7 +287,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Cam Tilt',
                   variableName: 'CamTilt',
-                  fractionalDigits: 1,
                   iconName: 'mdi-camera-retake',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -438,7 +431,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Pilot Gain',
                   variableName: 'PilotGain',
-                  fractionalDigits: 1,
                   iconName: 'mdi-account-hard-hat',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -451,7 +443,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Lights (1)',
                   variableName: 'Lights1',
-                  fractionalDigits: 1,
                   iconName: 'mdi-flashlight',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -464,7 +455,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Cam Tilt',
                   variableName: 'CamTilt',
-                  fractionalDigits: 1,
                   iconName: 'mdi-camera-retake',
                   variableUnit: '%',
                   variableMultiplier: 100,
@@ -488,7 +478,6 @@ export const widgetProfiles: Profile[] = [
                 options: {
                   displayName: 'Water Temp',
                   variableName: 'SCALED_PRESSURE2.temperature',
-                  fractionalDigits: 1,
                   iconName: 'mdi-thermometer',
                   variableUnit: '°C',
                   variableMultiplier: '.01',

diff --git a/src/components/mini-widgets/VeryGenericIndicator.vue b/src/components/mini-widgets/VeryGenericIndicator.vue
@@ -40,10 +40,6 @@
             <Dropdown v-model="miniWidget.options.variableName" :options="Object.keys(store.genericVariables)" />
           </div>
         </div>
-        <div class="flex items-center justify-between w-full my-1">
-          <span class="mr-1 text-slate-100">Fractional digits</span>
-          <input v-model="miniWidget.options.fractionalDigits" class="w-48 px-2 py-1 rounded-md bg-slate-200" />
-        </div>
         <div class="flex items-center justify-between w-full my-1">
           <span class="mr-1 text-slate-100">Unit</span>
           <input v-model="miniWidget.options.variableUnit" class="w-48 px-2 py-1 rounded-md bg-slate-200" />
@@ -140,7 +136,6 @@ onBeforeMount(() => {
     Object.assign(miniWidget.value.options, {
       displayName: '',
       variableName: '',
-      fractionalDigits: 1,
       iconName: 'mdi-help-box',
       variableUnit: '%',
       variableMultiplier: 1,
@@ -155,14 +150,17 @@ onBeforeMount(() => {
 const store = useMainVehicleStore()
 
 const currentState = ref<unknown>(0)
+
+const finalValue = computed(() => Number(miniWidget.value.options.variableMultiplier) * Number(currentState.value))
 const parsedState = computed(() => {
-  if (currentState.value !== undefined) {
-    return round(
-      Number(miniWidget.value.options.variableMultiplier) * Number(currentState.value),
-      miniWidget.value.options.fractionalDigits as number
-    ).toFixed(miniWidget.value.options.fractionalDigits as number)
+  if (currentState.value === undefined) {
+    return '--'
   }
-  return '--'
+  const value = finalValue.value
+  if (value < 1) return value.toFixed(2)
+  if (value >= 1 && value < 100) return value.toFixed(1)
+  if (value >= 10000) return `${(value / 10000).toFixed(0)}k`
+  return value.toFixed(0)
 })
 
 const updateVariableState = (): void => {

diff --git a/src/types/genericIndicator.ts b/src/types/genericIndicator.ts
@@ -18,10 +18,6 @@ export interface VeryGenericIndicatorPreset {
    * Symbols representing the unit system of the variable
    */
   variableUnit: string
-  /**
-   * Number of digits to be displayed after the decimal separator (usually dot)
-   */
-  fractionalDigits: number
   /**
    * Value that multiplies the original value to bring it to a representative unit system
    */
@@ -34,63 +30,55 @@ export const veryGenericIndicatorPresets: VeryGenericIndicatorPreset[] = [
     variableName: 'CamTilt',
     iconName: 'mdi-camera-retake',
     variableUnit: '%',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Cam Pan',
     variableName: 'CamPan',
     iconName: 'mdi-camera-retake',
     variableUnit: '%',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Tether Turns',
     variableName: 'TetherTrn',
     iconName: 'mdi-horizontal-rotate-clockwise',
     variableUnit: 'x',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Lights (1)',
     variableName: 'Lights1',
     iconName: 'mdi-flashlight',
     variableUnit: '%',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Lights (2)',
     variableName: 'Lights2',
     iconName: 'mdi-flashlight',
     variableUnit: '%',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Pilot Gain',
     variableName: 'PilotGain',
     iconName: 'mdi-account-hard-hat',
     variableUnit: '%',
-    fractionalDigits: 0,
     variableMultiplier: 100,
   },
   {
     displayName: 'Input Hold',
     variableName: 'InputHold',
     iconName: 'mdi-gesture-tap-hold',
     variableUnit: '',
-    fractionalDigits: 0,
     variableMultiplier: 1,
   },
   {
     displayName: 'Roll Pitch',
     variableName: 'RollPitch',
     iconName: 'mdi-controller',
     variableUnit: '',
-    fractionalDigits: 0,
     variableMultiplier: 1,
   },
 ]