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

handle adding widgets in indexed axis mode

Browse source
This commit is contained in:
Stewart Allen 2022-11-03 14:56:16 -04:00
commit 74f60dea78
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,10 +66,10 @@ CAM.init = function(kiri, api) {
return API.conf.get().process.camZBottom > 0; return API.conf.get().process.camZBottom > 0;
} }
function setAnimationStyle() { function setAnimationStyle(refresh) {
const { camStockIndexed, camStockOn } = current.process; const { camStockIndexed, camStockOn } = current.process;
let newIndexed = camStockIndexed && camStockOn; let newIndexed = camStockIndexed && camStockOn;
let changed = isIndexed !== newIndexed; let changed = refresh || isIndexed !== newIndexed;
isIndexed = newIndexed; isIndexed = newIndexed;
if (!isIndexed || !isCamMode) { if (!isIndexed || !isCamMode) {
for (let widget of API.widgets.all()) { for (let widget of API.widgets.all()) {
@ -109,8 +109,10 @@ CAM.init = function(kiri, api) {
} }
api.event.on("widget.add", widget => { api.event.on("widget.add", widget => {
if (isCamMode) { if (isCamMode && !Array.isArray(widget)) {
setAnimationStyle(); setAnimationStyle(true);
widget.setIndexed(camStock && isIndexed ? camStock.scale.z : 0);
api.platform.update_top_z();
} }
}); });

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

@ -44,7 +44,7 @@ CAM.slice = function(settings, widget, onupdate, ondone) {
zbOff = isIndexed ? 0 : (hasStock ? wztop - track.box.d : 0), zbOff = isIndexed ? 0 : (hasStock ? wztop - track.box.d : 0),
// defined z bottom offset by distance to stock bottom // defined z bottom offset by distance to stock bottom
// keeps the z bottom relative to the part when z align changes // keeps the z bottom relative to the part when z align changes
zBottom = isIndexed ? bounds.min.z : proc.camZBottom - zbOff, zBottom = isIndexed ? proc.camZBottom || bounds.min.z : proc.camZBottom - zbOff,
// greater of widget bottom and z bottom // greater of widget bottom and z bottom
zMin = isIndexed ? bounds.min.z : Math.max(bounds.min.z, zBottom), zMin = isIndexed ? bounds.min.z : Math.max(bounds.min.z, zBottom),
zMax = bounds.max.z, zMax = bounds.max.z,
@ -110,7 +110,8 @@ CAM.slice = function(settings, widget, onupdate, ondone) {
let mark = Date.now(); let mark = Date.now();
let slicer = new kiri.cam_slicer(widget.getPoints(), { let slicer = new kiri.cam_slicer(widget.getPoints(), {
zlist: true, zlist: true,
zline: true zline: true,
nobucket: isIndexed
}); });
function updateToolDiams(toolDiam) { function updateToolDiams(toolDiam) {