giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed QrCode Tool

This commit is contained in:
Marius Stanciu 2020-10-19 17:45:50 +03:00
parent 408327e48f
commit 85640f2304
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
19.10.2020
- added a check (and added to Preferences too) for the verification of tools validity in the Isolation Tool
- fixed QrCode Tool
18.10.2020

27
appParsers/ParseSVG.py
View File

@ -228,8 +228,10 @@ def svgrect2shapely(rect, n_points=32, factor=1.0):
else:
y = 0
rxstr = rect.get('rx') * factor
rystr = rect.get('ry') * factor
rxstr = rect.get('rx')
rxstr = rxstr * factor if rxstr else rxstr
rystr = rect.get('ry')
rystr = rystr * factor if rystr else rystr
if rxstr is None and rystr is None: # Sharp corners
pts = [
@ -290,9 +292,12 @@ def svgcircle2shapely(circle, n_points=64, factor=1.0):
# cx = float(circle.get('cx'))
# cy = float(circle.get('cy'))
# r = float(circle.get('r'))
cx = svgparselength(circle.get('cx'))[0] * factor # TODO: No units support yet
cy = svgparselength(circle.get('cy'))[0] * factor # TODO: No units support yet
r = svgparselength(circle.get('r'))[0] * factor # TODO: No units support yet
cx = svgparselength(circle.get('cx'))[0] # TODO: No units support yet
cx = cx * factor if cx else cx
cy = svgparselength(circle.get('cy'))[0] # TODO: No units support yet
cy = cy * factor if cy else cy
r = svgparselength(circle.get('r'))[0] # TODO: No units support yet
r = r * factor if r else r
return Point(cx, cy).buffer(r, resolution=n_points)
@ -309,11 +314,15 @@ def svgellipse2shapely(ellipse, n_points=64, factor=1.0):
:rtype: shapely.geometry.polygon.LinearRing
"""
cx = svgparselength(ellipse.get('cx'))[0] * factor # TODO: No units support yet
cy = svgparselength(ellipse.get('cy'))[0] * factor # TODO: No units support yet
cx = svgparselength(ellipse.get('cx'))[0] # TODO: No units support yet
cx = cx * factor if cx else cx
cy = svgparselength(ellipse.get('cy'))[0] # TODO: No units support yet
cy = cy * factor if cy else cy
rx = svgparselength(ellipse.get('rx'))[0] * factor # TODO: No units support yet
ry = svgparselength(ellipse.get('ry'))[0] * factor # TODO: No units support yet
rx = svgparselength(ellipse.get('rx'))[0] # TODO: No units support yet
rx = rx * factor if rx else rx
ry = svgparselength(ellipse.get('ry'))[0] # TODO: No units support yet
ry = ry * factor if ry else ry
t = np.arange(n_points, dtype=float) / n_points
x = cx + rx * np.cos(2 * np.pi * t)

1
appTools/ToolQRCode.py
View File

@ -430,7 +430,6 @@ class QRCode(AppTool):
units = self.app.defaults['units'] if units is None else units
res = self.app.defaults['geometry_circle_steps']
factor = svgparse_viewbox(svg_root)
geos = getsvggeo(svg_root, object_type, units=units, res=res, factor=factor)
if flip: