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

add editable selection center

Browse source
This commit is contained in:
Stewart Allen 2024-09-02 13:57:47 -04:00
commit 200a7a2e4c
2 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/mesh/api.js
View file

@ -262,6 +262,7 @@ const selection = {
for (let s of selection.groups()) { for (let s of selection.groups()) {
s.floor(); s.floor();
} }
call.selection_update();
return selection; return selection;
}, },
@ -269,6 +270,7 @@ const selection = {
for (let s of [...selection.groups(), ...selection.sketches()]) { for (let s of [...selection.groups(), ...selection.sketches()]) {
s.centerXY(); s.centerXY();
} }
call.selection_update();
return selection; return selection;
}, },
@ -1157,7 +1159,6 @@ const tool = {
let group = mesh.api.group.new(models.map(m => m.ungroup())); let group = mesh.api.group.new(models.map(m => m.ungroup()));
let bounds = group.bounds; let bounds = group.bounds;
models.forEach(m => m.centerTo(bounds.mid)); models.forEach(m => m.centerTo(bounds.mid));
console.log({ bounds, group, models });
return group; return group;
} }
}, },

54
src/mesh/build.js
View file

@ -364,6 +364,12 @@ function facon(name, sub) {
return h.i({ class: [ sub || "fa", name ] }); return h.i({ class: [ sub || "fa", name ] });
} }
function editable() {
for (let el of [...arguments]) {
el.classList.add('editable');
}
}
function menu_item(text, fn, short, id) { function menu_item(text, fn, short, id) {
if (short) { if (short) {
short = Array.isArray(short) ? short : [ short ]; short = Array.isArray(short) ? short : [ short ];
@ -866,24 +872,22 @@ function ui_build() {
]); ]);
for (let axis of [ 'x', 'y', 'z' ]) { for (let axis of [ 'x', 'y', 'z' ]) {
let el = bound[`sketch_val_${axis.toUpperCase()}_center`]; let el = bound[`sketch_val_${axis.toUpperCase()}_center`];
el.classList.add('editable');
el.onclick = field_edit(`${axis} center`, (nval, oval) => { el.onclick = field_edit(`${axis} center`, (nval, oval) => {
sketch.center[axis] = nval; sketch.center[axis] = nval;
sketch.render(); sketch.render();
}, { sketch: true }); }, { sketch: true });
let el2 = bound[`sketch_val_${axis.toUpperCase()}_scale`]; let el2 = bound[`sketch_val_${axis.toUpperCase()}_scale`];
el2.classList.add('editable');
el2.onclick = field_edit(`${axis} size`, (nval, oval) => { el2.onclick = field_edit(`${axis} size`, (nval, oval) => {
sketch.scale[axis] = nval; sketch.scale[axis] = nval;
sketch.render(); sketch.render();
}, { sketch: true }); }, { sketch: true });
editable(el, el2);
} }
if (sel_item) if (sel_item)
for (let axis of [ 'x', 'y' ]) { for (let axis of [ 'x', 'y' ]) {
let el = bound[`item_val_${axis.toUpperCase()}_center`]; let el = bound[`item_val_${axis.toUpperCase()}_center`];
// all items have centers // all items have centers
if (!el) continue; if (!el) continue;
el.classList.add('editable');
el.onclick = field_edit(`${axis} center`, (nval, oval) => { el.onclick = field_edit(`${axis} center`, (nval, oval) => {
sel_item.center[axis] = nval; sel_item.center[axis] = nval;
sketch.render(); sketch.render();
@ -891,7 +895,6 @@ function ui_build() {
// polygon scaling, circle radius // polygon scaling, circle radius
let el2 = bound[`item_val_${axis.toUpperCase()}_size`]; let el2 = bound[`item_val_${axis.toUpperCase()}_size`];
if (!el2) continue; if (!el2) continue;
el2.classList.add('editable');
el2.onclick = field_edit(`${axis} size`, (nval, oval) => { el2.onclick = field_edit(`${axis} size`, (nval, oval) => {
if (sel_item.type === 'polygon') { if (sel_item.type === 'polygon') {
let scale = {x:1,y:1,z:1}; let scale = {x:1,y:1,z:1};
@ -911,11 +914,11 @@ function ui_build() {
let lab = { x: 'points', y: 'rotation' }[axis]; let lab = { x: 'points', y: 'rotation' }[axis];
let el3 = bound[`circle_val_${lab}_other`]; let el3 = bound[`circle_val_${lab}_other`];
if (!el3) continue; if (!el3) continue;
el3.classList.add('editable');
el3.onclick = field_edit(`${axis} size`, (nval, oval) => { el3.onclick = field_edit(`${axis} size`, (nval, oval) => {
sel_item[lab] = nval; sel_item[lab] = nval;
sketch.render(); sketch.render();
}, { sketch: true }); }, { sketch: true });
editable(el, el2, e3);
} }
return; return;
@ -931,10 +934,7 @@ function ui_build() {
und, und, 'group' und, und, 'group'
)); ));
// let m_pos = util.average(s_mdl.map(m => m.object.position));
// let m_rot = util.average(s_mdl.map(m => m.object.rotation));
let m_id = s_mdl.map(m => m.id).join(' '); let m_id = s_mdl.map(m => m.id).join(' ');
let bounds = util.bounds(s_mdl); let bounds = util.bounds(s_mdl);
let h_ara = sblock('span', m_id, grid3( let h_ara = sblock('span', m_id, grid3(
util.extract(bounds.center, map), util.extract(bounds.center, map),
@ -982,9 +982,7 @@ function ui_build() {
// bind rotation editable fields // bind rotation editable fields
let { group_val_X_rot, group_val_Y_rot, group_val_Z_rot } = bound; let { group_val_X_rot, group_val_Y_rot, group_val_Z_rot } = bound;
[ group_val_X_rot, group_val_Y_rot, group_val_Z_rot ].forEach(e => { editable(group_val_X_rot, group_val_Y_rot, group_val_Z_rot);
e.classList.add('editable');
});
group_val_X_rot.onclick = field_edit('x rotation', (group, val) => { group_val_X_rot.onclick = field_edit('x rotation', (group, val) => {
group.rotate(val,0,0); group.rotate(val,0,0);
}); });
@ -997,38 +995,41 @@ function ui_build() {
// bind position editable fields // bind position editable fields
let { group_val_X_pos, group_val_Y_pos, group_val_Z_pos } = bound; let { group_val_X_pos, group_val_Y_pos, group_val_Z_pos } = bound;
[ group_val_X_pos, group_val_Y_pos, group_val_Z_pos ].forEach(e => { editable(group_val_X_pos, group_val_Y_pos, group_val_Z_pos);
e.classList.add('editable');
});
group_val_X_pos.onclick = field_edit('x position', (group, val) => { group_val_X_pos.onclick = field_edit('x position', (group, val) => {
// let r = group.position();
// group.position(val, r.y, r.z);
selection.move_models(val,0,0); selection.move_models(val,0,0);
}, { floor: false }); }, { floor: false });
group_val_Y_pos.onclick = field_edit('y position', (group, val) => { group_val_Y_pos.onclick = field_edit('y position', (group, val) => {
// let r = group.position();
// group.position(r.x, val, r.z);
selection.move_models(0,val,0); selection.move_models(0,val,0);
}, { floor: false }); }, { floor: false });
group_val_Z_pos.onclick = field_edit('z position', (group, val) => { group_val_Z_pos.onclick = field_edit('z position', (group, val) => {
// let r = group.position();
// group.position(r.x, r.y, val);
selection.move_models(0,0,val); selection.move_models(0,0,val);
}, { floor: false }); }, { floor: false });
// bind scale editable fields // bind center editable fields
let pedit = prefs.map.edit; let { span_val_X_center, span_val_Y_center, span_val_Z_center } = bound;
let { span_val_X_size, span_val_Y_size, span_val_Z_size } = bound; editable(span_val_X_center, span_val_Y_center, span_val_Z_center);
[ span_val_X_size, span_val_Y_size, span_val_Z_size ].forEach(e => { span_val_X_center.onclick = field_edit('x center', (group, val, oval) => {
e.classList.add('editable'); selection.move_models(val - parseFloat(oval),0,0);
}); });
span_val_Y_center.onclick = field_edit('y center', (group, val, oval) => {
selection.move_models(0,val - parseFloat(oval),0);
});
span_val_Z_center.onclick = field_edit('z center', (group, val, oval) => {
selection.move_models(0,0,val - parseFloat(oval));
});
// bind size editable fields
let { span_val_X_size, span_val_Y_size, span_val_Z_size } = bound;
editable(span_val_X_size, span_val_Y_size, span_val_Z_size);
let pedit = prefs.map.edit;
let axgrp = {}; let axgrp = {};
// activate axis grouping toggles // activate axis grouping toggles
[ "X", "Y", "Z" ].forEach(axis => { [ "X", "Y", "Z" ].forEach(axis => {
let prefkey = `scale_group_${axis}`; let prefkey = `scale_group_${axis}`;
let agv = axgrp[axis] = pedit[prefkey]; let agv = axgrp[axis] = pedit[prefkey];
let lbl = bound[`span_lbl_${axis}`]; let lbl = bound[`span_lbl_${axis}`];
lbl.classList.add('editable');
if (agv) { if (agv) {
lbl.classList.add('grouped'); lbl.classList.add('grouped');
} else { } else {
@ -1038,6 +1039,7 @@ function ui_build() {
pedit[prefkey] = !agv; pedit[prefkey] = !agv;
defer_selection(); // update ui defer_selection(); // update ui
}; };
editable(lbl);
}); });
span_val_X_size.onclick = field_edit('x size', (group, val, oval) => { span_val_X_size.onclick = field_edit('x size', (group, val, oval) => {
let rel = val / parseFloat(oval); let rel = val / parseFloat(oval);