Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

A little cleanup

Browse Source
This commit is contained in:
Robin Dunn
2019-08-07 12:39:45 -07:00
committed by Robin Dunn
parent 6b5adab03f
commit 7d7c66920d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wx/svg/__init__.py
View File

@@ -17,8 +17,9 @@ from six.moves import zip_longest
from ._version import __version__ from ._version import __version__
from ._nanosvg import * from ._nanosvg import *
_RenderersWithoutGradientTransforms = [ #'wxGDIPlusRenderer', # All the supported renderers now support gradient transforms, more or less, but
] # let's leave this in place in case it's needed again in the future.
_RenderersWithoutGradientTransforms = []
class SVGimage(SVGimageBase): class SVGimage(SVGimageBase):
""" """
@@ -84,7 +85,7 @@ class SVGimage(SVGimageBase):
path = ctx.CreatePath() path = ctx.CreatePath()
x, y = points[0] x, y = points[0]
path.MoveToPoint(x,y) path.MoveToPoint(x,y)
for (cx1, cy1), (cx2, cy2), (x,y) in _grouper(points[1:], 3, (0,0)): for (cx1, cy1), (cx2, cy2), (x,y) in _chunker(points[1:], 3, (0,0)):
path.AddCurveToPoint(cx1, cy1, cx2, cy2, x,y) path.AddCurveToPoint(cx1, cy1, cx2, cy2, x,y)
if svg_path.closed: if svg_path.closed:
path.CloseSubpath() path.CloseSubpath()
@@ -204,7 +205,6 @@ class SVGimage(SVGimageBase):
matrix.Invert() matrix.Invert()
x1, y1 = matrix.TransformPoint(x1, y1) x1, y1 = matrix.TransformPoint(x1, y1)
x2, y2 = matrix.TransformPoint(x2, y2) x2, y2 = matrix.TransformPoint(x2, y2)
#print('(x1,y1), (x2,y2):', (x1,y1), (x2,y2))
matrix = wx.NullGraphicsMatrix matrix = wx.NullGraphicsMatrix
stops = self._makeGradientStops(gradient) stops = self._makeGradientStops(gradient)
@@ -223,7 +223,6 @@ class SVGimage(SVGimageBase):
cx, cy = matrix.TransformPoint(cx, cy) cx, cy = matrix.TransformPoint(cx, cy)
r1, r2 = matrix.TransformPoint(0, 1) r1, r2 = matrix.TransformPoint(0, 1)
radius = r2 - cy radius = r2 - cy
#print("(cx, cy) radius:",(cx, cy), radius)
matrix = wx.NullGraphicsMatrix matrix = wx.NullGraphicsMatrix
stops = self._makeGradientStops(gradient) stops = self._makeGradientStops(gradient)
@@ -235,7 +234,7 @@ class SVGimage(SVGimageBase):
return pen return pen
def _grouper(iterable, n, fillvalue=None): def _chunker(iterable, n, fillvalue=None):
"Collect items from an interable into fixed-length chunks or blocks" "Collect items from an interable into fixed-length chunks or blocks"
args = [iter(iterable)] * n args = [iter(iterable)] * n
return zip_longest(fillvalue=fillvalue, *args) return zip_longest(fillvalue=fillvalue, *args)