From f6e17c656fe50e807e60fad52e126442f1f48de7 Mon Sep 17 00:00:00 2001
From: David Carley <dacarley@gmail.com>
Date: Sat, 16 Jul 2022 19:18:58 -0700
Subject: [PATCH] Fixed dimension labels in the probe dialog

---
 .../src/components/DimensionInput.svelte      | 28 +++++++++----------
 .../src/dialogs/ProbeDialog.svelte            | 28 +++++++++----------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/svelte-components/src/components/DimensionInput.svelte b/src/svelte-components/src/components/DimensionInput.svelte
index e700e73..bec8141 100644
--- a/src/svelte-components/src/components/DimensionInput.svelte
+++ b/src/svelte-components/src/components/DimensionInput.svelte
@@ -11,6 +11,7 @@
 
   type Option = {
     value: number;
+    label: string;
     metric: boolean;
   };
 
@@ -65,10 +66,7 @@
     <List>
       {#each options as option}
         <Item on:SMUI:action={() => onOptionSelected(option)}>
-          <Text>
-            {option.value}
-            {option.metric ? "mm" : "in"}
-          </Text>
+          <Text>{option.label}</Text>
         </Item>
       {/each}
     </List>
@@ -76,18 +74,18 @@
 </div>
 
 <style lang="scss">
-  .value-and-unit {
-    display: flex;
-    column-gap: 10px;
-  }
-
   :global {
-    .mdc-select {
-      max-width: 60px;
-    }
+    .value-and-unit {
+      display: flex;
+      column-gap: 10px;
 
-    .smui-select--standard .mdc-select__dropdown-icon {
-      margin-left: 0;
+      .mdc-select {
+        max-width: 60px;
+      }
+
+      .smui-select--standard .mdc-select__dropdown-icon {
+        margin-left: 0;
+      }
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/svelte-components/src/dialogs/ProbeDialog.svelte b/src/svelte-components/src/dialogs/ProbeDialog.svelte
index 618bcd2..74de934 100644
--- a/src/svelte-components/src/dialogs/ProbeDialog.svelte
+++ b/src/svelte-components/src/dialogs/ProbeDialog.svelte
@@ -63,21 +63,21 @@
   import { Config } from "$lib/ConfigStore";
 
   const cutterDiameterOptions = [
-    { value: 0.5, metric: false },
-    { value: 10, metric: true },
-    { value: 0.25, metric: false },
-    { value: 6, metric: true },
-    { value: 0.125, metric: false },
-    { value: 3, metric: true },
+    { value: 0.5, label: '1/2 "', metric: false },
+    { value: 0.25, label: '1/4 "', metric: false },
+    { value: 0.125, label: '1/8 "', metric: false },
+    { value: 10, label: "10 mm", metric: true },
+    { value: 6, label: "6 mm", metric: true },
+    { value: 3, label: "10 mm", metric: true },
   ];
 
   const cutterLengthOptions = [
-    { value: 1, metric: false },
-    { value: 20, metric: true },
-    { value: 0.5, metric: false },
-    { value: 10, metric: true },
-    { value: 0.25, metric: false },
-    { value: 6, metric: true },
+    { value: 1, label: '1 "', metric: false },
+    { value: 0.5, label: '1/2 "', metric: false },
+    { value: 0.25, label: '1/4 "', metric: false },
+    { value: 20, label: "20 mm", metric: true },
+    { value: 10, label: "10 mm", metric: true },
+    { value: 6, label: "6 mm", metric: true },
   ];
 
   export let open;
@@ -132,8 +132,8 @@
 
       if (probeType === "xyz") {
         await stepCompleted("BitDimensions", userAcknowledged);
-        localStorage.setItem("cutterDiameter", cutterDiameter);
-        localStorage.setItem("cutterLength", cutterLength);
+        localStorage.setItem("cutterDiameter", cutterDiameter.toString());
+        localStorage.setItem("cutterLength", cutterLength.toString());
       }
 
       await stepCompleted("PlaceProbeBlock", userAcknowledged);