Merge pull request #413 from GridSpace/arc-export-bugfix
Arc-export-bugfix
This commit is contained in:
commit
e7000aee66
2 changed files with 3 additions and 4 deletions
|
|
@ -282,19 +282,19 @@ export function cam_export(print, online) {
|
||||||
|
|
||||||
lastGn = gn;
|
lastGn = gn;
|
||||||
|
|
||||||
if (dx || newpos.x !== pos.x) {
|
if (dx || newpos.x !== pos.x || arc) {
|
||||||
pos.x = newpos.x;
|
pos.x = newpos.x;
|
||||||
runbox.min.x = Math.min(runbox.min.x, pos.x);
|
runbox.min.x = Math.min(runbox.min.x, pos.x);
|
||||||
runbox.max.x = Math.max(runbox.max.x, pos.x);
|
runbox.max.x = Math.max(runbox.max.x, pos.x);
|
||||||
nl.append(space).append(axis.X).append(add0(consts.pos_x = pos.x * factor));
|
nl.append(space).append(axis.X).append(add0(consts.pos_x = pos.x * factor));
|
||||||
}
|
}
|
||||||
if (dy || newpos.y !== pos.y) {
|
if (dy || newpos.y !== pos.y || arc) {
|
||||||
pos.y = newpos.y;
|
pos.y = newpos.y;
|
||||||
runbox.min.y = Math.min(runbox.min.y, pos.y);
|
runbox.min.y = Math.min(runbox.min.y, pos.y);
|
||||||
runbox.max.y = Math.max(runbox.max.y, pos.y);
|
runbox.max.y = Math.max(runbox.max.y, pos.y);
|
||||||
nl.append(space).append(axis.Y).append(add0(consts.pos_y = pos.y * factor));
|
nl.append(space).append(axis.Y).append(add0(consts.pos_y = pos.y * factor));
|
||||||
}
|
}
|
||||||
if (dz || newpos.z !== pos.z) {
|
if (dz || newpos.z !== pos.z || arc) {
|
||||||
pos.z = newpos.z;
|
pos.z = newpos.z;
|
||||||
runbox.min.z = Math.min(runbox.min.z, pos.z);
|
runbox.min.z = Math.min(runbox.min.z, pos.z);
|
||||||
runbox.max.z = Math.max(runbox.max.z, pos.z);
|
runbox.max.z = Math.max(runbox.max.z, pos.z);
|
||||||
|
|
|
||||||
|
|
@ -821,7 +821,6 @@ export function prepEach(widget, settings, print, firstPoint, update) {
|
||||||
|
|
||||||
let endDelta = e1.distTo2D(e3)
|
let endDelta = e1.distTo2D(e3)
|
||||||
if(endDelta < 0.01){
|
if(endDelta < 0.01){
|
||||||
console.log("circleCompleteFault")
|
|
||||||
let last = arcQ.peek()
|
let last = arcQ.peek()
|
||||||
drainQ(true)
|
drainQ(true)
|
||||||
arcQ.push(last)
|
arcQ.push(last)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue