- fixed QrCode Tool
This commit is contained in:
parent
408327e48f
commit
85640f2304
|
@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
|
||||||
19.10.2020
|
19.10.2020
|
||||||
|
|
||||||
- added a check (and added to Preferences too) for the verification of tools validity in the Isolation Tool
|
- added a check (and added to Preferences too) for the verification of tools validity in the Isolation Tool
|
||||||
|
- fixed QrCode Tool
|
||||||
|
|
||||||
18.10.2020
|
18.10.2020
|
||||||
|
|
||||||
|
|
|
@ -228,8 +228,10 @@ def svgrect2shapely(rect, n_points=32, factor=1.0):
|
||||||
else:
|
else:
|
||||||
y = 0
|
y = 0
|
||||||
|
|
||||||
rxstr = rect.get('rx') * factor
|
rxstr = rect.get('rx')
|
||||||
rystr = rect.get('ry') * factor
|
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
|
if rxstr is None and rystr is None: # Sharp corners
|
||||||
pts = [
|
pts = [
|
||||||
|
@ -290,9 +292,12 @@ def svgcircle2shapely(circle, n_points=64, factor=1.0):
|
||||||
# cx = float(circle.get('cx'))
|
# cx = float(circle.get('cx'))
|
||||||
# cy = float(circle.get('cy'))
|
# cy = float(circle.get('cy'))
|
||||||
# r = float(circle.get('r'))
|
# r = float(circle.get('r'))
|
||||||
cx = svgparselength(circle.get('cx'))[0] * factor # TODO: No units support yet
|
cx = svgparselength(circle.get('cx'))[0] # TODO: No units support yet
|
||||||
cy = svgparselength(circle.get('cy'))[0] * factor # TODO: No units support yet
|
cx = cx * factor if cx else cx
|
||||||
r = svgparselength(circle.get('r'))[0] * factor # TODO: No units support yet
|
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)
|
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
|
:rtype: shapely.geometry.polygon.LinearRing
|
||||||
"""
|
"""
|
||||||
|
|
||||||
cx = svgparselength(ellipse.get('cx'))[0] * factor # TODO: No units support yet
|
cx = svgparselength(ellipse.get('cx'))[0] # TODO: No units support yet
|
||||||
cy = svgparselength(ellipse.get('cy'))[0] * factor # 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
|
rx = svgparselength(ellipse.get('rx'))[0] # TODO: No units support yet
|
||||||
ry = svgparselength(ellipse.get('ry'))[0] * factor # 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
|
t = np.arange(n_points, dtype=float) / n_points
|
||||||
x = cx + rx * np.cos(2 * np.pi * t)
|
x = cx + rx * np.cos(2 * np.pi * t)
|
||||||
|
|
|
@ -430,7 +430,6 @@ class QRCode(AppTool):
|
||||||
units = self.app.defaults['units'] if units is None else units
|
units = self.app.defaults['units'] if units is None else units
|
||||||
res = self.app.defaults['geometry_circle_steps']
|
res = self.app.defaults['geometry_circle_steps']
|
||||||
factor = svgparse_viewbox(svg_root)
|
factor = svgparse_viewbox(svg_root)
|
||||||
|
|
||||||
geos = getsvggeo(svg_root, object_type, units=units, res=res, factor=factor)
|
geos = getsvggeo(svg_root, object_type, units=units, res=res, factor=factor)
|
||||||
|
|
||||||
if flip:
|
if flip:
|
||||||
|
|
Loading…
Reference in New Issue