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

- Gerber Export is fixed to work with the new Gerber object data structure and it now works also for Gerber objects edited in Gerber Editor

Browse Source
This commit is contained in:
Marius Stanciu
2019-05-15 02:29:33 +03:00
parent 8679cbbcda
commit c70309e802
3 changed files with 136 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
FlatCAMObj.py
View File

@@ -1304,58 +1304,87 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
try: try:
length = whole + fract length = whole + fract
if '0' in self.apertures: if '0' in self.apertures:
if 'solid_geometry' in self.apertures['0']: if 'geometry' in self.apertures['0']:
for geo in self.apertures['0']['solid_geometry']: for geo_elem in self.apertures['0']['geometry']:
gerber_code += 'G36*\n' if 'solid' in geo_elem:
geo_coords = list(geo.exterior.coords) geo = geo_elem['solid']
# first command is a move with pen-up D02 at the beginning of the geo gerber_code += 'G36*\n'
if g_zeros == 'T': geo_coords = list(geo.exterior.coords)
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor) # first command is a move with pen-up D02 at the beginning of the geo
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
for coord in geo_coords[1:]:
if g_zeros == 'T': if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor) x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor) x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
gerber_code += 'D02*\n' for coord in geo_coords[1:]:
gerber_code += 'G37*\n'
clear_list = list(geo.interiors)
if clear_list:
gerber_code += '%LPC*%\n'
for clear_geo in clear_list:
gerber_code += 'G36*\n'
geo_coords = list(clear_geo.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T': if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor) x_formatted, y_formatted = tz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor) x_formatted, y_formatted = lz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
for coord in geo_coords[1:]: gerber_code += 'D02*\n'
gerber_code += 'G37*\n'
clear_list = list(geo.interiors)
if clear_list:
gerber_code += '%LPC*%\n'
for clear_geo in clear_list:
gerber_code += 'G36*\n'
geo_coords = list(clear_geo.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T': if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor) x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor) x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
gerber_code += 'D02*\n' for coord in geo_coords[1:]:
gerber_code += 'G37*\n' if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
gerber_code += 'D02*\n'
gerber_code += 'G37*\n'
gerber_code += '%LPD*%\n'
if 'clear' in geo_elem:
geo = geo_elem['clear']
gerber_code += '%LPC*%\n'
gerber_code += 'G36*\n'
geo_coords = list(geo.exterior.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
for coord in geo_coords[1:]:
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
gerber_code += 'D02*\n'
gerber_code += 'G37*\n'
gerber_code += '%LPD*%\n' gerber_code += '%LPD*%\n'
for apid in self.apertures: for apid in self.apertures:
@@ -1363,71 +1392,77 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
continue continue
else: else:
gerber_code += 'D%s*\n' % str(apid) gerber_code += 'D%s*\n' % str(apid)
if 'geometry' in self.apertures[apid]:
for geo_elem in self.apertures[apid]['geometry']:
if 'follow' in geo_elem:
geo = geo_elem['follow']
if geo.is_empty:
continue
if 'follow_geometry' in self.apertures[apid]: if isinstance(geo, Point):
for geo in self.apertures[apid]['follow_geometry']:
if isinstance(geo, Point):
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted)
else:
geo_coords = list(geo.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
for coord in geo_coords[1:]:
if g_zeros == 'T': if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor) x_formatted, y_formatted = tz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor) x_formatted, y_formatted = lz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
if 'clear_follow_geometry' in self.apertures[apid]:
gerber_code += '%LPC*%\n'
for geo in self.apertures[apid]['clear_follow_geometry']:
if isinstance(geo, Point):
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(geo.x, geo.y, factor) geo_coords = list(geo.coords)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted, # first command is a move with pen-up D02 at the beginning of the geo
yform=y_formatted)
else:
geo_coords = list(geo.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
for coord in geo_coords[1:]:
if g_zeros == 'T': if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor) x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
else: else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor) x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted, gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted) yform=y_formatted)
gerber_code += '%LPD*%\n' for coord in geo_coords[1:]:
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
if 'clear' in geo_elem:
gerber_code += '%LPC*%\n'
geo = geo_elem['clear']
if isinstance(geo, Point):
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo.x, geo.y, factor)
gerber_code += "X{xform}Y{yform}D03*\n".format(xform=x_formatted,
yform=y_formatted)
else:
geo_coords = list(geo.coords)
# first command is a move with pen-up D02 at the beginning of the geo
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(geo_coords[0][0], geo_coords[0][1], factor)
gerber_code += "X{xform}Y{yform}D02*\n".format(xform=x_formatted,
yform=y_formatted)
for coord in geo_coords[1:]:
if g_zeros == 'T':
x_formatted, y_formatted = tz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
else:
x_formatted, y_formatted = lz_format(coord[0], coord[1], factor)
gerber_code += "X{xform}Y{yform}D01*\n".format(xform=x_formatted,
yform=y_formatted)
gerber_code += '%LPD*%\n'
except Exception as e: except Exception as e:
log.debug("FlatCAMObj.FlatCAMGerber.export_gerber() --> %s" % str(e)) log.debug("FlatCAMObj.FlatCAMGerber.export_gerber() --> %s" % str(e))

1
README.md
View File

@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
- rewrited the Gerber Parser in camlib - success - rewrited the Gerber Parser in camlib - success
- moved the self.apertures[aperture]['geometry'] processing for clear_geometry (geometry made with Gerber LPC command) in Gerber Editor - moved the self.apertures[aperture]['geometry'] processing for clear_geometry (geometry made with Gerber LPC command) in Gerber Editor
- Gerber Editor: fixed the Poligonize Tool to work with new geometric structure and took care of a special case - Gerber Editor: fixed the Poligonize Tool to work with new geometric structure and took care of a special case
- Gerber Export is fixed to work with the new Gerber object data structure and it now works also for Gerber objects edited in Gerber Editor
12.05.2019 12.05.2019

5
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -3468,6 +3468,11 @@ class FlatCAMGrbEditor(QtCore.QObject):
else: else:
new_geo_el['follow'] = geometric_data['follow'] new_geo_el['follow'] = geometric_data['follow']
follow_buffer.append(deepcopy(new_geo_el['follow'])) follow_buffer.append(deepcopy(new_geo_el['follow']))
else:
if 'solid' in geometric_data:
geo_f = geometric_data['solid'].exterior
new_geo_el['follow'] = geo_f
follow_buffer.append(deepcopy(new_geo_el['follow']))
if 'clear' in geometric_data: if 'clear' in geometric_data:
new_geo_el['clear'] = geometric_data['clear'] new_geo_el['clear'] = geometric_data['clear']