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 tab flip on part flip

Browse source
This commit is contained in:
Stewart Allen 2020-12-28 13:46:38 -05:00
commit 2515d83f3f
4 changed files with 49 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri/conf.js
View file

@ -463,6 +463,7 @@
camTabsWidth: 5,
camTabsHeight: 5,
camTabsDepth: 5,
camTabsMidline: false,
camDepthFirst: false,
camEaseDown: false,
camOriginTop: true,

1
src/kiri/init.js
View file

@ -1636,6 +1636,7 @@
camTabsWidth: UC.newInput(LANG.ct_wdth_s, {title:LANG.ct_wdth_l, convert:UC.toFloat, bound:UC.bound(0.005,100), modes:CAM, units:true}),
camTabsHeight: UC.newInput(LANG.ct_hght_s, {title:LANG.ct_hght_l, convert:UC.toFloat, bound:UC.bound(0.005,100), modes:CAM, units:true}),
camTabsDepth: UC.newInput(LANG.ct_dpth_s, {title:LANG.ct_dpth_l, convert:UC.toFloat, bound:UC.bound(0.005,100), modes:CAM, units:true}),
camTabsMidline: UC.newBoolean(LANG.ct_midl_s, onBooleanClick, {title:LANG.ct_midl_l, modes:CAM}),
camSep: UC.newBlank({class:"pop-sep"}),
camTabsManual: UC.newRow([
(UI.tabAdd = UC.newButton(undefined, onButtonClick, {icon:'<i class="fas fa-plus"></i>'})),

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

@ -373,19 +373,31 @@
// flip tabs
API.widgets.all().forEach(widget => {
let anno = API.widgets.annotate(widget.id).tab || [];
let wbm = widget.bounds.max.z;
for (let tab of anno) {
let wtp = widget.tabs[tab.id].box.position;
let box = widget.tabs[tab.id].box;
let bpo = box.position;
let xr = 0, yr = 0;
let flz = wbm - bpo.z;
if (axis === 'X') {
tab.pos.y = -tab.pos.y;
wtp.y = -wtp.y;
bpo.y = -bpo.y;
xr = Math.PI / 2;
}
if (axis === 'Y') {
tab.pos.x = -tab.pos.x;
wtp.x = -wtp.x;
bpo.x = -bpo.x;
yr = Math.PI / 2;
}
tab.pos.z = widget.bounds.max.z - tab.pos.z;
wtp.z = widget.bounds.max.z - wtp.z;
tab.pos.z = bpo.z = flz;
let { rot } = tab;
let qat = new THREE.Quaternion(rot._x, rot._y, rot._z, rot._w);
let eul = new THREE.Euler().setFromQuaternion(qat);
eul._z = -eul._z;
tab.rot = new THREE.Quaternion().setFromEuler(eul);
}
clearTabs(widget, true);
restoreTabs([widget]);
});
// flip widget
if (axis === 'X') {
@ -698,24 +710,7 @@
if (x || y) {
clearTabs(widget);
} else {
let tabs = API.widgets.annotate(widget.id).tab || [];
tabs.forEach(rec => {
let { id, pos, rot } = rec;
let tab = widget.tabs[id];
let m4 = new THREE.Matrix4().makeRotationFromEuler(new THREE.Euler(0, 0, z || 0));
// update position vector
let vc = new THREE.Vector3(pos.x, pos.y, pos.z).applyMatrix4(m4);
// update rotation quaternion
rec.rot = new THREE.Quaternion().multiplyQuaternions(
new THREE.Quaternion(rot._x, rot._y, rot._z, rot._w),
new THREE.Quaternion().setFromRotationMatrix(m4)
);
tab.box.geometry.applyMatrix4(m4);
tab.box.position.x = pos.x = vc.x;
tab.box.position.y = pos.y = vc.y;
tab.box.position.z = pos.z = vc.z;
});
SPACE.update();
rotateTabs(widget, x, y, z);
}
});
api.event.on("mouse.hover.up", rec => {
@ -732,6 +727,27 @@
func.hover(data);
});
function rotateTabs(widget, x, y, z) {
let tabs = API.widgets.annotate(widget.id).tab || [];
tabs.forEach(rec => {
let { id, pos, rot } = rec;
let tab = widget.tabs[id];
let m4 = new THREE.Matrix4().makeRotationFromEuler(new THREE.Euler(x || 0, y || 0, z || 0));
// update position vector
let vc = new THREE.Vector3(pos.x, pos.y, pos.z).applyMatrix4(m4);
// update rotation quaternion
rec.rot = new THREE.Quaternion().multiplyQuaternions(
new THREE.Quaternion(rot._x, rot._y, rot._z, rot._w),
new THREE.Quaternion().setFromRotationMatrix(m4)
);
tab.box.geometry.applyMatrix4(m4);
tab.box.position.x = pos.x = vc.x;
tab.box.position.y = pos.y = vc.y;
tab.box.position.z = pos.z = vc.z;
});
SPACE.update();
}
function hasSpindle() {
return current.device.spindleMax > 0;
}
@ -949,10 +965,10 @@
function createTabBox(iw, ic, n) {
const { track } = iw;
const { stock, bounds, process } = API.conf.get();
const { camTabsWidth, camTabsHeight, camTabsDepth } = process;
const { camTabsWidth, camTabsHeight, camTabsDepth, camTabsMidline } = process;
const sz = stock.z || bounds.max.z;
const zto = sz - iw.track.top;
const zp = sz - track.box.d + process.camZBottom - zto + camTabsHeight / 2;
const zp = sz - track.box.d + process.camZBottom - zto + (camTabsMidline ? 0 : camTabsHeight / 2);
ic.x += n.x * camTabsDepth / 2; // offset from part
ic.z -= n.y * camTabsDepth / 2; // offset swap z,y
ic.y = zp; // offset swap in world space y,z
@ -989,13 +1005,15 @@
});
}
function clearTabs(widget) {
function clearTabs(widget, skiprec) {
Object.values(widget.tabs || {}).forEach(rec => {
widget.adds.remove(rec.box);
widget.mesh.remove(rec.box);
});
widget.tabs = {};
delete API.widgets.annotate(widget.id).tab;
if (!skiprec) {
delete API.widgets.annotate(widget.id).tab;
}
}
function unselectTraces(widget) {

2
web/kiri/lang/en.js
View file

@ -352,6 +352,8 @@ kiri.lang['en-us'] = {
ct_hght_l: "height in workspace units",
ct_dpth_s: "depth",
ct_dpth_l: "distance in workspace units\nthat the tab projects from\nthe part surface",
ct_midl_s: "midline",
ct_midl_l: "use midline of tab\ninstead of z bottom\nfor double-sided work",
ct_nabl_s: "auto",
ct_nabl_l: "auto generate radial tabs\nprojected from part center\nusing count and angle offset",