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

prevent dogbones on tabs. fix settings restore order to preserve annotations

Browse source
This commit is contained in:
Stewart Allen 2022-02-03 15:23:16 -05:00
commit 99b9dc476e
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -397,7 +397,7 @@
setTool(tool, rate, plunge); setTool(tool, rate, plunge);
let traceTool = new CAM.Tool(settings, tool); let traceTool = new CAM.Tool(settings, tool);
let traceToolDiam = traceTool.fluteDiameter(); let traceToolDiam = traceTool.fluteDiameter();
printPoint = poly2polyEmit(slice.camLines, printPoint, polyEmit); printPoint = poly2polyEmit(slice.camLines, printPoint, polyEmit, { swapdir: false });
newLayer(); newLayer();
} }

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

@ -195,6 +195,7 @@
if (Array.isArray(poly)) { if (Array.isArray(poly)) {
return poly.forEach(p => CAM.addDogbones(p, dist)); return poly.forEach(p => CAM.addDogbones(p, dist));
} }
if (poly.open) return;
let isCW = poly.isClockwise(); let isCW = poly.isClockwise();
if (reverse || poly.parent) isCW = !isCW; if (reverse || poly.parent) isCW = !isCW;
let oldpts = poly.points.slice(); let oldpts = poly.points.slice();

2
src/kiri/main.js
View file

@ -2714,7 +2714,6 @@
clearWorkspace(); clearWorkspace();
settings = CONF.normalize(data.settings); settings = CONF.normalize(data.settings);
SDB.setItem('ws-settings', JSON.stringify(settings)); SDB.setItem('ws-settings', JSON.stringify(settings));
restoreSettings();
if (LOCAL) console.log('settings',Object.clone(settings)); if (LOCAL) console.log('settings',Object.clone(settings));
if (isWork) { if (isWork) {
API.platform.clear(); API.platform.clear();
@ -2725,6 +2724,7 @@
SPACE.view.load(data.view); SPACE.view.load(data.view);
} }
} }
restoreSettings();
restoreWorkspace(() => { restoreWorkspace(() => {
UI.sync(); UI.sync();
}, true); }, true);