From 5dfd1bf0abb8d8e83ef6234a65c3ca417734f307 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Fri, 1 Feb 2019 16:19:16 +0200 Subject: [PATCH] - fixed postprocessor files so now the bounds values are right aligned (assuming max string length of 9 chars which means 4 digits and 4 decimals) --- README.md | 1 + postprocessors/default.py | 11 +++++++---- postprocessors/grbl_11.py | 11 +++++++---- postprocessors/grbl_laser.py | 11 +++++++---- postprocessors/line_xyz.py | 11 +++++++---- postprocessors/manual_toolchange.py | 11 +++++++---- postprocessors/marlin.py | 11 +++++++---- 7 files changed, 43 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 3d411bf8..15ad3cd9 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ CAD program, and create G-Code for Isolation routing. - FlatCAM saves now to a file in self.data_path the toolbar positions and the position of TCL Shell - Plot Area Tab view can now be toggled, added entry in View Menu and shortcut key CTRL+F10 - All the tabs in the GUI right side are (Plot Are, Preferences etc) are now detachable to a separate windows which when closed it returns in the previous location in the toolbar. Those detached tabs can be also reattached by drag and drop. +- fixed postprocessor files so now the bounds values are right aligned (assuming max string length of 9 chars which means 4 digits and 4 decimals) 30.01.2019 diff --git a/postprocessors/default.py b/postprocessors/default.py index 6ee5eb1b..e7d1d8e1 100644 --- a/postprocessors/default.py +++ b/postprocessors/default.py @@ -11,6 +11,11 @@ class default(FlatCAMPostProc): coords_xy = p['toolchange_xy'] gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + if str(p['options']['type']) == 'Geometry': gcode += '(TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + ')\n' @@ -44,10 +49,8 @@ class default(FlatCAMPostProc): else: gcode += '(Postprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' + '\n' - gcode += '(X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + ')\n' - gcode += '(Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + ')\n' - gcode += '(X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + ')\n' - gcode += '(Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + ')\n\n' + gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n' + gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n' gcode += '(Spindle Speed: %s RPM)\n' % str(p['spindlespeed']) diff --git a/postprocessors/grbl_11.py b/postprocessors/grbl_11.py index 82a9021f..5470760f 100644 --- a/postprocessors/grbl_11.py +++ b/postprocessors/grbl_11.py @@ -11,6 +11,11 @@ class grbl_11(FlatCAMPostProc): coords_xy = p['toolchange_xy'] gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + if str(p['options']['type']) == 'Geometry': gcode += '(TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + ')\n' + '\n' @@ -42,10 +47,8 @@ class grbl_11(FlatCAMPostProc): else: gcode += '(Postprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' + '\n' - gcode += '(X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + ')\n' - gcode += '(Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + ')\n' - gcode += '(X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + ')\n' - gcode += '(Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + ')\n\n' + gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n' + gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n' gcode += '(Spindle Speed: ' + str(p['spindlespeed']) + ' RPM' + ')\n' + '\n' diff --git a/postprocessors/grbl_laser.py b/postprocessors/grbl_laser.py index 95b0cc5e..ef83f92e 100644 --- a/postprocessors/grbl_laser.py +++ b/postprocessors/grbl_laser.py @@ -13,6 +13,11 @@ class grbl_laser(FlatCAMPostProc): units = ' ' + str(p['units']).lower() gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + gcode += '(Feedrate: ' + str(p['feedrate']) + units + '/min' + ')\n' gcode += '(Feedrate rapids ' + str(p['feedrate_rapid']) + units + '/min' + ')\n' + '\n' @@ -24,10 +29,8 @@ class grbl_laser(FlatCAMPostProc): gcode += '(Postprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' gcode += ('G20' if p.units.upper() == 'IN' else 'G21') + "\n" + '\n' - gcode += '(X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + ')\n' - gcode += '(Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + ')\n' - gcode += '(X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + ')\n' - gcode += '(Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + ')\n\n' + gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n' + gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n' gcode += 'G90\n' gcode += 'G94\n' diff --git a/postprocessors/line_xyz.py b/postprocessors/line_xyz.py index 6bc52ffb..a9db9a23 100644 --- a/postprocessors/line_xyz.py +++ b/postprocessors/line_xyz.py @@ -11,6 +11,11 @@ class line_xyz(FlatCAMPostProc): coords_xy = p['toolchange_xy'] gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + if str(p['options']['type']) == 'Geometry': gcode += '(TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + ')\n' @@ -42,10 +47,8 @@ class line_xyz(FlatCAMPostProc): else: gcode += '(Postprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' + '\n' - gcode += '(X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + ')\n' - gcode += '(Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + ')\n' - gcode += '(X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + ')\n' - gcode += '(Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + ')\n\n' + gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n' + gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n' gcode += '(Spindle Speed: %s RPM)\n' % str(p['spindlespeed']) diff --git a/postprocessors/manual_toolchange.py b/postprocessors/manual_toolchange.py index df457bc8..28dc2f1a 100644 --- a/postprocessors/manual_toolchange.py +++ b/postprocessors/manual_toolchange.py @@ -11,6 +11,11 @@ class manual_toolchange(FlatCAMPostProc): coords_xy = p['toolchange_xy'] gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + if str(p['options']['type']) == 'Geometry': gcode += '(TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + ')\n' @@ -42,10 +47,8 @@ class manual_toolchange(FlatCAMPostProc): else: gcode += '(Postprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' + '\n' - gcode += '(X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + ')\n' - gcode += '(Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + ')\n' - gcode += '(X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + ')\n' - gcode += '(Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + ')\n\n' + gcode += '(X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + ')\n' + gcode += '(Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + ')\n\n' gcode += '(Spindle Speed: %s RPM)\n' % str(p['spindlespeed']) diff --git a/postprocessors/marlin.py b/postprocessors/marlin.py index d1c9e619..fb5eacaa 100644 --- a/postprocessors/marlin.py +++ b/postprocessors/marlin.py @@ -12,6 +12,11 @@ class marlin(FlatCAMPostProc): coords_xy = p['toolchange_xy'] gcode = '' + xmin = '%.*f' % (p.coords_decimals, p['options']['xmin']) + xmax = '%.*f' % (p.coords_decimals, p['options']['xmax']) + ymin = '%.*f' % (p.coords_decimals, p['options']['ymin']) + ymax = '%.*f' % (p.coords_decimals, p['options']['ymax']) + if str(p['options']['type']) == 'Geometry': gcode += ';TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + '\n' + '\n' @@ -45,10 +50,8 @@ class marlin(FlatCAMPostProc): else: gcode += ';Postprocessor Geometry: ' + str(p['pp_geometry_name']) + '\n' + '\n' - gcode += ';X min: ' + '%.*f' % (p.coords_decimals, p['options']['xmin']) + units + '\n' - gcode += ';Y min: ' + '%.*f' % (p.coords_decimals, p['options']['ymin']) + units + '\n' - gcode += ';X max: ' + '%.*f' % (p.coords_decimals, p['options']['xmax']) + units + '\n' - gcode += ';Y max: ' + '%.*f' % (p.coords_decimals, p['options']['ymax']) + units + '\n\n' + gcode += ';X range: ' + '{: >9s}'.format(xmin) + ' ... ' + '{: >9s}'.format(xmax) + ' ' + units + '\n' + gcode += ';Y range: ' + '{: >9s}'.format(ymin) + ' ... ' + '{: >9s}'.format(ymax) + ' ' + units + '\n\n' gcode += ';Spindle Speed: ' + str(p['spindlespeed']) + ' RPM' + '\n' + '\n'