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

- in Gerber Object trying to solve the issue with too little details on plotting geometry with inch units

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-27 15:22:27 +03:00
committed by Marius
parent 0cee20a6d9
commit 89426e8ac3
5 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
appParsers/ParseGerber.py
View File

@@ -508,7 +508,7 @@ class Gerber(Geometry):
follow_buffer.append(geo_f)
geo_dict['follow'] = geo_f
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))
if self.app.defaults['gerber_simplification']:
geo_s = geo_s.simplify(s_tol)
if not geo_s.is_empty and geo_s.is_valid:
@@ -789,7 +789,7 @@ class Gerber(Geometry):
# --- Buffered ----
width = self.tools[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))
if self.app.defaults['gerber_simplification']:
geo_s = geo_s.simplify(s_tol)
if not geo_s.is_empty:
@@ -829,7 +829,7 @@ class Gerber(Geometry):
# --- Buffered ----
width = self.tools[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))
if not geo_s.is_valid:
self.app.log.warning(
"Found invalid Gerber geometry at line: %s. Fixing..." % str(line_num))
@@ -1228,7 +1228,7 @@ class Gerber(Geometry):
self.app.log.warning("No aperture defined for curent path. (%d)" % line_num)
# TODO: this may (should) fail
width = self.tools[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))
try:
if self.tools[last_path_aperture]["type"] != 'R':
@@ -1297,7 +1297,7 @@ class Gerber(Geometry):
# this treats the case when we are storing geometry as solids
width = self.tools[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))
if not geo_s.is_empty:
try:
if self.tools[last_path_aperture]["type"] != 'R':
@@ -1610,7 +1610,7 @@ class Gerber(Geometry):
# this treats the case when we are storing geometry as solids
width = self.tools[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))
if not geo_s.is_empty:
if self.app.defaults['gerber_simplification']:
geo_s = geo_s.simplify(s_tol)
@@ -1671,7 +1671,7 @@ class Gerber(Geometry):
else:
self.app.log.debug("Union by union()...")
new_poly = unary_union(poly_buffer)
new_poly = new_poly.buffer(0, int(self.steps_per_circle / 4))
new_poly = new_poly.buffer(0, int(self.steps_per_circle))
self.app.log.warning("Union done.")
if current_polarity == 'D':
@@ -1749,7 +1749,7 @@ class Gerber(Geometry):
location = Point(location)
if aperture['type'] == 'C': # Circles
return location.buffer(aperture['size'] / 2, int(steps_per_circle / 4))
return location.buffer(aperture['size'] / 2, int(steps_per_circle))
if aperture['type'] == 'R': # Rectangles
loc = location.coords[0]
@@ -1768,13 +1768,13 @@ class Gerber(Geometry):
if width > height:
p1 = Point(loc[0] + 0.5 * (width - height), loc[1])
p2 = Point(loc[0] - 0.5 * (width - height), loc[1])
c1 = p1.buffer(height * 0.5, int(steps_per_circle / 4))
c2 = p2.buffer(height * 0.5, int(steps_per_circle / 4))
c1 = p1.buffer(height * 0.5, int(steps_per_circle))
c2 = p2.buffer(height * 0.5, int(steps_per_circle))
else:
p1 = Point(loc[0], loc[1] + 0.5 * (height - width))
p2 = Point(loc[0], loc[1] - 0.5 * (height - width))
c1 = p1.buffer(width * 0.5, int(steps_per_circle / 4))
c2 = p2.buffer(width * 0.5, int(steps_per_circle / 4))
c1 = p1.buffer(width * 0.5, int(steps_per_circle))
c2 = p2.buffer(width * 0.5, int(steps_per_circle))
return unary_union([c1, c2]).convex_hull
if aperture['type'] == 'P': # Regular polygon