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

prevent tabs from hover detection in tracing. heal open segments that share endpoints after tab cuts

Browse source
This commit is contained in:
Stewart Allen 2020-12-02 18:05:31 -05:00
commit bd38764083
3 changed files with 47 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/print.js
View file

@ -833,7 +833,7 @@
} }
return; return;
} }
let area = poly.area(); let area = poly.open ? 1 : poly.area();
poly.forEachPoint(function(point, index) { poly.forEachPoint(function(point, index) {
dist = opt.weight ? dist = opt.weight ?
startPoint.distTo3D(point) * area * area : startPoint.distTo3D(point) * area * area :

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

@ -320,6 +320,9 @@
lastTrace = null; lastTrace = null;
return; return;
} }
if (!data.int.object.trace) {
return;
}
lastTrace = data.int.object; lastTrace = data.int.object;
if (lastTrace.selected) { if (lastTrace.selected) {
let event = data.event; let event = data.event;

44
src/mode/cam/slice.js
View file

@ -45,7 +45,6 @@
procContour = procContourX || procContourY, procContour = procContourX || procContourY,
procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed, procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed,
procDrillReg = proc.camDrillReg, procDrillReg = proc.camDrillReg,
// procTrace = proc.camTraceOn,
roughDown = procRough ? proc.camRoughDown : Infinity, roughDown = procRough ? proc.camRoughDown : Infinity,
outlineDown = procOutline ? proc.camOutlineDown : Infinity, outlineDown = procOutline ? proc.camOutlineDown : Infinity,
sliceDepth = Math.max(0.1, Math.min(roughDown, outlineDown) / 3), sliceDepth = Math.max(0.1, Math.min(roughDown, outlineDown) / 3),
@ -738,6 +737,49 @@
let noff = []; let noff = [];
tabs = tabs.filter(tab => z < tab.pos.z + tab.dim.z/2).map(tab => tab.off).flat(); tabs = tabs.filter(tab => z < tab.pos.z + tab.dim.z/2).map(tab => tab.off).flat();
offset.forEach(op => noff.appendAll( op.cut(POLY.union(tabs)) )); offset.forEach(op => noff.appendAll( op.cut(POLY.union(tabs)) ));
if (noff.length > 1) {
let heal = 0;
// heal/rejoin open segments that share endpoints
outer: for(;; heal++) {
let ntmp = noff, tlen = ntmp.length;
for (let i=0; i<tlen; i++) {
let s1 = ntmp[i];
if (!s1) continue;
for (let j=i+1; j<tlen; j++) {
let s2 = ntmp[j];
if (!s2) continue;
if (!(s1.open && s2.open)) continue;
if (s1.last().isMergable2D(s2.first())) {
s1.addPoints(s2.points.slice(1));
ntmp[j] = null;
continue outer;
}
if (s2.last().isMergable2D(s1.first())) {
s2.addPoints(s1.points.slice(1));
ntmp[i] = null;
continue outer;
}
if (s1.first().isMergable2D(s2.first())) {
s1.reverse();
s1.addPoints(s2.points.slice(1));
ntmp[j] = null;
continue outer;
}
if (s1.last().isMergable2D(s2.last())) {
s2.reverse();
s1.addPoints(s2.points.slice(1));
ntmp[j] = null;
continue outer;
}
}
}
break;
}
if (heal > 0) {
// cull nulls
noff = noff.filter(o => o);
}
}
return noff; return noff;
} }