AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #186 round bed slicing

Browse source
This commit is contained in:
Stewart Allen 2021-08-17 11:09:51 -04:00
commit 5d8ad94a5d
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/kiri/init.js
View file

@ -542,7 +542,7 @@
return; return;
} }
let current = settings(), let current = settings(),
center = current.process.outputOriginCenter, center = current.process.outputOriginCenter || current.device.bedRound,
bounds = boundsSelection(), bounds = boundsSelection(),
coord = prompt("Enter X,Y coordinates for selection").split(','), coord = prompt("Enter X,Y coordinates for selection").split(','),
x = parseFloat(coord[0] || 0.0), x = parseFloat(coord[0] || 0.0),
@ -722,7 +722,7 @@
UI.deviceName.value = devicename; UI.deviceName.value = devicename;
UI.deviceBelt.checked = dev.bedBelt; UI.deviceBelt.checked = dev.bedBelt;
UI.deviceRound.checked = dev.bedRound; 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; UI.fwRetract.checked = dev.fwRetract;
// add extruder selection buttons // 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}), 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}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
fwRetract: UC.newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, 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}), 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}), deviceBelt: UC.newBoolean(LANG.dv_belt_s, onBooleanClick, {title:LANG.dv_belt_l, modes:FDM, trigger:true, show:() => !UI.deviceRound.checked}),

4
src/kiri/main.js
View file

@ -1611,7 +1611,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
let stockCenter = stock.center || {}; let stockCenter = stock.center || {};
let hasStock = stock.x && stock.y && stock.z; let hasStock = stock.x && stock.y && stock.z;
let isBelt = dev.bedBelt; 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.SLA ? false :
MODE === MODES.CAM ? proc.outputOriginCenter : MODE === MODES.CAM ? proc.outputOriginCenter :
dev.originCenter || proc.outputOriginCenter; dev.originCenter || proc.outputOriginCenter;
@ -2309,7 +2309,7 @@ console.log/** Copyright Stewart Allen <sa@grid.space> -- All Rights Reserved */
settings.sproc[mode][settings.process.processName] = settings.process; settings.sproc[mode][settings.process.processName] = settings.process;
settings.device.bedBelt = UI.deviceBelt.checked; settings.device.bedBelt = UI.deviceBelt.checked;
settings.device.bedRound = UI.deviceRound.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; settings.device.fwRetract = UI.fwRetract.checked;
SDB.setItem('ws-settings', JSON.stringify(settings)); SDB.setItem('ws-settings', JSON.stringify(settings));
API.event.emit('settings.saved', settings); API.event.emit('settings.saved', settings);

2
src/mode/fdm/export.js
View file

@ -71,7 +71,7 @@
arcRes = 20, arcRes = 20,
arcDev = 0.5, arcDev = 0.5,
arcMax = 40, arcMax = 40,
originCenter = process.outputOriginCenter, originCenter = process.outputOriginCenter || device.bedRound,
offset = originCenter ? null : { offset = originCenter ? null : {
x: device.bedWidth/2, x: device.bedWidth/2,
y: isBelt ? 0 : device.bedDepth/2 y: isBelt ? 0 : device.bedDepth/2

1
src/mode/laser/driver.js
View file

@ -191,7 +191,6 @@
newpts.push( tmp.clone().move({x:knifeTipOff, y:0, z: 0}) ); newpts.push( tmp.clone().move({x:knifeTipOff, y:0, z: 0}) );
poly.open = true; poly.open = true;
poly.points = newpts; poly.points = newpts;
poly.length = newpts.length;
} }
// find max layers (for updates) // find max layers (for updates)