3pp-mirror/map-machine
1
0
Fork 0
mirror of https://github.com/enzet/map-machine.git synced 2025-06-05 20:31:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix radial gradient.

Browse source 
The previous one didn't work in Safari.
This commit is contained in:
Sergey Vartanov 2021-10-12 23:57:48 +03:00
parent 3bc101dd77
commit 208e78d167
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
map_machine/figure.py
View file

@ -7,6 +7,7 @@ import numpy as np
from colour import Color from colour import Color
from svgwrite import Drawing from svgwrite import Drawing
from svgwrite.container import Group from svgwrite.container import Group
from svgwrite.gradients import RadialGradient
from svgwrite.path import Path from svgwrite.path import Path
from map_machine.direction import DirectionSet, Sector from map_machine.direction import DirectionSet, Sector
@ -261,16 +262,18 @@ class Tree(Tagged):
def draw(self, svg: Drawing, flinger: Flinger, scheme: Scheme) -> None: def draw(self, svg: Drawing, flinger: Flinger, scheme: Scheme) -> None:
"""Draw crown and trunk.""" """Draw crown and trunk."""
scale: float = flinger.get_scale(self.coordinates) scale: float = flinger.get_scale(self.coordinates)
radius: float
diameter_crown: Optional[float] = self.get_float("diameter_crown") diameter_crown: Optional[float] = self.get_float("diameter_crown")
radius: float
if diameter_crown is not None: if diameter_crown is not None:
radius = float(self.tags["diameter_crown"]) / 2.0 radius = float(self.tags["diameter_crown"]) / 2.0
else: else:
radius = 2.0 radius = 2.0
color: Color = scheme.get_color("evergreen_color") color: Color = scheme.get_color("evergreen_color")
svg.add(svg.circle(self.point, radius * scale, fill=color, opacity=0.3)) svg.add(svg.circle(self.point, radius * scale, fill=color, opacity=0.3))
circumference: Optional[float] = self.get_float("circumference") circumference: Optional[float] = self.get_float("circumference")
if circumference is not None: if circumference is not None:
radius: float = circumference / 2.0 / np.pi radius: float = circumference / 2.0 / np.pi
svg.add(svg.circle(self.point, radius * scale, fill="#B89A74")) svg.add(svg.circle(self.point, radius * scale, fill="#B89A74"))
@ -323,12 +326,13 @@ class DirectionSector(Tagged):
paths = DirectionSet(direction).draw(point, direction_radius) paths = DirectionSet(direction).draw(point, direction_radius)
for path in paths: for path in paths:
radial_gradient = svg.radialGradient( radial_gradient: RadialGradient = svg.radialGradient(
center=point, center=point,
r=direction_radius, r=direction_radius,
gradientUnits="userSpaceOnUse", gradientUnits="userSpaceOnUse",
) )
gradient = svg.defs.add(radial_gradient) gradient: RadialGradient = svg.defs.add(radial_gradient)
if is_revert_gradient: if is_revert_gradient:
( (
gradient gradient
@ -341,16 +345,17 @@ class DirectionSector(Tagged):
.add_stop_color(0, direction_color.hex, opacity=0.4) .add_stop_color(0, direction_color.hex, opacity=0.4)
.add_stop_color(1, direction_color.hex, opacity=0) .add_stop_color(1, direction_color.hex, opacity=0)
) # fmt: skip ) # fmt: skip
path_element: Path = svg.path( path_element: Path = svg.path(
d=["M", point] + path + ["L", point, "Z"], d=["M", point] + path + ["L", point, "Z"],
fill=gradient.get_paint_server(), fill=gradient.get_funciri(),
) )
svg.add(path_element) svg.add(path_element)
class Segment: class Segment:
""" """
Line segment. Closed line segment.
""" """
def __init__(self, point_1: np.ndarray, point_2: np.ndarray) -> None: def __init__(self, point_1: np.ndarray, point_2: np.ndarray) -> None: