vmario/polargraphcontroller
0
0
Fork 0
mirror of https://github.com/euphy/polargraphcontroller synced 2025-01-09 19:55:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some gcode importing gotchas

Browse Source
This commit is contained in:
Sandy Noble 2017-06-25 17:12:18 +01:00
parent d584624791
commit 0c687ed234
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
polargraphcontroller.pde
View File

@ -1297,6 +1297,7 @@ RShape loadShapeFromGCodeFile(String filename) {
boolean reportStatus = true; boolean reportStatus = true;
while ((line = reader.readLine ()) != null) { while ((line = reader.readLine ()) != null) {
lineNo++; lineNo++;
println("Line: " + line);
if (reportStatus) { if (reportStatus) {
float percent = ((float)lineNo / (float)countLines) * 100.0; float percent = ((float)lineNo / (float)countLines) * 100.0;
@ -1320,10 +1321,8 @@ RShape loadShapeFromGCodeFile(String filename) {
println(e.toString()); println(e.toString());
continue; continue;
} }
println("Ins: " + ins);
Integer code = Math.round(ins.get("G")); Integer code = Math.round(ins.get("G"));
if (code >= 2) {
continue;
}
Float z = ins.get("Z"); Float z = ins.get("Z");
if (z != null) { if (z != null) {
@ -1366,19 +1365,6 @@ RShape loadShapeFromGCodeFile(String filename) {
parent.addMoveTo(x, y); parent.addMoveTo(x, y);
} }
} }
// RPoint[][] points = parent.getPointsInPaths();
// totalPoints = 0;
// if (points != null) {
// for (int i = 0; i<points.length; i++) {
// if (points[i] != null) {
// for (int j = 0; j<points[i].length; j++) {
// totalPoints++;
// }
// }
// }
// }
// points = null;
// println("" + totalPoints + " points.");
} }
else { else {
@ -1399,7 +1385,7 @@ RShape loadShapeFromGCodeFile(String filename) {
} }
} }
catch (IOException e) { catch (IOException e) {
println("Execption reading lines from the gcode file " + filename); println("IOExecption reading lines from the gcode file " + filename);
e.printStackTrace(); e.printStackTrace();
} }
finally { finally {
@ -1407,7 +1393,7 @@ RShape loadShapeFromGCodeFile(String filename) {
reader.close(); reader.close();
} }
catch (IOException e) { catch (IOException e) {
println("Exception closing the gcode file " + filename); println("IOException closing the gcode file " + filename);
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -1442,19 +1428,29 @@ Map<String, Float> unpackGCodeInstruction(String line) throws Exception {
String[] splitted = line.trim().split(" "); String[] splitted = line.trim().split(" ");
for (int i = 0; i < splitted.length; i++) { for (int i = 0; i < splitted.length; i++) {
String axis = splitted[i].substring(0, 1); String axis = splitted[i].substring(0, 1);
Float value = Float.parseFloat(splitted[i].substring(1)); String sanitisedValue = splitted[i].substring(1);
println("BEfore:" + sanitisedValue);
sanitisedValue = sanitisedValue.replace(",", ".");
println("After: " + sanitisedValue);
Float value = Float.parseFloat(sanitisedValue);
if ("X".equalsIgnoreCase(axis) || "Y".equalsIgnoreCase(axis) || "Z".equalsIgnoreCase(axis) || "G".equalsIgnoreCase(axis)) { if ("X".equalsIgnoreCase(axis) || "Y".equalsIgnoreCase(axis) || "Z".equalsIgnoreCase(axis) || "G".equalsIgnoreCase(axis)) {
instruction.put(axis, value); instruction.put(axis.toUpperCase(), value);
} }
} }
// println("instruction: " + instruction); // println("instruction: " + instruction);
if (instruction.isEmpty()) { if (instruction.isEmpty()) {
throw new Exception(); throw new Exception("Empty instruction");
} }
} }
catch (NumberFormatException nfe) {
println("Number format exception: " + nfe.getMessage());
}
catch (Exception e) { catch (Exception e) {
println("e: " + e);
throw new Exception("Exception while reading the lines from a gcode file: " + line + ", " + e.getMessage()); throw new Exception("Exception while reading the lines from a gcode file: " + line + ", " + e.getMessage());
} }
println("Instruction: " + instruction);
return instruction; return instruction;
} }