Skip to content

tools/generate_pdcs: Implement group/layer inheritence when converting from svg #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tools/generate_pdcs: Implement group/layer inheritence when converting from svg #289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions tools/generate_pdcs/svg2commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@

xmlns = '{http://www.w3.org/2000/svg}'

# The most used color names
WEB_COLORS = {
'black': '000000',
'white': 'ffffff'
}

def get_viewbox(root):
try:
Expand Down Expand Up @@ -55,10 +60,16 @@ def get_translate(group):


def parse_color(color, opacity, truncate):
if color is None or color[0] != '#':
if not color is None and color[0] == '#':
hex_color = color[1:7]
if len(hex_color) != 6:
hex_color = ''.join([hex_color[0], hex_color[0], hex_color[1], hex_color[1], hex_color[2], hex_color[2]])
elif not color is None and color.lower() in WEB_COLORS:
hex_color = WEB_COLORS[color]
else:
return 0

rgb = int(color[1:7], 16)
rgb = int(hex_color, 16)
r, g, b = (rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF
a = int(opacity * 255)

Expand Down Expand Up @@ -190,17 +201,18 @@ def parse_rect(element, translate, stroke_width, stroke_color, fill_color, verbo


def create_command(translate, element, verbose=False, precise=False, raise_error=False,
truncate_color=True):
truncate_color=True, inherited_values={}):
values = overwrite_inherited(element, inherited_values)
try:
stroke_width = int(element.get('stroke-width'))
stroke_width = int(values.get('stroke-width'))
except TypeError:
stroke_width = 1
except ValueError:
stroke_width = 0

stroke_color = parse_color(element.get('stroke'), calc_opacity(element.get('stroke-opacity'),
element.get('opacity')), truncate_color)
fill_color = parse_color(element.get('fill'), calc_opacity(element.get('fill-opacity'), element.get('opacity')),
stroke_color = parse_color(values.get('stroke'), calc_opacity(values.get('stroke-opacity'),
values.get('opacity')), truncate_color)
fill_color = parse_color(values.get('fill'), calc_opacity(values.get('fill-opacity'), values.get('opacity')),
truncate_color)

if stroke_color == 0 and fill_color == 0:
Expand All @@ -226,8 +238,19 @@ def create_command(translate, element, verbose=False, precise=False, raise_error
return None


def overwrite_inherited(element, inherited_values):
for attr in ['stroke', 'stroke-width', 'stroke-opacity', 'fill', 'fill-opacity', 'opacity']:
if not element.get(attr) is None:
if attr == 'opacity' and attr in inherited_values:
# Opacity compounds
inherited_values[attr] = inherited_values[attr] * element.get(attr)
else:
inherited_values[attr] = element.get(attr)
return inherited_values


def get_commands(translate, group, verbose=False, precise=False, raise_error=False,
truncate_color=True):
truncate_color=True, inherited_values={}):
commands = []
error = False
for child in list(group):
Expand All @@ -243,14 +266,15 @@ def get_commands(translate, group, verbose=False, precise=False, raise_error=Fal
# traverse tree of nested layers or groups
if tag == 'layer' or tag == 'g':
translate += get_translate(child)
inherited_values = overwrite_inherited(child, inherited_values)
cmd_list, err = get_commands(translate, child, verbose, precise, raise_error,
truncate_color)
truncate_color, inherited_values)
commands += cmd_list
if err:
error = True
else:
try:
c = create_command(translate, child, verbose, precise, raise_error, truncate_color)
c = create_command(translate, child, verbose, precise, raise_error, truncate_color, inherited_values)
if c is not None:
commands.append(c)
except pebble_commands.InvalidPointException:
Expand Down
Loading