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

more optimal adaptive in corner case. add heights to fixed slicing

Browse source
This commit is contained in:
Stewart Allen 2018-03-07 10:08:30 -05:00
commit 17f87d58c4
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/kiri-slicer.js
View file

@ -232,7 +232,8 @@ var gs_kiri_slicer = exports;
zDivMax = Math.floor(zDelta / zInc); zDivMax = Math.floor(zDelta / zInc);
if (zDivMax && zDivMax < zDivMin) { if (zDivMax && zDivMax < zDivMin) {
zStep = zDelta / (zDivMax + 1); if (zDelta % zInc > 0.01) zDivMax++;
zStep = zDelta / zDivMax;
} else { } else {
zStep = zDelta; zStep = zDelta;
} }
@ -247,10 +248,12 @@ var gs_kiri_slicer = exports;
// FDM fixed slicing // FDM fixed slicing
if (options.firstHeight) { if (options.firstHeight) {
zIndexes.push(options.firstHeight / 2); zIndexes.push(options.firstHeight / 2);
zHeights.push(options.firstHeight);
zMin = options.firstHeight; zMin = options.firstHeight;
} }
for (i = zMin + zOff; i < zMax; i += zInc) { for (i = zMin + zOff; i < zMax; i += zInc) {
zIndexes.push(i); zIndexes.push(i);
zHeights.push(zInc);
} }
} }
@ -419,7 +422,7 @@ var gs_kiri_slicer = exports;
// allow empty slices in CAM swap mode (for topos w/ gaps) // allow empty slices in CAM swap mode (for topos w/ gaps)
if (lines.length == 0 && !(options.swapX || options.swapY)) return; if (lines.length == 0 && !(options.swapX || options.swapY)) return;
slice.height = height || z; slice.height = height;
slice.index = slices.length; slice.index = slices.length;
slice.lines = removeDuplicateLines(lines); slice.lines = removeDuplicateLines(lines);

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
VERSION:"1.1.8b" VERSION:"1.1.8c"
}; };
if (!module) var module = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;