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 merge errors

Browse source
This commit is contained in:
bakedpotatolord 2025-07-11 14:27:51 -06:00
commit d83a2fafbc
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/kiri/mode/cam/cl-helical.js
View file

@ -1,16 +1,21 @@
import { api } from "../../core/api.js"; import { api } from "../../core/api.js";
import { CAM } from "./driver-fe.js"; import { CAM } from "./driver-fe.js";
import { clearPops, env } from "./client.js";
let alert, lastWidget;
export let helicalOn = false; export let helicalOn = false;
export function selectHelical() { export function selectHelical() {
if (helicalOn) { if (helicalOn) {
return func.surfaceDone(); return helicalDone();
} }
func.clearPops(); clearPops();
alert = api.show.alert("analyzing surfaces...", 1000); alert = api.show.alert("analyzing surfaces...", 1000);
let cylinders = poppedRec.cylinders; let cylinders = env.poppedRec.cylinders;
CAM.surface_prep(currentIndex * RAD2DEG, () => { CAM.surface_prep(true, () => {
api.hide.alert(alert); api.hide.alert(alert);
alert = api.show.alert("[esc] cancels surface selection"); alert = api.show.alert("[esc] cancels surface selection");
for (let [wid, arr] of Object.entries(cylinders)) { for (let [wid, arr] of Object.entries(cylinders)) {
@ -23,7 +28,7 @@ export function selectHelical() {
} }
} }
}); });
helicalOn = hoveredOp; helicalOn = env.hoveredOp;
helicalOn.classList.add("editing"); helicalOn.classList.add("editing");
api.feature.on_mouse_up = (obj, ev) => { api.feature.on_mouse_up = (obj, ev) => {
let { face } = obj; let { face } = obj;
@ -41,10 +46,10 @@ export function selectHelical() {
}; };
export function helicalDone(){ export function helicalDone(){
if (!(helicalOn && poppedRec && poppedRec.cylinders)) { if (!(helicalOn && env.poppedRec && env.poppedRec.cylinders)) {
return; return;
} }
let { cylinders } = poppedRec; let { cylinders } = env.poppedRec;
for (let wid of Object.keys(cylinders)) { for (let wid of Object.keys(cylinders)) {
let widget = api.widgets.forid(wid); let widget = api.widgets.forid(wid);
if (widget) { if (widget) {

2
src/kiri/mode/cam/cl-ops.js
View file

@ -543,7 +543,7 @@ export function createPopOps() {
rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toFloat, units:true}), rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toFloat, units:true}),
feed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toFloat, units:true}), feed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toFloat, units:true}),
down: UC.newInput(LANG.ch_sdwn_s, {title:LANG.ch_sdwn_l, convert:UC.toFloat, units:true}), down: UC.newInput(LANG.ch_sdwn_s, {title:LANG.ch_sdwn_l, convert:UC.toFloat, units:true}),
startAng: UC.newInput(LANG.ch_stra_s, {title:LANG.ch_stra_l, convert:UC.toDegsFloat, bound:UC.bound(-360,360),show:() => poppedRec.forceStartAng}), startAng: UC.newInput(LANG.ch_stra_s, {title:LANG.ch_stra_l, convert:UC.toDegsFloat, bound:UC.bound(-360,360),show:() => env.poppedRec.forceStartAng}),
offOver: UC.newInput(LANG.cc_offd_s, {title:LANG.cc_offd_l, convert:UC.toFloat, units:true, bound:UC.bound(0,Infinity)}), offOver: UC.newInput(LANG.cc_offd_s, {title:LANG.cc_offd_l, convert:UC.toFloat, units:true, bound:UC.bound(0,Infinity)}),
sep: UC.newBlank({class:"pop-sep"}), sep: UC.newBlank({class:"pop-sep"}),
forceStartAng: UC.newBoolean(LANG.ch_fsta_s, undefined, {title:LANG.ch_fsta_l, }), forceStartAng: UC.newBoolean(LANG.ch_fsta_s, undefined, {title:LANG.ch_fsta_l, }),

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

@ -177,7 +177,7 @@ const opAddHelical = () => {
surfaceDone(); surfaceDone();
let rec = env.popOp.helical.new(); let rec = env.popOp.helical.new();
rec.cylinders = { /* widget.id: [ faces... ] */ }; rec.cylinders = { /* widget.id: [ faces... ] */ };
func.opAdd(rec); opAdd(rec);
}; };
const opAddContour = (axis) => { const opAddContour = (axis) => {