From 0d103cd3daa02bbb1283a3d69853de809e96447c Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 27 Mar 2023 15:20:51 -0400 Subject: [PATCH] replace throw with return error --- src/kiri-mode/cam/slice.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/kiri-mode/cam/slice.js b/src/kiri-mode/cam/slice.js index 457d43ac..cd075ba7 100644 --- a/src/kiri-mode/cam/slice.js +++ b/src/kiri-mode/cam/slice.js @@ -80,30 +80,34 @@ CAM.slice = async function(settings, widget, onupdate, ondone) { }); } + function error(msg) { + ondone(msg); + } + if (unsafe) { console.log("disabling overhang safeties"); } if (!proc.ops || proc.ops.length === 0) { - throw 'no processes specified'; + return error('no processes specified'); } if (stock.x && stock.y && stock.z) { if (stock.x + 0.00001 < bounds.max.x - bounds.min.x) { - throw 'stock X too small for part. resize stock or use offset stock'; + return error('stock X too small for part. resize stock or use offset stock'); } if (stock.y + 0.00001 < bounds.max.y - bounds.min.y) { - throw 'stock Y too small for part. resize stock or use offset stock'; + return error('stock Y too small for part. resize stock or use offset stock'); } if (stock.z + 0.00001 < bounds.max.z - bounds.min.z) { - throw 'stock Z too small for part. resize stock or use offset stock'; + return error('stock Z too small for part. resize stock or use offset stock'); } } if (zMin >= bounds.max.z) { - throw `invalid z bottom ${(zMin/units).round(3)} >= bounds z max ${(zMax/units).round(3)}`; + return error(`invalid z bottom ${(zMin/units).round(3)} >= bounds z max ${(zMax/units).round(3)}`); } let mark = Date.now();