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

- in Gerber parser added a fix for Gerber region geometry that is self-intersecting

Browse Source
This commit is contained in:
Marius Stanciu
2021-01-12 14:32:58 +02:00
committed by Marius
parent fabd8188b4
commit 5277905d73
3 changed files with 110 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
================================================= =================================================
12.01.2021
- in Gerber parser added a fix for Gerber region geometry that is self-intersecting
11.01.2021 11.01.2021
- working on Tool Follow, Milling Tool, camlib to adapt them to the new changes in the Geometry Object - working on Tool Follow, Milling Tool, camlib to adapt them to the new changes in the Geometry Object

2
appEditors/AppGeoEditor.py
View File

@@ -5273,7 +5273,7 @@ class AppGeoEditor(QtCore.QObject):
self.select_tool("select") self.select_tool("select")
if self.app.defaults['geometry_spindledir'] == 'CW': if self.app.defaults['tools_mill_spindledir'] == 'CW':
if self.app.defaults['geometry_editor_milling_type'] == 'cl': if self.app.defaults['geometry_editor_milling_type'] == 'cl':
milling_type = 1 # CCW motion = climb milling (spindle is rotating CW) milling_type = 1 # CCW motion = climb milling (spindle is rotating CW)
else: else:

133
appParsers/ParseGerber.py
View File

@@ -790,22 +790,48 @@ class Gerber(Geometry):
# --- Buffered ---- # --- Buffered ----
width = self.apertures[last_path_aperture]["size"] width = self.apertures[last_path_aperture]["size"]
geo_s = LineString(path).buffer(width / 1.999, int(self.steps_per_circle / 4)) geo_s = LineString(path).buffer(width / 1.999, int(self.steps_per_circle / 4))
if not geo_s.is_valid:
self.app.log.warning(
"Found invalid Gerber geometry at line: %s. Fixing..." % str(line_num))
geo_s = geo_s.buffer(0.0000001, int(self.steps_per_circle))
if not geo_s.is_empty: if not geo_s.is_valid:
if self.app.defaults['gerber_simplification']: self.app.log.warning(
geo_s = geo_s.simplify(s_tol) "Failed to fix the invalid Geometry found at line: %s" % str(line_num))
else:
if last_path_aperture not in self.apertures:
self.apertures[last_path_aperture] = {}
if 'geometry' not in self.apertures[last_path_aperture]:
self.apertures[last_path_aperture]['geometry'] = []
try:
for pol in geo_s:
if not pol.is_empty:
# is it possible that simplification creates an Empty Geometry ?????
if self.app.defaults['gerber_simplification']:
pol = pol.simplify(s_tol)
poly_buffer.append(geo_s) poly_buffer.append(pol)
if self.is_lpc is True: if self.is_lpc is True:
geo_dict['clear'] = geo_s geo_dict['clear'] = pol
else: else:
geo_dict['solid'] = geo_s geo_dict['solid'] = pol
if last_path_aperture not in self.apertures: if not pol.is_empty:
self.apertures[last_path_aperture] = {} self.apertures[last_path_aperture]['geometry'].append(deepcopy(geo_dict))
if 'geometry' not in self.apertures[last_path_aperture]: except TypeError:
self.apertures[last_path_aperture]['geometry'] = [] if not geo_s.is_empty:
self.apertures[last_path_aperture]['geometry'].append(deepcopy(geo_dict)) # is it possible that simplification creates an Empty Geometry ?????
if self.app.defaults['gerber_simplification']:
geo_s = geo_s.simplify(s_tol)
poly_buffer.append(geo_s)
if self.is_lpc is True:
geo_dict['clear'] = geo_s
else:
geo_dict['solid'] = geo_s
if not geo_s.is_empty:
self.apertures[last_path_aperture]['geometry'].append(deepcopy(geo_dict))
path = [path[-1]] path = [path[-1]]
@@ -844,6 +870,8 @@ class Gerber(Geometry):
if self.app.defaults['gerber_simplification']: if self.app.defaults['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
if not geo_s.is_valid:
print("Not valid: ", line_num)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
geo_dict['clear'] = geo_s geo_dict['clear'] = geo_s
@@ -880,27 +908,76 @@ class Gerber(Geometry):
else: else:
region_geo = Polygon(path) region_geo = Polygon(path)
region_f = region_geo.exterior
if not region_f.is_empty:
follow_buffer.append(region_f)
geo_dict['follow'] = region_f
region_s = region_geo region_s = region_geo
if not region_s.is_valid:
region_s = region_s.buffer(0, int(self.steps_per_circle))
if not region_s.is_empty: if not region_s.is_empty:
if self.app.defaults['gerber_simplification']: if not region_s.is_valid:
region_s = region_s.simplify(s_tol) self.app.log.warning(
"Found invalid Gerber geometry at line: %s. Fixing..." % str(line_num))
region_s = region_s.buffer(0.0000001, int(self.steps_per_circle))
poly_buffer.append(region_s) if not region_s.is_valid:
self.app.log.warning(
"Failed to fix the invalid Geometry found at line: %s" % str(line_num))
else:
try:
for pol in region_s:
# is it possible that simplification creates an Empty Geometry ?????
if self.app.defaults['gerber_simplification']:
pol = pol.simplify(s_tol)
if self.is_lpc is True: pol_f = pol.exterior
geo_dict['clear'] = region_s if not pol_f.is_empty:
follow_buffer.append(pol_f)
geo_dict['follow'] = pol
poly_buffer.append(pol)
if self.is_lpc is True:
geo_dict['clear'] = pol
else:
geo_dict['solid'] = pol
if not pol.is_empty:
self.apertures['0']['geometry'].append(deepcopy(geo_dict))
except TypeError:
# is it possible that simplification creates an Empty Geometry ?????
if self.app.defaults['gerber_simplification']:
region_s = region_s.simplify(s_tol)
region_f = region_s.exterior
if not region_f.is_empty:
follow_buffer.append(region_f)
geo_dict['follow'] = region_f
poly_buffer.append(region_s)
if self.is_lpc is True:
geo_dict['clear'] = region_s
else:
geo_dict['solid'] = region_s
if not region_s.is_empty:
self.apertures['0']['geometry'].append(deepcopy(geo_dict))
else: else:
geo_dict['solid'] = region_s # is it possible that simplification creates an Empty Geometry ?????
if self.app.defaults['gerber_simplification']:
region_s = region_s.simplify(s_tol)
if not region_s.is_empty or not region_f.is_empty: region_f = region_s.exterior
self.apertures['0']['geometry'].append(deepcopy(geo_dict)) if not region_f.is_empty:
follow_buffer.append(region_f)
geo_dict['follow'] = region_f
poly_buffer.append(region_s)
if self.is_lpc is True:
geo_dict['clear'] = region_s
else:
geo_dict['solid'] = region_s
if not region_s.is_empty:
self.apertures['0']['geometry'].append(deepcopy(geo_dict))
path = [[current_x, current_y]] # Start new path path = [[current_x, current_y]] # Start new path
continue continue