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

code cleanup

Browse source
This commit is contained in:
bakedpotatolord 2025-04-29 12:59:30 -06:00
commit cbbed154fa
3 changed files with 58 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1031,7 +1031,7 @@ CAM.init = function(kiri, api) {
} }
}); });
widget.adds.appendAll(stack.new_meshes); widget.adds.appendAll(stack.new_meshes);
console.log(widget) // console.log(widget)
}); });
}); });
// ensure appropriate traces are toggled matching current record // ensure appropriate traces are toggled matching current record
@ -1165,8 +1165,15 @@ CAM.init = function(kiri, api) {
let holeSelOn = false, lastSelHoles; let holeSelOn = false, lastSelHoles;
/**
* Client side function to select holes in widgets for CAM operations.
* If holes have already been analyzed, they are displayed immediately.
* Otherwise, the CAM server is queried and the results are cached.
* @param {boolean} individual - select all holes, false to only select
* holes of tool diameter.
*/
func.selectHoles = async function(individual){ func.selectHoles = async function(individual){
console.log("client individual selected",individual) // console.log("client individual selected",individual)
if (holeSelOn) { if (holeSelOn) {
return func.selectHolesDone(); return func.selectHolesDone();
} }
@ -1180,16 +1187,19 @@ CAM.init = function(kiri, api) {
func.hoverUp = func.selectHolesHoverUp; func.hoverUp = func.selectHolesHoverUp;
let settings = API.conf.get(); let settings = API.conf.get();
const {tool,mark} = poppedRec const {tool,mark} = poppedRec //TODO: display some visual difference if mark is selected
let diam = new CAM.Tool(settings,tool).fluteDiameter() let diam = new CAM.Tool(settings,tool).fluteDiameter()
api.hide.alert(alert); api.hide.alert(alert);
alert = api.show.alert("[esc] cancels trace editing"); alert = api.show.alert("[esc] cancels drill editing");
kiri.api.widgets.opacity(0.8); kiri.api.widgets.opacity(0.8);
const widgets = kiri.api.widgets.all() const widgets = kiri.api.widgets.all()
console.log(widgets) /**
* creates a mesh for a hole and adds it to a widget
* @param {Object3D} widget - widget to add the hole mesh to
* @param {Object} drill - {depth,selected} object of the hole
* @returns {Mesh} the created mesh
*/
function createHoleMesh(widget,drill){ function createHoleMesh(widget,drill){
let {depth,selected} = drill let {depth,selected} = drill
let color = selected ? 0xFF0000:0x39e366 let color = selected ? 0xFF0000:0x39e366
@ -1199,70 +1209,50 @@ CAM.init = function(kiri, api) {
mesh.position.copy(drill) mesh.position.copy(drill)
mesh.position.z -= depth/2 mesh.position.z -= depth/2
mesh.rotation.x = Math.PI/2 mesh.rotation.x = Math.PI/2
drill.widgetID = widget.id drill.widgetID = widget.id
drill.meshId = mesh.id; //add pointers to both objects drill.meshId = mesh.id; //add pointers to both objects
mesh.hole = drill; mesh.hole = drill;
mesh.parent = widget.mesh; mesh.parent = widget.mesh;
widget.mesh.add(mesh); widget.mesh.add(mesh);
widget.adds.push(mesh); widget.adds.push(mesh); //for click detection
return mesh return mesh
} }
let meshesCached = widgets.every(widget=>poppedRec.drills[widget.id] != undefined) let meshesCached = widgets.every(widget=>poppedRec.drills[widget.id] != undefined)
if( individual && meshesCached ){ // if any widget already has cached holes if( individual && meshesCached ){ // if any widget already has cached holes
console.log("already has cached holes",poppedRec.drills) // console.log("already has cached holes",poppedRec.drills)
kiri.api.widgets.for(widget => { kiri.api.widgets.for(widget => {
if(widget.adds){ if(widget.adds){
let drills = poppedRec.drills[widget.id] let drills = poppedRec.drills[widget.id]
let ids = drills let ids = drills
.map(hole => hole.meshId) .map(hole => hole.meshId)
if(widget.adds.includes(mesh)){ if(widget.adds.includes(mesh)){
widget.adds.forEach(add=>{ widget.adds.forEach(add=>{
if(ids.includes(add.id)){ if(ids.includes(add.id)){
add.visible = true add.visible = true
} }
}) })
}else{ }else{
drills.forEach(drill => { drills.forEach(drill => {
createHoleMesh(widget, drill) createHoleMesh(widget, drill)
}) })
} }
} }
}) })
}else{ // if no widget has cached holes }else{ // if no widget has cached holes
await CAM.holes(individual?0:diam,(centers)=>{ await CAM.holes(individual?0:diam,(centers)=>{
centers = centers ?? [] 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 => {
const {holes} = centers.find(center=>center.id = widget.id) const {holes} = centers.find(center=>center.id = widget.id)
if (!holes.length) unselectHoles(holes);
if (!holes.length) {
unselectHoles(holes);
}
holes.forEach(hole => { holes.forEach(hole => {
createHoleMesh(widget, hole) createHoleMesh(widget, hole)
}) })
//add hole data to record //add hole data to record
poppedRec.drills = poppedRec.drills ?? {} poppedRec.drills = poppedRec.drills ?? {}
poppedRec.drills[widget.id] = holes poppedRec.drills[widget.id] = holes
//give widget access to an array of drill records that refrence it //give widget access to an array of drill records that refrence it
//so that it can be cleared when widget is rotated or mirrored etc. //so that it can be cleared when widget is rotated or mirrored etc.
if(!widget.drills){widget.drills = []} if(!widget.drills){widget.drills = []}
@ -1273,8 +1263,7 @@ CAM.init = function(kiri, api) {
} }
func.selectHolesHover = function(data) { func.selectHolesHover = function(data) {
//not used right now. may be useful in the future
if (lastTrace) { if (lastTrace) {
let { color, colorSave } = lastTrace.material[0] || lastTrace.material; let { color, colorSave } = lastTrace.material[0] || lastTrace.material;
color.r = colorSave.r; color.r = colorSave.r;
@ -1286,26 +1275,6 @@ CAM.init = function(kiri, api) {
lastTrace = null; lastTrace = null;
return; return;
} }
// console.log("selectHolesHover",data)
// if (!data.int.object.trace) {
// return;
// }
// lastTrace = data.int.object;
// lastTrace.position.z += 0.01;
// if (lastTrace.selected) {
// let event = data.event;
// let target = event.target;
// let { clientX, clientY } = event;
// let { offsetWidth, offsetHeight } = target;
// }
// let material = lastTrace.material[0] || lastTrace.material;
// let color = material.color;
// let {r, g, b} = color;
// material.colorSave = {r, g, b};
// color.r = 0;
// color.g = 0;
// color.b = 1;
} }
func.selectHolesHoverUp = function(int, ev) { func.selectHolesHoverUp = function(int, ev) {
@ -1315,25 +1284,41 @@ CAM.init = function(kiri, api) {
} }
/**
* Toggle the selection of a hole mesh and update its color
* @param {Object3D} mesh - the hole mesh to toggle
*/
func.selectHoleToggle = function(mesh) { func.selectHoleToggle = function(mesh) {
let {hole} = mesh let {hole} = mesh
if(!hole) return
hole.selected = !hole.selected; hole.selected = !hole.selected;
mesh.material.color.setHex( hole.selected ? 0xFF0000:0x39e366 ); mesh.material.color.setHex( hole.selected ? 0xFF0000:0x39e366 );
} }
/************* ✨ Codeium Command ⭐ *************/
/**
* Clears the recorded holes in the widget (widget.drills array)
* and also clears the widget.adds array.
* @param {Object} widget - the widget with the drills array to clear
*/
/****** cda042f9-e5b8-4c32-acee-0ec915ea6a0a *******/
func.clearHolesRec = (widget)=>{ func.clearHolesRec = (widget)=>{
console.log("clearHolesRec pre",widget)
if(widget.drills){ if(widget.drills){
widget.drills.forEach(rec=>{ widget.drills.forEach(rec=>{
console.log("rec",rec)
}) })
} }
if(widget.adds){ if(widget.adds){
widget.adds.length = 0 //clear adds array widget.adds.length = 0 //clear adds array
} }
console.log("clearHolesRec post",widget)
} }
/************* ✨ Codeium Command ⭐ *************/
/**
* Cleanup function for selectHoles.
* Removes all adds from the scene, hides the alert, and resets the opacity of the widgets.
* Also resets the hover features and the editing class on the holeSelOn html element.
*/
/****** 3ea6c195-e4a5-434f-98cf-4a587d441305 *******/
func.selectHolesDone = () => { func.selectHolesDone = () => {
if (!holeSelOn) { if (!holeSelOn) {
return; return;
@ -1453,7 +1438,7 @@ CAM.init = function(kiri, api) {
let or = new THREE.Quaternion(_x, _y, _z, _w); let or = new THREE.Quaternion(_x, _y, _z, _w);
let nr = new THREE.Quaternion().setFromEuler(e); let nr = new THREE.Quaternion().setFromEuler(e);
let ra = or.angleTo(nr); let ra = or.angleTo(nr);
console.log({or, nr, ra}); // console.log({or, nr, ra});
rec.rot = nr; rec.rot = nr;
// let m4 = new THREE.Matrix4().makeRotationFromEuler(new THREE.Euler(0,0,e._z)); // let m4 = new THREE.Matrix4().makeRotationFromEuler(new THREE.Euler(0,0,e._z));
// tab.box.geometry.applyMatrix4(m4); // tab.box.geometry.applyMatrix4(m4);
@ -1805,7 +1790,7 @@ 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(true), {title:LANG.cd_select_l}), UC.newButton(LANG.select, ()=>func.selectHoles(true), {title:LANG.cd_select_l}),
UC.newButton(LANG.cd_selall_s, ()=>func.selectHoles(false), {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"})
}; };
@ -1857,7 +1842,7 @@ CAM.init = function(kiri, api) {
} }
api.event.on('tool.mesh.face-normal', normal => { api.event.on('tool.mesh.face-normal', normal => {
console.log({ poppedRec }); // console.log({ poppedRec });
poppedRec.degrees = (Math.atan2(normal.y, normal.z) * RAD2DEG).round(2); poppedRec.degrees = (Math.atan2(normal.y, normal.z) * RAD2DEG).round(2);
poppedRec.absolute = true; poppedRec.absolute = true;
func.opRender(); func.opRender();

1
src/kiri-mode/cam/prepare.js
View file

@ -195,6 +195,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
} }
function emitDrills(polys) { function emitDrills(polys) {
console.log("emitDrills", polys);
polys = polys.slice(); polys = polys.slice();
for (;;) { for (;;) {
let closestDist = Infinity, let closestDist = Infinity,

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

@ -435,6 +435,14 @@ CAM.traces = async function(settings, widget, single) {
return true; return true;
}; };
/**
* Generate a list of holes in the model based on the given diameter.
*
* @param {Object} settings - settings object
* @param {Object} widget - widget object
* @param {number} diam - diameter of the drill bit
* @returns {Array} list of hole centers as objects with `x`, `y`, `z`, `depth`, and `selected` properties.
*/
CAM.holes = async function(settings, widget, diam) { CAM.holes = async function(settings, widget, diam) {
let proc = settings.process, let proc = settings.process,
@ -471,27 +479,21 @@ CAM.holes = async function(settings, widget, diam) {
slices.push(slice); slices.push(slice);
} }
console.log(indices)
let opts = { each: onEach, over: false, flatoff: 0, edges: true, openok: false, lines: false }; let opts = { each: onEach, over: false, flatoff: 0, edges: true, openok: false, lines: false };
await slicer.slice(indices, opts); await slicer.slice(indices, opts);
const tslices = slices.map(s=>s.tops).flat() const tslices = slices.map(s=>s.tops).flat()
console.log("tslices",tslices) // console.log("tslices",tslices)
for (let slice of tslices) { for (let slice of tslices) {
slice.shadow = CAM.shadowAt(widget,slice.z, 0) slice.shadow = CAM.shadowAt(widget,slice.z, 0)
let inner = slice.inner; let inner = slice.inner;
if (!inner) { //no holes
slice.shadow = CAM.shadowAt(widget,slice.z, 0) continue;
// console.log("looking at slice",slice) }
for (let poly of inner) { for (let poly of inner) {
let center = poly.calcCircleCenter(); let center = poly.calcCircleCenter();
center.selected = (!individual && 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;
if (center.isInPolygon(slice.shadow)) { if (center.isInPolygon(slice.shadow)) {
//TODO: test if this is working //TODO: this does not work yet. needs to be implemented
continue; continue;
} }
let overlap = false; let overlap = false;