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

finish selection buttons

Browse source
This commit is contained in:
bakedpotatolord 2025-04-25 19:54:57 -06:00
commit 654092b18c
2 changed files with 43 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

120
src/kiri-mode/cam/client.js
View file

@ -1029,6 +1029,7 @@ CAM.init = function(kiri, api) {
} }
}); });
widget.adds.appendAll(stack.new_meshes); widget.adds.appendAll(stack.new_meshes);
console.log(widget)
}); });
}); });
// ensure appropriate traces are toggled matching current record // ensure appropriate traces are toggled matching current record
@ -1072,6 +1073,7 @@ CAM.init = function(kiri, api) {
func.tabDone(); func.tabDone();
func.traceDone(); func.traceDone();
func.surfaceDone(); func.surfaceDone();
func.selectHolesDone();
}; };
api.event.on("cam.trace.clear", func.traceClear = () => { api.event.on("cam.trace.clear", func.traceClear = () => {
func.traceDone(); func.traceDone();
@ -1161,8 +1163,8 @@ CAM.init = function(kiri, api) {
let holeSelOn = false, lastSelHoles; let holeSelOn = false, lastSelHoles;
func.selectHoles = async function(all){ func.selectHoles = async function(individual){
console.log("client all selected",all) console.log("client individual selected",individual)
if (holeSelOn) { if (holeSelOn) {
return func.selectHolesDone(); return func.selectHolesDone();
} }
@ -1179,17 +1181,12 @@ CAM.init = function(kiri, api) {
const {tool,mark} = poppedRec const {tool,mark} = poppedRec
let diam = new CAM.Tool(settings,tool).fluteDiameter() let diam = new CAM.Tool(settings,tool).fluteDiameter()
await CAM.holes(all?0:diam,(centers)=>{ await CAM.holes(individual?0:diam,(centers)=>{
console.log("centers",centers) console.log("centers",centers)
//flattened list of all hole centers and if they are selected //flattened list of all hole centers and if they are selected
kiri.api.widgets.for(widget => { kiri.api.widgets.for(widget => {
console.log(widget)
const {holes} = centers.find(center=>center.id = widget.id) const {holes} = centers.find(center=>center.id = widget.id)
widget.holes = holes; widget.holes = holes;
// console.log("holes",holes)
api.hide.alert(alert); api.hide.alert(alert);
alert = api.show.alert("[esc] cancels trace editing"); alert = api.show.alert("[esc] cancels trace editing");
kiri.api.widgets.opacity(0.8); kiri.api.widgets.opacity(0.8);
@ -1197,91 +1194,33 @@ CAM.init = function(kiri, api) {
if (!holes.length) { if (!holes.length) {
unselectHoles(holes); unselectHoles(holes);
} }
let layers = new kiri.Layers();
holes.forEach(hole => { holes.forEach(hole => {
if(!hole.mesh){
let {depth,selected} = hole
let color = selected ? 0xFF0000:0x39e366
let geo = new THREE.CylinderGeometry(diam/2,diam/2,depth,20);
const material = new THREE.MeshBasicMaterial( { color } );
let mesh = new THREE.Mesh(geo, material);
mesh.position.copy(hole)
mesh.position.z -= depth/2
mesh.rotation.x = Math.PI/2
let circlePoly = new Polygon().centerCircle(hole,diam/2,20,true) hole.mesh = mesh;
let mesh = circlePoly.extrude(500) hole.updateColor = ()=>{
hole.mesh.material.color.set(hole.selected?0xFF0000:0x39e366)
let meshPolys = []
for(let i =0;i<mesh.length;){
meshPolys.push(new Polygon(
{
x: mesh[i++],
y: mesh[i++],
z: mesh[i++]
},
{
x: mesh[i++],
y: mesh[i++],
z: mesh[i++]
},
{
x: mesh[i++],
y: mesh[i++],
z: mesh[i++]
}
))
}
hole.meshPolys = meshPolys
// console.log(meshPolys)
layers.setLayer("holes", {line: 0x000055, fat:4, order:-10}, false).addAreas(meshPolys);
// mesh.position.copy(hole);
})
let stack = new kiri.Stack(widget.mesh);
widget.hole_stack = stack;
widget.holes.forEach(poly => {
stack.addLayers(layers);
stack.new_meshes.forEach(mesh => {
mesh.trace = {widget, poly};
// ensure trace poly singleton from matches
if (match.length > 0) {
poly._trace = match[0];
} else {
poly._trace = poly.toArray();
} }
}); }else{
widget.adds.appendAll(stack.new_meshes); hole.updateColor()
}
})
widget.holes.forEach(hole => {
widget.mesh.add(hole.mesh);
}); });
console.log("hole widget:",widget)
}) })
//START COPYPASTA
// ensure appropriate traces are toggled matching current record
// kiri.api.widgets.for(widget => {
// let areas = (poppedRec.areas[widget.id] || []);
// let stack = widget.trace_stack;
// stack.meshes.forEach(mesh => {
// let { poly } = mesh.trace;
// let match = areas.filter(arr => poly.matches(arr));
// if (match.length > 0) {
// if (!mesh.selected) {
// func.traceToggle(mesh, true);
// }
// } else if (mesh.selected) {
// func.traceToggle(mesh, true);
// }
// });
// });
//END COPYPASTA
}); });
} }
func.selectHolesHover = function(data) { func.selectHolesHover = function(data) {
} }
@ -1300,9 +1239,10 @@ CAM.init = function(kiri, api) {
api.feature.hover = false; api.feature.hover = false;
api.feature.hoverAdds = false; api.feature.hoverAdds = false;
kiri.api.widgets.for(widget => { kiri.api.widgets.for(widget => {
if (widget.trace_stack) { if (widget.holes) {
widget.trace_stack.hide(); widget.holes.forEach(hole => {
widget.adds.removeAll(widget.trace_stack.meshes); widget.mesh.remove(hole.mesh);
})
} }
}); });
}; };
@ -1750,8 +1690,8 @@ CAM.init = function(kiri, api) {
thru: UC.newInput(LANG.cd_drlthru_s, {title:LANG.cd_drlthru_l, convert:UC.toFloat, units:true}), thru: UC.newInput(LANG.cd_drlthru_s, {title:LANG.cd_drlthru_l, convert:UC.toFloat, units:true}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
actions: UC.newRow([ actions: UC.newRow([
UC.newButton(LANG.cd_select_s, ()=>func.selectHoles(false), {title:LANG.cd_select_l}), UC.newButton(LANG.cd_select_s, ()=>func.selectHoles(true), {title:LANG.cd_select_l}),
UC.newButton(LANG.cd_selall_s, ()=>func.selectHoles(true), {title:LANG.cd_selall_l}) UC.newButton(LANG.cd_selall_s, ()=>func.selectHoles(false), {title:LANG.cd_selall_l})
], {class:"ext-buttons f-col"}) ], {class:"ext-buttons f-col"})
}; };

18
src/kiri-mode/cam/slice.js
View file

@ -465,7 +465,7 @@ CAM.holes = async function(settings, widget, diam) {
areaDelta = area * 0.05, areaDelta = area * 0.05,
drills = [], drills = [],
slices = [], slices = [],
selectall = (diam <= 0); individual = (diam <= 0);
function onEach(slice) { function onEach(slice) {
slices.push(slice); slices.push(slice);
@ -483,8 +483,8 @@ CAM.holes = async function(settings, widget, diam) {
for (let poly of inner) { for (let poly of inner) {
let center = poly.calcCircleCenter(); let center = poly.calcCircleCenter();
center.selected = (selectall || (poly.circularity() >= 0.985 && Math.abs(poly.area() - area) <= areaDelta )); center.selected = (!individual && poly.circularity() >= 0.985 && Math.abs(poly.area() - area) <= areaDelta );
// center.points = poly.points; // center.points = poly.points;
if (center.isInPolygon(slice.shadow)) { if (center.isInPolygon(slice.shadow)) {
//TODO: test if this is working //TODO: test if this is working
@ -496,16 +496,24 @@ CAM.holes = async function(settings, widget, diam) {
if (dist <= centerDiff) { // too close if (dist <= centerDiff) { // too close
// console.log("overlap",center,drill); // console.log("overlap",center,drill);
if(center.z > drill.z) { //if current is higher than old if(center.z > drill.z) { //if current is higher than old
drills[i] = center; drills[i] = center; //replace with top point
drills[i].depth = center.z-drill.z
}else if(center.z <= drill.z-drill.depth){// if current is lower or same as old
drills[i].depth = drill.z-center.z
} }
// otherwise, don't add and continue // if overlapping, don't add and continue
overlap = true; overlap = true;
continue; continue;
} }
} }
center.depth = 0;
if(!overlap) drills.push(center); if(!overlap) drills.push(center);
} }
} }
drills = drills.filter(drill => drill.depth > 0)
.sort((a,b) => a.z - b.z)
widget.holes = drills; widget.holes = drills;
return drills; return drills;
} }