Fixed dimension labels in the probe dialog

This commit is contained in:
David Carley
2022-07-16 19:18:58 -07:00
parent 9fa83d30c0
commit f6e17c656f
2 changed files with 27 additions and 29 deletions

View File

@@ -11,6 +11,7 @@
type Option = { type Option = {
value: number; value: number;
label: string;
metric: boolean; metric: boolean;
}; };
@@ -65,10 +66,7 @@
<List> <List>
{#each options as option} {#each options as option}
<Item on:SMUI:action={() => onOptionSelected(option)}> <Item on:SMUI:action={() => onOptionSelected(option)}>
<Text> <Text>{option.label}</Text>
{option.value}
{option.metric ? "mm" : "in"}
</Text>
</Item> </Item>
{/each} {/each}
</List> </List>
@@ -76,12 +74,11 @@
</div> </div>
<style lang="scss"> <style lang="scss">
:global {
.value-and-unit { .value-and-unit {
display: flex; display: flex;
column-gap: 10px; column-gap: 10px;
}
:global {
.mdc-select { .mdc-select {
max-width: 60px; max-width: 60px;
} }
@@ -90,4 +87,5 @@
margin-left: 0; margin-left: 0;
} }
} }
}
</style> </style>

View File

@@ -63,21 +63,21 @@
import { Config } from "$lib/ConfigStore"; import { Config } from "$lib/ConfigStore";
const cutterDiameterOptions = [ const cutterDiameterOptions = [
{ value: 0.5, metric: false }, { value: 0.5, label: '1/2 "', metric: false },
{ value: 10, metric: true }, { value: 0.25, label: '1/4 "', metric: false },
{ value: 0.25, metric: false }, { value: 0.125, label: '1/8 "', metric: false },
{ value: 6, metric: true }, { value: 10, label: "10 mm", metric: true },
{ value: 0.125, metric: false }, { value: 6, label: "6 mm", metric: true },
{ value: 3, metric: true }, { value: 3, label: "10 mm", metric: true },
]; ];
const cutterLengthOptions = [ const cutterLengthOptions = [
{ value: 1, metric: false }, { value: 1, label: '1 "', metric: false },
{ value: 20, metric: true }, { value: 0.5, label: '1/2 "', metric: false },
{ value: 0.5, metric: false }, { value: 0.25, label: '1/4 "', metric: false },
{ value: 10, metric: true }, { value: 20, label: "20 mm", metric: true },
{ value: 0.25, metric: false }, { value: 10, label: "10 mm", metric: true },
{ value: 6, metric: true }, { value: 6, label: "6 mm", metric: true },
]; ];
export let open; export let open;
@@ -132,8 +132,8 @@
if (probeType === "xyz") { if (probeType === "xyz") {
await stepCompleted("BitDimensions", userAcknowledged); await stepCompleted("BitDimensions", userAcknowledged);
localStorage.setItem("cutterDiameter", cutterDiameter); localStorage.setItem("cutterDiameter", cutterDiameter.toString());
localStorage.setItem("cutterLength", cutterLength); localStorage.setItem("cutterLength", cutterLength.toString());
} }
await stepCompleted("PlaceProbeBlock", userAcknowledged); await stepCompleted("PlaceProbeBlock", userAcknowledged);