From 5d8ad94a5db71a6de9de5b97cfaa75d780137ff2 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 17 Aug 2021 11:09:51 -0400 Subject: [PATCH] fixes #186 round bed slicing --- src/kiri/init.js | 6 +++--- src/kiri/main.js | 4 ++-- src/mode/fdm/export.js | 2 +- src/mode/laser/driver.js | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 8ef6e41b..df506147 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -542,7 +542,7 @@ return; } let current = settings(), - center = current.process.outputOriginCenter, + center = current.process.outputOriginCenter || current.device.bedRound, bounds = boundsSelection(), coord = prompt("Enter X,Y coordinates for selection").split(','), x = parseFloat(coord[0] || 0.0), @@ -722,7 +722,7 @@ UI.deviceName.value = devicename; UI.deviceBelt.checked = dev.bedBelt; UI.deviceRound.checked = dev.bedRound; - UI.deviceOrigin.checked = dev.outputOriginCenter || dev.originCenter; + UI.deviceOrigin.checked = dev.outputOriginCenter || dev.originCenter || dev.bedRound; UI.fwRetract.checked = dev.fwRetract; // add extruder selection buttons @@ -1583,7 +1583,7 @@ deviceZMax: UC.newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:UC.toInt, size: 6, modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), fwRetract: UC.newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}), - deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LASER}), + deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LASER, show:() => !UI.deviceRound.checked}), deviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM, trigger:true, show:isNotBelt}), deviceBelt: UC.newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, modes:FDM, trigger:true, show:() => !UI.deviceRound.checked}), diff --git a/src/kiri/main.js b/src/kiri/main.js index 5c282dd8..fd011931 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1611,7 +1611,7 @@ console.log/** Copyright Stewart Allen -- All Rights Reserved */ let stockCenter = stock.center || {}; let hasStock = stock.x && stock.y && stock.z; let isBelt = dev.bedBelt; - let center = MODE === MODES.FDM ? dev.originCenter : + let center = MODE === MODES.FDM ? dev.originCenter || dev.bedRound : MODE === MODES.SLA ? false : MODE === MODES.CAM ? proc.outputOriginCenter : dev.originCenter || proc.outputOriginCenter; @@ -2309,7 +2309,7 @@ console.log/** Copyright Stewart Allen -- All Rights Reserved */ settings.sproc[mode][settings.process.processName] = settings.process; settings.device.bedBelt = UI.deviceBelt.checked; settings.device.bedRound = UI.deviceRound.checked; - settings.device.originCenter = UI.deviceOrigin.checked; + settings.device.originCenter = UI.deviceOrigin.checked || UI.deviceRound.checked; settings.device.fwRetract = UI.fwRetract.checked; SDB.setItem('ws-settings', JSON.stringify(settings)); API.event.emit('settings.saved', settings); diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js index 8edc948e..6a1ac588 100644 --- a/src/mode/fdm/export.js +++ b/src/mode/fdm/export.js @@ -71,7 +71,7 @@ arcRes = 20, arcDev = 0.5, arcMax = 40, - originCenter = process.outputOriginCenter, + originCenter = process.outputOriginCenter || device.bedRound, offset = originCenter ? null : { x: device.bedWidth/2, y: isBelt ? 0 : device.bedDepth/2 diff --git a/src/mode/laser/driver.js b/src/mode/laser/driver.js index 10fb3196..76ced0d9 100644 --- a/src/mode/laser/driver.js +++ b/src/mode/laser/driver.js @@ -191,7 +191,6 @@ newpts.push( tmp.clone().move({x:knifeTipOff, y:0, z: 0}) ); poly.open = true; poly.points = newpts; - poly.length = newpts.length; } // find max layers (for updates)