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

- when parsing a new Gerber object, I am "preparing" each geometry added therefore making the Gerber object geometry possible faster to process

Browse Source
This commit is contained in:
Marius Stanciu
2023-04-15 22:15:33 +03:00
parent 6a29bcbe7c
commit 765d7cc05b
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM Evo beta
- changed the shapely imports a bit according to the specifications of Shapely 2.0 - changed the shapely imports a bit according to the specifications of Shapely 2.0
- changed the requirements.txt file to reflect the need for at least Shapely in version 2.0 - changed the requirements.txt file to reflect the need for at least Shapely in version 2.0
- some code leftovers are commented - some code leftovers are commented
- when parsing a new Gerber object, I am "preparing" each geometry added therefore making the Gerber object geometry possible faster to process
08.04.2023 08.04.2023

45
appParsers/ParseGerber.py
View File

@@ -12,7 +12,7 @@ from copy import deepcopy
from shapely.ops import unary_union, linemerge from shapely.ops import unary_union, linemerge
import shapely.affinity as affinity import shapely.affinity as affinity
from shapely import box as shply_box from shapely import box as shply_box
from shapely import LinearRing, MultiLineString, LineString, Polygon, MultiPolygon, Point from shapely import LinearRing, MultiLineString, LineString, Polygon, MultiPolygon, Point, prepare, is_prepared
from lxml import etree as ET from lxml import etree as ET
import ezdxf import ezdxf
@@ -509,6 +509,7 @@ class Gerber(Geometry):
geo_dict = {} geo_dict = {}
geo_f = LineString(path) geo_f = LineString(path)
prepare(geo_f)
if not geo_f.is_empty: if not geo_f.is_empty:
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
@@ -517,6 +518,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
if not geo_s.is_empty and geo_s.is_valid: if not geo_s.is_empty and geo_s.is_valid:
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -737,8 +739,9 @@ class Gerber(Geometry):
if not flash.is_empty: if not flash.is_empty:
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
flash = flash.simplify(s_tol) flash = flash.simplify(s_tol)
poly_buffer.append(flash)
prepare(flash)
poly_buffer.append(flash)
if self.is_lpc is True: if self.is_lpc is True:
geo_dict['clear'] = flash geo_dict['clear'] = flash
else: else:
@@ -788,6 +791,7 @@ class Gerber(Geometry):
else: else:
geo_dict = {} geo_dict = {}
geo_f = LineString(path) geo_f = LineString(path)
prepare(geo_f)
if not geo_f.is_empty: if not geo_f.is_empty:
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
@@ -797,6 +801,7 @@ class Gerber(Geometry):
geo_s = LineString(path).buffer(width / 1.999, int(self.steps_per_circle)) geo_s = LineString(path).buffer(width / 1.999, int(self.steps_per_circle))
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
if not geo_s.is_empty: if not geo_s.is_empty:
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
@@ -855,6 +860,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
pol = pol.simplify(s_tol) pol = pol.simplify(s_tol)
prepare(pol)
poly_buffer.append(pol) poly_buffer.append(pol)
if self.is_lpc is True: if self.is_lpc is True:
geo_dict['clear'] = pol geo_dict['clear'] = pol
@@ -869,6 +875,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
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
@@ -911,6 +918,7 @@ class Gerber(Geometry):
geo_dict = {} geo_dict = {}
if geo_f: if geo_f:
if not geo_f.is_empty: if not geo_f.is_empty:
prepare(geo_f)
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
if geo_s: if geo_s:
@@ -920,6 +928,7 @@ class Gerber(Geometry):
if not geo_s.is_valid: if not geo_s.is_valid:
print("Not valid: ", line_num) print("Not valid: ", line_num)
prepare(geo_s)
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
@@ -974,7 +983,9 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
pol = pol.simplify(s_tol) pol = pol.simplify(s_tol)
prepare(pol)
pol_f = pol.exterior pol_f = pol.exterior
prepare(pol_f)
if not pol_f.is_empty: if not pol_f.is_empty:
follow_buffer.append(pol_f) follow_buffer.append(pol_f)
geo_dict['follow'] = pol geo_dict['follow'] = pol
@@ -995,9 +1006,11 @@ class Gerber(Geometry):
region_f = region_s.exterior region_f = region_s.exterior
if not region_f.is_empty: if not region_f.is_empty:
prepare(region_f)
follow_buffer.append(region_f) follow_buffer.append(region_f)
geo_dict['follow'] = region_f geo_dict['follow'] = region_f
prepare(region_s)
poly_buffer.append(region_s) poly_buffer.append(region_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1014,9 +1027,11 @@ class Gerber(Geometry):
region_f = region_s.exterior region_f = region_s.exterior
if not region_f.is_empty: if not region_f.is_empty:
prepare(region_f)
follow_buffer.append(region_f) follow_buffer.append(region_f)
geo_dict['follow'] = region_f geo_dict['follow'] = region_f
prepare(region_s)
poly_buffer.append(region_s) poly_buffer.append(region_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1111,6 +1126,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
flash = flash.simplify(s_tol) flash = flash.simplify(s_tol)
prepare(flash)
poly_buffer.append(flash) poly_buffer.append(flash)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1140,6 +1156,7 @@ class Gerber(Geometry):
geo_dict = {} geo_dict = {}
geo_f = Point([current_x, current_y]) geo_f = Point([current_x, current_y])
prepare(geo_f)
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
@@ -1147,6 +1164,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1244,6 +1262,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1255,6 +1274,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1312,6 +1332,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1322,6 +1343,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1343,6 +1365,7 @@ class Gerber(Geometry):
# this treats the case when we are storing geometry as paths # this treats the case when we are storing geometry as paths
geo_dict = {} geo_dict = {}
geo_flash = Point([linear_x, linear_y]) geo_flash = Point([linear_x, linear_y])
prepare(geo_flash)
follow_buffer.append(geo_flash) follow_buffer.append(geo_flash)
geo_dict['follow'] = geo_flash geo_dict['follow'] = geo_flash
@@ -1357,6 +1380,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
flash = flash.simplify(s_tol) flash = flash.simplify(s_tol)
prepare(flash)
poly_buffer.append(flash) poly_buffer.append(flash)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1462,6 +1486,7 @@ class Gerber(Geometry):
# this treats the case when we are storing geometry as paths # this treats the case when we are storing geometry as paths
geo_f = LineString(path) geo_f = LineString(path)
if not geo_f.is_empty: if not geo_f.is_empty:
prepare(geo_f)
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
@@ -1471,6 +1496,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
buffered = buffered.simplify(s_tol) buffered = buffered.simplify(s_tol)
prepare(buffered)
poly_buffer.append(buffered) poly_buffer.append(buffered)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1614,6 +1640,7 @@ class Gerber(Geometry):
# this treats the case when we are storing geometry as paths # this treats the case when we are storing geometry as paths
geo_f = LineString(path) geo_f = LineString(path)
if not geo_f.is_empty: if not geo_f.is_empty:
prepare(geo_f)
follow_buffer.append(geo_f) follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f geo_dict['follow'] = geo_f
@@ -1624,6 +1651,7 @@ class Gerber(Geometry):
if self.app.options['gerber_simplification']: if self.app.options['gerber_simplification']:
geo_s = geo_s.simplify(s_tol) geo_s = geo_s.simplify(s_tol)
prepare(geo_s)
poly_buffer.append(geo_s) poly_buffer.append(geo_s)
if self.is_lpc is True: if self.is_lpc is True:
@@ -1683,6 +1711,10 @@ class Gerber(Geometry):
new_poly = new_poly.buffer(0, int(self.steps_per_circle)) new_poly = new_poly.buffer(0, int(self.steps_per_circle))
self.app.log.warning("Union done.") self.app.log.warning("Union done.")
# #########################################################################################################
prepare(new_poly)
# #########################################################################################################
if current_polarity == 'D': if current_polarity == 'D':
self.app.inform.emit('%s' % _("Gerber processing. Applying Gerber polarity.")) self.app.inform.emit('%s' % _("Gerber processing. Applying Gerber polarity."))
if new_poly.is_valid: if new_poly.is_valid:
@@ -1727,6 +1759,13 @@ class Gerber(Geometry):
# flatten the solid geometry # flatten the solid geometry
self.solid_geometry = flatten_shapely_geometry(self.solid_geometry) self.solid_geometry = flatten_shapely_geometry(self.solid_geometry)
# import time
# start = time.time()
# #########################################################################################################
prepare(self.solid_geometry)
# #########################################################################################################
# print(f"Time elapsed: {time.time() - start}; Is prepared? {is_prepared(self.solid_geometry)}")
if self.app.options['gerber_clean_apertures']: if self.app.options['gerber_clean_apertures']:
# clean the Gerber file of apertures with no geometry # clean the Gerber file of apertures with no geometry
for apid, apvalue in list(self.tools.items()): for apid, apvalue in list(self.tools.items()):
@@ -2013,6 +2052,7 @@ class Gerber(Geometry):
} }
for pol in self.solid_geometry: for pol in self.solid_geometry:
prepare(pol)
new_el = {'solid': pol, 'follow': LineString(pol.exterior.coords)} new_el = {'solid': pol, 'follow': LineString(pol.exterior.coords)}
self.tools[0]['geometry'].append(new_el) self.tools[0]['geometry'].append(new_el)
@@ -2070,6 +2110,7 @@ class Gerber(Geometry):
flat_geo = list(self.flatten_list(self.solid_geometry)) flat_geo = list(self.flatten_list(self.solid_geometry))
if flat_geo: if flat_geo:
self.solid_geometry = unary_union(flat_geo) self.solid_geometry = unary_union(flat_geo)
prepare(self.solid_geometry)
self.follow_geometry = self.solid_geometry self.follow_geometry = self.solid_geometry
else: else:
return "fail" return "fail"