bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- completed the refactoring of object options property to obj_options in preprocessors too

Browse Source
This commit is contained in:
Marius Stanciu
2022-02-18 13:21:20 +02:00
committed by Marius Stanciu
parent 1681b327ed
commit f7f88a34be
23 changed files with 177 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
preprocessors/Check_points.py
View File

@@ -23,13 +23,13 @@ class Check_points(PreProc):
gcode += '(by moving a probe - possible a fine drill bit - to custom locations)\n'
gcode += '(and wait for user interaction in order to continue to the next point.)\n\n'
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'])
xmin = '%.*f' % (p.coords_decimals, p['obj_options']['xmin'])
xmax = '%.*f' % (p.coords_decimals, p['obj_options']['xmax'])
ymin = '%.*f' % (p.coords_decimals, p['obj_options']['ymin'])
ymax = '%.*f' % (p.coords_decimals, p['obj_options']['ymax'])
if str(p['options']['type']) == 'Geometry':
gcode += '(TOOL DIAMETER: ' + str(p['options']['tool_dia']) + units + ')\n'
if str(p['obj_options']['type']) == 'Geometry':
gcode += '(TOOL DIAMETER: ' + str(p['obj_options']['tool_dia']) + units + ')\n'
gcode += '(Feedrate_XY: ' + str(p['feedrate']) + units + '/min' + ')\n'
gcode += '(Feedrate_Z: ' + str(p['z_feedrate']) + units + '/min' + ')\n'
gcode += '(Feedrate rapids ' + str(p['feedrate_rapid']) + units + '/min' + ')\n' + '\n'
@@ -39,7 +39,7 @@ class Check_points(PreProc):
str(math.ceil(abs(p['z_cut']) / p['z_depthpercut'])) + ' passes' + ')\n'
gcode += '(Z_Move: ' + str(p['z_move']) + units + ')\n'
elif str(p['options']['type']) == 'Excellon' and p['use_ui'] is True:
elif str(p['obj_options']['type']) == 'Excellon' and p['use_ui'] is True:
gcode += '\n(TOOLS DIAMETER: )\n'
for tool, val in p['tools'].items():
gcode += '(Tool: %s -> ' % str(tool) + 'Dia: %s' % str(val["tooldia"]) + ')\n'
@@ -92,7 +92,7 @@ class Check_points(PreProc):
gcode += '(X,Y End: ' + "None" + units + ')\n'
gcode += '(Steps per circle: ' + str(p['steps_per_circle']) + ')\n'
if str(p['options']['type']) == 'Excellon' or str(p['options']['type']) == 'Excellon Geometry':
if str(p['obj_options']['type']) == 'Excellon' or str(p['obj_options']['type']) == 'Excellon Geometry':
gcode += '(Preprocessor Excellon: ' + str(p['pp_excellon_name']) + ')\n' + '\n'
else:
gcode += '(Preprocessor Geometry: ' + str(p['pp_geometry_name']) + ')\n' + '\n'
@@ -140,7 +140,7 @@ class Check_points(PreProc):
if int(p.tool) == 1 and p.startz is not None:
z_toolchange = p.startz
if str(p['options']['type']) == 'Excellon':
if str(p['obj_options']['type']) == 'Excellon':
if toolchangexy is not None:
gcode = """
M5