probing dialog fix
This commit is contained in:
@@ -139,7 +139,7 @@
|
|||||||
|
|
||||||
steps = [
|
steps = [
|
||||||
enableSafety && !isRotaryActive ? "CheckProbe" : undefined,
|
enableSafety && !isRotaryActive ? "CheckProbe" : undefined,
|
||||||
probeType === "xyz" || isRotaryActive ? "BitDimensions" : undefined,
|
probeType === "xyz" ? "BitDimensions" : undefined,
|
||||||
enableSafety ? "PlaceProbeBlock" : undefined,
|
enableSafety ? "PlaceProbeBlock" : undefined,
|
||||||
"Probe",
|
"Probe",
|
||||||
"Done",
|
"Done",
|
||||||
@@ -150,26 +150,26 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (probeType === "xyz") {
|
if (probeType === "xyz") {
|
||||||
await stepCompleted("BitDimensions", userAcknowledged);
|
|
||||||
localStorage.setItem(
|
|
||||||
"cutterDiameter",
|
|
||||||
numberWithUnit.normalize(cutterDiameterString)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isRotaryActive){
|
if(isRotaryActive){
|
||||||
await stepCompleted("BitDimensions", userAcknowledged);
|
await stepCompleted("BitDimensions", userAcknowledged);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
"cutterDiameterRotary",
|
"cutterDiameterRotary",
|
||||||
numberWithUnit.normalize(cutterDiameterRotaryString)
|
numberWithUnit.normalize(cutterDiameterRotaryString)
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
await stepCompleted("BitDimensions", userAcknowledged);
|
||||||
|
localStorage.setItem(
|
||||||
|
"cutterDiameter",
|
||||||
|
numberWithUnit.normalize(cutterDiameterString)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await stepCompleted("PlaceProbeBlock", userAcknowledged);
|
await stepCompleted("PlaceProbeBlock", userAcknowledged);
|
||||||
await stepCompleted("Probe", probingComplete, probingFailed);
|
await stepCompleted("Probe", probingComplete, probingFailed);
|
||||||
await stepCompleted("Done", userAcknowledged);
|
await stepCompleted("Done", userAcknowledged);
|
||||||
|
|
||||||
if (probeType === "xyz" || isRotaryActive) {
|
if (probeType === "xyz" && !isRotaryActive) {
|
||||||
ControllerMethods.gotoZero("xy");
|
ControllerMethods.gotoZero("xy");
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
@@ -250,7 +250,7 @@
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case "BitDimensions":
|
case "BitDimensions":
|
||||||
nextButton.disabled = probeType === 'xyz' ? !isFinite(cutterDiameterMetric) : !isFinite(cutterDiameterRotaryMetric);
|
nextButton.disabled = isRotaryActive ? !isFinite(cutterDiameterRotaryMetric) : !isFinite(cutterDiameterMetric);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "Done":
|
case "Done":
|
||||||
@@ -412,7 +412,7 @@
|
|||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
{:else if currentStep === "BitDimensions"}
|
{:else if currentStep === "BitDimensions"}
|
||||||
{#if probeType === "xyz"}
|
{#if !isRotaryActive}
|
||||||
<TextFieldWithOptions
|
<TextFieldWithOptions
|
||||||
label="Cutter diameter"
|
label="Cutter diameter"
|
||||||
variant="filled"
|
variant="filled"
|
||||||
|
|||||||
Reference in New Issue
Block a user