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

fix tool / id in op register

Browse source
This commit is contained in:
Stewart Allen 2021-01-13 18:07:28 -05:00
commit 4c2752ef54
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mode/cam/client.js
View file

@ -942,7 +942,7 @@
for (let [key, val] of Object.entries(op.inputs)) { for (let [key, val] of Object.entries(op.inputs)) {
let type = val.type; let type = val.type;
let from = map[key]; let from = map[key];
if (!rec[key] && type && from) { if (rec[key] === undefined && type && from) {
let newval = current.process[from]; let newval = current.process[from];
rec[key] = current.process[from]; rec[key] = current.process[from];
} }

4
src/mode/cam/ops.js
View file

@ -980,7 +980,7 @@
}); });
poly.points.pop(); poly.points.pop();
poly.length--; poly.length--;
slice.camTrace = { tool, rate: op.feed, plunge: op.rate }; slice.camTrace = { tool: tool.getID(), rate: op.feed, plunge: op.rate };
slice.camLines = [ poly ]; slice.camLines = [ poly ];
slice.output() slice.output()
.setLayer("register", {line: 0xaa00aa}, false) .setLayer("register", {line: 0xaa00aa}, false)
@ -1011,7 +1011,7 @@
let { setTool, setSpindle, setDrill, emitDrills } = ops; let { setTool, setSpindle, setDrill, emitDrills } = ops;
if (op.axis === '-') { if (op.axis === '-') {
setTool(op.tool, undefined, op.rate); setTool(op.tool, op.feed, op.rate);
setSpindle(op.spindle); setSpindle(op.spindle);
for (let slice of this.sliceOut) { for (let slice of this.sliceOut) {
ops.emitTrace(slice); ops.emitTrace(slice);