Mirrored_Repos/teachingtechYT.github.io
1
0
Fork 0
mirror of https://github.com/teachingtechYT/teachingtechYT.github.io.git synced 2024-08-30 18:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Truncate XY decimal places to 4 digits

Browse Source 
#241
This commit is contained in:
lawgicau
2021-07-19 16:37:31 +10:00
parent d74cbdd0c0
commit a5a8ebaf12
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/gcodeprocessing.js
View File

@ -301,20 +301,20 @@ function processGcode(formName) {
if(name == "firstlayerForm"){ if(name == "firstlayerForm"){
var originalSquare = firstlayer[nozzleLayer]; var originalSquare = firstlayer[nozzleLayer];
for(var i = 0; i <= 4; i++){ for(var i = 0; i <= 4; i++){
var square = "; squarez "+(i+1)+"\n"+originalSquare; var square = "\n; square "+(i+1)+originalSquare;
var firstlayerArray = square.split(/\n/g); var firstlayerArray = square.split(/\n/g);
var regexp = /X[0-9\.]+/; var regexp = /X[0-9\.]+/;
firstlayerArray.forEach(function(index, item){ firstlayerArray.forEach(function(index, item){
if(firstlayerArray[item].search(/X/) > -1){ if(firstlayerArray[item].search(/X/) > -1){
var value = parseFloat(firstlayerArray[item].match(regexp)[0].substring(1)) + offsets[i*2]; var value = parseFloat(firstlayerArray[item].match(regexp)[0].substring(1)) + offsets[i*2];
firstlayerArray[item] = firstlayerArray[item].replace(regexp, "X"+String(value)); firstlayerArray[item] = firstlayerArray[item].replace(regexp, "X"+String(value.toFixed(4)));
} }
}); });
var regexp = /Y[0-9\.]+/; var regexp = /Y[0-9\.]+/;
firstlayerArray.forEach(function(index, item){ firstlayerArray.forEach(function(index, item){
if(firstlayerArray[item].search(/Y/) > -1){ if(firstlayerArray[item].search(/Y/) > -1){
var value = parseFloat(firstlayerArray[item].match(regexp)[0].substring(1)) + offsets[i*2+1]; var value = parseFloat(firstlayerArray[item].match(regexp)[0].substring(1)) + offsets[i*2+1];
firstlayerArray[item] = firstlayerArray[item].replace(regexp, "Y"+String(value)) firstlayerArray[item] = firstlayerArray[item].replace(regexp, "Y"+String(value.toFixed(4)))
} }
}); });
square = firstlayerArray.join("\n"); square = firstlayerArray.join("\n");
@ -367,14 +367,14 @@ function processGcode(formName) {
gcodeArray.forEach(function(index, item){ gcodeArray.forEach(function(index, item){
if(gcodeArray[item].search(/X/) > -1){ if(gcodeArray[item].search(/X/) > -1){
var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) - 50; var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) - 50;
gcodeArray[item] = gcodeArray[item].replace(regexp, "X"+String(value)); gcodeArray[item] = gcodeArray[item].replace(regexp, "X"+String(value.toFixed(4)));
} }
}); });
var regexp = /Y[0-9\.]+/; var regexp = /Y[0-9\.]+/;
gcodeArray.forEach(function(index, item){ gcodeArray.forEach(function(index, item){
if(gcodeArray[item].search(/Y/) > -1){ if(gcodeArray[item].search(/Y/) > -1){
var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) - 50; var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) - 50;
gcodeArray[item] = gcodeArray[item].replace(regexp, "Y"+String(value)) gcodeArray[item] = gcodeArray[item].replace(regexp, "Y"+String(value.toFixed(4)))
} }
}); });
gcode = gcodeArray.join("\n"); gcode = gcodeArray.join("\n");
@ -385,7 +385,7 @@ function processGcode(formName) {
gcodeArray.forEach(function(index, item){ gcodeArray.forEach(function(index, item){
if(gcodeArray[item].search(/X/) > -1){ if(gcodeArray[item].search(/X/) > -1){
var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) + bedX; var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) + bedX;
gcodeArray[item] = gcodeArray[item].replace(regexp, "X"+String(value)); gcodeArray[item] = gcodeArray[item].replace(regexp, "X"+String(value.toFixed(4)));
} }
}); });
gcode = gcodeArray.join("\n"); gcode = gcodeArray.join("\n");
@ -396,7 +396,7 @@ function processGcode(formName) {
gcodeArray.forEach(function(index, item){ gcodeArray.forEach(function(index, item){
if(gcodeArray[item].search(/Y/) > -1){ if(gcodeArray[item].search(/Y/) > -1){
var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) + bedY; var value = parseFloat(gcodeArray[item].match(regexp)[0].substring(1)) + bedY;
gcodeArray[item] = gcodeArray[item].replace(regexp, "Y"+String(value)) gcodeArray[item] = gcodeArray[item].replace(regexp, "Y"+String(value.toFixed(4)))
} }
}); });
gcode = gcodeArray.join("\n"); gcode = gcodeArray.join("\n");