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

update (fix?) laser DXF output format. fix layer grouping option

Browse source
This commit is contained in:
Stewart Allen 2024-06-08 15:18:19 -07:00
commit 5797f4fb2a
3 changed files with 75 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

124
src/kiri-mode/laser/driver.js
View file

@ -11,7 +11,6 @@ gapp.register("kiri-mode.laser.driver", [], (root, exports) => {
const { base, kiri } = root; const { base, kiri } = root;
const { driver, newSlice } = kiri; const { driver, newSlice } = kiri;
const { FDM, CAM } = driver;
const { polygons, newPoint } = base; const { polygons, newPoint } = base;
const POLY = polygons; const POLY = polygons;
@ -26,7 +25,7 @@ const LASER = driver.LASER = {
}; };
function init(kiri, api) { function init(kiri, api) {
api.event.on("settings.saved", (settings) => { api.event.on("settings.saved", settings => {
let ui = kiri.api.ui; let ui = kiri.api.ui;
}); });
} }
@ -89,7 +88,7 @@ function slice(settings, widget, onupdate, ondone) {
onupdate(v); onupdate(v);
} }
}).then(output => { }).then(output => {
let slices = widget.slices = output.slices.map(data => { widget.slices = output.slices.map(data => {
let { z, lines, groups } = data; let { z, lines, groups } = data;
let tops = POLY.nest(groups); let tops = POLY.nest(groups);
let slice = newSlice(z).addTops(tops); let slice = newSlice(z).addTops(tops);
@ -111,24 +110,21 @@ function polyLabel(poly, label) {
function sliceEmitObjects(print, slice, groups, opt = { }) { function sliceEmitObjects(print, slice, groups, opt = { }) {
let start = newPoint(0,0,0); let start = newPoint(0,0,0);
let process = print.settings.process; let process = print.settings.process;
let grouped = process.outputLaserGroup;
let stacked = process.outputLaserStack; let stacked = process.outputLaserStack;
let grouped = stacked || process.outputLaserGroup;
let label = false && process.outputLaserLabel; let label = false && process.outputLaserLabel;
let simple = opt.simple || false; let simple = opt.simple || false;
let group = [];
let emit = { in: [], out: [], mark: [] }; let emit = { in: [], out: [], mark: [] };
let lastEmit = opt.lastEmit; let lastEmit = opt.lastEmit;
let zcolor = print.settings.process.outputLaserZColor; let zcolor = print.settings.process.outputLaserZColor;
group.thick = slice.thick; function laserOut(poly, group, type, indexed) {
function laserOut(poly, group, type, index) {
if (!poly) { if (!poly) {
return; return;
} }
if (Array.isArray(poly)) { if (Array.isArray(poly)) {
poly.forEach((pi, index) => { poly.forEach((pi, index) => {
laserOut(pi, group, type, offset.length > 1 ? index : undefined); laserOut(pi, group, type, indexed ? index : undefined);
}); });
} else { } else {
let pathOpt = zcolor ? {extrude: slice.z, rate: slice.z} : {extrude: 1, rate: 1}; let pathOpt = zcolor ? {extrude: slice.z, rate: slice.z} : {extrude: 1, rate: 1};
@ -153,21 +149,23 @@ function sliceEmitObjects(print, slice, groups, opt = { }) {
} }
} }
let offset = slice.offset;
let inner = offset.map(poly => poly.inner || []).flat();
// cut inside before outside
laserOut(inner, group, "in");
laserOut(offset, group, "out");
if (!grouped) {
groups.push(group);
group = [];
group.thick = slice.thick;
}
if (grouped) { if (grouped) {
let group = [];
group.thick = slice.thick;
let offset = slice.offset;
let inner = offset.map(poly => poly.inner || []).flat();
// cut inside before outside
laserOut(inner, group, "in", offset.length > 1);
laserOut(offset, group, "out", offset.length > 1);
groups.push(group); groups.push(group);
} else {
for (let top of slice.offset) {
let group = [];
group.thick = slice.thick;
laserOut([ top ], group, "in");
laserOut(top.inner || [], group, "out");
groups.push(group);
}
} }
return emit; return emit;
@ -184,8 +182,8 @@ async function prepare(widgets, settings, update) {
process = settings.process, process = settings.process,
print = self.worker.print = kiri.newPrint(settings, widgets), print = self.worker.print = kiri.newPrint(settings, widgets),
knifeOn = process.knifeOn, knifeOn = process.knifeOn,
knifeDepth = process.outputKnifeDepth, // knifeDepth = process.outputKnifeDepth,
knifePasses = process.outputKnifePasses, // knifePasses = process.outputKnifePasses,
knifeTipOff = process.outputKnifeTip, knifeTipOff = process.outputKnifeTip,
output = print.output = [], output = print.output = [],
totalSlices = 0, totalSlices = 0,
@ -259,16 +257,16 @@ async function prepare(widgets, settings, update) {
} }
// find max layers (for updates) // find max layers (for updates)
widgets.forEach(function(widget) { widgets.forEach(widget => {
totalSlices += widget.slices.length; totalSlices += widget.slices.length;
}); });
// emit objects from each slice into output array // emit objects from each slice into output array
widgets.forEach(function(widget) { widgets.forEach(widget => {
// slice stack merging // slice stack merging
if (process.outputLaserMerged) { if (process.outputLaserMerged) {
let merged = []; let merged = [];
widget.slices.forEach(function(slice) { widget.slices.forEach(slice => {
let polys = []; let polys = [];
slice.offset.clone(true).forEach(p => p.flattenTo(polys)); slice.offset.clone(true).forEach(p => p.flattenTo(polys));
polys.forEach(p => { polys.forEach(p => {
@ -322,9 +320,9 @@ async function prepare(widgets, settings, update) {
let pack = true; let pack = true;
// compute tile width / height // compute tile width / height
output.forEach(function(layerout) { output.forEach(layerout => {
let min = {w:Infinity, h:Infinity}, max = {w:-Infinity, h:-Infinity}, p; let min = {w:Infinity, h:Infinity}, max = {w:-Infinity, h:-Infinity}, p;
layerout.forEach(function(out) { layerout.forEach(out => {
p = out.point; p = out.point;
out.point = p.clone(); // b/c first/last point are often shared out.point = p.clone(); // b/c first/last point are often shared
min.w = Math.min(min.w, p.x); min.w = Math.min(min.w, p.x);
@ -336,7 +334,7 @@ async function prepare(widgets, settings, update) {
layerout.h = max.h - min.h; layerout.h = max.h - min.h;
// shift objects to top/left of w/h bounds // shift objects to top/left of w/h bounds
if (pack) if (pack)
layerout.forEach(function(out) { layerout.forEach(out => {
p = out.point; p = out.point;
p.x -= min.w; p.x -= min.w;
p.y -= min.h; p.y -= min.h;
@ -622,38 +620,48 @@ function exportDXF(settings, data) {
data, data,
function(min, max) { function(min, max) {
lines.appendAll([ lines.appendAll([
' 0', " 0",
'SECTION', "SECTION",
' 2', " 2",
'HEADER', "HEADER",
' 9', " 0",
'$ACADVER', "ENDSEC",
'1', " 0",
'AC1014', "SECTION",
' 0', " 2",
'ENDSEC', "TABLES",
' 0', " 0",
'SECTION', "ENDSEC",
' 2', " 0",
'ENTITIES', "SECTION",
" 2",
"BLOCKS",
" 0",
"ENDSEC",
" 0",
"SECTION",
" 2",
"ENTITIES",
]); ]);
}, },
function(poly) { function(poly) {
lines.appendAll([ lines.appendAll([
' 0', " 0",
'LWPOLYLINE', "POLYLINE",
'100', // subgroup required " 8",
'AcDbPolyline', "0",
' 90', // poly vertices " 66",
poly.length, "1",
' 70', // open " 70",
'0', "1",
' 43', // constant width line
'0.0'
]); ]);
poly.forEach(function(point) { poly.forEach(point => {
lines.appendAll([ lines.appendAll([
' 0',
'VERTEX',
' 8',
'0',
' 10', ' 10',
point.x, point.x,
' 20', ' 20',
@ -668,6 +676,12 @@ function exportDXF(settings, data) {
}, },
function() { function() {
lines.appendAll([ lines.appendAll([
' 0',
'ENDSEC',
' 0',
'SECTION',
' 2',
'OBJECTS',
' 0', ' 0',
'ENDSEC', 'ENDSEC',
' 0', ' 0',

8
src/kiri/init.js
View file

@ -1691,10 +1691,10 @@ gapp.register("kiri.init", [], (root, exports) => {
extNozzle: newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:toFloat, modes:FDM}), extNozzle: newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:toFloat, modes:FDM}),
extOffsetX: newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:toFloat, modes:FDM}), extOffsetX: newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:toFloat, modes:FDM}),
extOffsetY: newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:toFloat, modes:FDM}), extOffsetY: newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:toFloat, modes:FDM}),
_____: newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:GCODE }), _____: newDiv({ class: "f-col t-body t-inset", addto: $('dev-config'), set:true, modes:FDM_CAM }),
_____: newGroup(LANG.dv_gr_too, null, {group:"dext", inline:true}), _____: newGroup(LANG.dv_gr_too, null, {group:"dext", inline:true}),
extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode, modes:GCODE}), extSelect: newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, size:14, height:3, area:gcode}),
extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode, modes:GCODE}), extDeselect: newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, size:14, height:3, area:gcode}),
extPad: newBlank({class:"grow", modes:FDM}), extPad: newBlank({class:"grow", modes:FDM}),
extActions: newRow([ extActions: newRow([
ui.extPrev = newButton(undefined, undefined, {icon:'<i class="fas fa-less-than"></i>'}), ui.extPrev = newButton(undefined, undefined, {icon:'<i class="fas fa-less-than"></i>'}),
@ -1955,7 +1955,7 @@ gapp.register("kiri.init", [], (root, exports) => {
laserLayout: newGroup(LANG.lo_menu, $('lzr-layout'), { modes:LASER, driven, separator }), laserLayout: newGroup(LANG.lo_menu, $('lzr-layout'), { modes:LASER, driven, separator }),
outputTileSpacing: newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:toInt}), outputTileSpacing: newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:toInt}),
outputLaserMerged: newBoolean(LANG.ou_mrgd_s, onBooleanClick, {title:LANG.ou_mrgd_l}), outputLaserMerged: newBoolean(LANG.ou_mrgd_s, onBooleanClick, {title:LANG.ou_mrgd_l}),
outputLaserGroup: newBoolean(LANG.ou_grpd_s, onBooleanClick, {title:LANG.ou_grpd_l}), outputLaserGroup: newBoolean(LANG.ou_grpd_s, onBooleanClick, {title:LANG.ou_grpd_l, show:() => !ui.outputLaserStack.checked}),
laserOutput: newGroup(LANG.ou_menu, $('lzr-output'), { modes:LASER, driven, separator }), laserOutput: newGroup(LANG.ou_menu, $('lzr-output'), { modes:LASER, driven, separator }),
outputLaserPower: newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:toInt, bound:bound(1,100)}), outputLaserPower: newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:toInt, bound:bound(1,100)}),
outputLaserSpeed: newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:toInt}), outputLaserSpeed: newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:toInt}),

4
web/kiri/lang/en.js
View file

@ -665,8 +665,8 @@ self.kiri.lang['en-us'] = {
ou_layr_l: ["output layer order","from top right to","bottom left"], ou_layr_l: ["output layer order","from top right to","bottom left"],
ou_layo_s: "layer color", ou_layo_s: "layer color",
ou_layo_l: ["output layer colors","for each z index","overridden by merged"], ou_layo_l: ["output layer colors","for each z index","overridden by merged"],
ou_lays_s: "layer stacking", ou_lays_s: "layer marking",
ou_lays_l: ["mark layers for stacking","with a unique color"], ou_lays_l: ["mark layers for stacking. the layer above will be output in a different color which the laser can mark with a lower power. turns on layer grouping."],
ou_drkn_s: "drag knife", ou_drkn_s: "drag knife",
ou_drkn_l: ["enable drag knife","output in gcode","cut radii are added","to corners with","cut down passes"], ou_drkn_l: ["enable drag knife","output in gcode","cut radii are added","to corners with","cut down passes"],