From 86bbcdf3fbd5b74f0b9daf25197043d950e070d6 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 9 Jan 2019 20:07:19 -0500 Subject: [PATCH] fixes #52 in theory. this code needs to be updated --- js/kiri-driver-cam.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js index de03fa2b..a839e6b2 100644 --- a/js/kiri-driver-cam.js +++ b/js/kiri-driver-cam.js @@ -276,7 +276,7 @@ var gs_kiri_cam = exports; forced.appendAll(mid); forced.sort(function(s1, s2) { return s2.z - s1.z; }); // drop first/top slice (because it's not an actual cut) - forced = forced.slice(1); + //forced = forced.slice(1); forced.forEach(function(slice) { emit(slice); }); @@ -921,7 +921,7 @@ var gs_kiri_cam = exports; widgetCount = widgetArray.length, widget = widgetArray[widgetIndex]; - if (widgetIndex >= widgetCount || !widget || !widget.getCamBounds) return; + if (widgetIndex >= widgetCount || !widget) return; var slices = widget.slices, bounds = widget.getCamBounds(settings), @@ -1370,6 +1370,8 @@ var gs_kiri_cam = exports; * @returns {Array} gcode lines */ function printExport(print, online) { + var widget = print.widgets[0]; + if (!widget) return; var i, @@ -1387,7 +1389,6 @@ var gs_kiri_cam = exports; cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ], cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ], cmdDwell = gcodes.gcodeDwell || [ "G4 P{time}" ], - widget = print.widgets[0], bounds = widget.getCamBounds(settings), bed = settings.device, spro = settings.process,