From d898a2344959e4ec66dd79c39dcfb3a785c16046 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 20 Jan 2023 15:11:56 -0500 Subject: [PATCH] clarify step over tool tip. fix rare surface on null ptr --- src/kiri-mode/cam/client.js | 2 +- web/kiri/lang/en.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 5d1a60cd..5e66d09e 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -891,7 +891,7 @@ CAM.init = function(kiri, api) { }; }; func.surfaceDone = () => { - if (!surfaceOn) { + if (!(surfaceOn && poppedRec && poppedRec.surfaces)) { return; } let surfaces = poppedRec.surfaces; diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 46aecbe5..d24f3da3 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -443,7 +443,7 @@ self.kiri.lang['en-us'] = { cc_spnd_s: "spindle rpm", cc_spnd_l: ["spindle speed in","revolutions / minute"], cc_sovr_s: "step over", - cc_sovr_l: ["a fraction of tool diameter between 0 and 1. values greater than 0.49 may result in uncut areas from acute angle offsets or undesirable artifacts when contouring."], + cc_sovr_l: ["a fraction of tool diameter between 0 and 1. values greater than 0.49 may result in uncut areas or undesirable artifacts."], cc_sdwn_s: "step down", cc_sdwn_l: ["step down depth","for each pass","in workspace units","0 to disable"], cc_thru_s: "cut thru",