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

- upgrade to use the new notations in the Shapely's buffer method for the cap_style and join_style parameters (used to be integers, now they are strings or defines)

Browse Source
This commit is contained in:
Marius Stanciu
2025-03-05 01:49:19 +02:00
parent bc3fb8fdee
commit 3f504e86c6
19 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
camlib.py
View File

@@ -271,7 +271,7 @@ class ApertureMacro:
# pol, width, xs, ys, xe, ye, angle = ApertureMacro.default2zero(7, mods)
line = LineString([(xs, ys), (xe, ye)])
box = line.buffer(width / 2, cap_style=2)
box = line.buffer(width / 2, cap_style="flat")
box_rotated = affinity.rotate(box, angle, origin=(0, 0))
return {"pol": int(pol), "geometry": box_rotated}
@@ -439,8 +439,8 @@ class ApertureMacro:
i += 1
# ## Crosshair
hor = LineString([(x - cross_len, y), (x + cross_len, y)]).buffer(cross_th / 2.0, cap_style=2)
ver = LineString([(x, y - cross_len), (x, y + cross_len)]).buffer(cross_th / 2.0, cap_style=2)
hor = LineString([(x - cross_len, y), (x + cross_len, y)]).buffer(cross_th / 2.0, cap_style="flat")
ver = LineString([(x, y - cross_len), (x, y + cross_len)]).buffer(cross_th / 2.0, cap_style="flat")
result = unary_union([result, hor, ver])
return {"pol": 1, "geometry": result}
@@ -466,8 +466,8 @@ class ApertureMacro:
# angle = val[5]
ring = Point((x, y)).buffer(dout / 2.0).difference(Point((x, y)).buffer(din / 2.0))
hline = LineString([(x - dout / 2.0, y), (x + dout / 2.0, y)]).buffer(t / 2.0, cap_style=3)
vline = LineString([(x, y - dout / 2.0), (x, y + dout / 2.0)]).buffer(t / 2.0, cap_style=3)
hline = LineString([(x - dout / 2.0, y), (x + dout / 2.0, y)]).buffer(t / 2.0, cap_style="square")
vline = LineString([(x, y - dout / 2.0), (x, y + dout / 2.0)]).buffer(t / 2.0, cap_style="square")
thermal = ring.difference(hline.union(vline))
return {"pol": 1, "geometry": thermal}
@@ -1134,7 +1134,7 @@ class Geometry(object):
old_disp_number = 0
pol_nr = 0
# yet, it can be done by issuing an unary_union in the end, thus getting rid of the overlapping geo
# yet, it can be done by issuing a unary_union in the end, thus getting rid of the overlapping geo
for pol in working_geo_shp:
if self.app.abort_flag:
# graceful abort requested by the user
@@ -1142,7 +1142,7 @@ class Geometry(object):
if offset == 0:
temp_geo = pol
else:
corner_type = 1 if corner is None else corner
corner_type = "round" if corner is None else corner
temp_geo = pol.buffer(offset, int(self.geo_steps_per_circle), join_style=corner_type)
geo_iso.append(temp_geo)
@@ -2648,7 +2648,7 @@ class Geometry(object):
"""
:param distance: if 'factor' is True then distance is the scale factor for each geometric element
:param join: The kind of join used by the shapely buffer method: round, square or bevel
:param join: The kind of join used by the shapely buffer method: round, mitre or bevel
:param factor: True or False (None)
:param only_exterior: Bool. If True, the LineStrings are buffered only on the outside
:param muted: Bool. If True no messages are created.
@@ -3784,14 +3784,14 @@ class CNCjob(Geometry):
if isinstance(it, LineString):
if it.is_ring:
it = Polygon(it)
temp_solid_geometry.append(it.buffer(tool_offset, join_style=2))
temp_solid_geometry.append(it.buffer(tool_offset, join_style="mitre"))
for it in flat_ints_geo:
# if the geometry is a closed shape then create a Polygon out of it
if isinstance(it, (LineString, LinearRing)):
if it.is_ring:
it = Polygon(it)
temp_solid_geometry.append(it.buffer(-tool_offset, join_style=2))
temp_solid_geometry.append(it.buffer(-tool_offset, join_style="mitre"))
temp_solid_geometry = self.flatten(temp_solid_geometry, reset=True, pathonly=True)
else:
@@ -4955,7 +4955,7 @@ class CNCjob(Geometry):
c = it.coords
if c[0] == c[-1]:
it = Polygon(it)
temp_solid_geometry.append(it.buffer(offset, join_style=2))
temp_solid_geometry.append(it.buffer(offset, join_style="mitre"))
else:
temp_solid_geometry = geometry
@@ -5357,14 +5357,14 @@ class CNCjob(Geometry):
if isinstance(it, LineString):
if it.is_ring:
it = Polygon(it)
temp_solid_geometry.append(it.buffer(offset_for_use, join_style=2))
temp_solid_geometry.append(it.buffer(offset_for_use, join_style="mitre"))
for it in flat_ints_geo:
# if the geometry is a closed shape then create a Polygon out of it
if isinstance(it, (LineString, LinearRing)):
if it.is_ring:
it = Polygon(it)
temp_solid_geometry.append(it.buffer(-offset_for_use, join_style=2))
temp_solid_geometry.append(it.buffer(-offset_for_use, join_style="mitre"))
temp_solid_geometry = self.flatten(temp_solid_geometry, reset=True, pathonly=True)
else: