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

change height to relative vs absolute in layer progress

Browse source
This commit is contained in:
Stewart Allen 2018-01-10 14:09:38 -05:00
commit 011162af94
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/kiri-driver-fdm.js
View file

@ -301,7 +301,7 @@ var gs_kiri_fdm = exports;
output = [], output = [],
outputLength = 0, outputLength = 0,
lastProgress = 0, lastProgress = 0,
decimals = 4, decimals = 3,
progress = 0, progress = 0,
distance = 0, distance = 0,
emitted = 0, emitted = 0,
@ -395,15 +395,15 @@ var gs_kiri_fdm = exports;
var o = ['G1']; var o = ['G1'];
if (typeof newpos.x === 'number') { if (typeof newpos.x === 'number') {
pos.x = UTIL.round(newpos.x,decimals); pos.x = UTIL.round(newpos.x,decimals);
o.append(" X").append(pos.x); o.append(" X").append(pos.x.toFixed(decimals));
} }
if (typeof newpos.y === 'number') { if (typeof newpos.y === 'number') {
pos.y = UTIL.round(newpos.y,decimals); pos.y = UTIL.round(newpos.y,decimals);
o.append(" Y").append(pos.y); o.append(" Y").append(pos.y.toFixed(decimals));
} }
if (typeof newpos.z === 'number') { if (typeof newpos.z === 'number') {
pos.z = UTIL.round(newpos.z,decimals); pos.z = UTIL.round(newpos.z,decimals);
o.append(" Z").append(pos.z); o.append(" Z").append(pos.z.toFixed(decimals));
} }
if (typeof newpos.e === 'number') { if (typeof newpos.e === 'number') {
outputLength += newpos.e; outputLength += newpos.e;
@ -440,7 +440,10 @@ var gs_kiri_fdm = exports;
if (trackLayers) { if (trackLayers) {
trackLayers.forEach(function(line) { trackLayers.forEach(function(line) {
append(constReplace(line, {progress: progress, layer: layer, height: zpos})); append(constReplace(line, {
progress: progress,
layer: layer,
height: zinc.toFixed(3)}));
}); });
} else { } else {
append("; --- layer "+layer+" ---"); append("; --- layer "+layer+" ---");