kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Improve color handling of SVG geometry importer

Browse Source 
Handle 'none' color => Default to black (+ print message)
 Handle #RRGGBBAA color => Return alpha (+ print, message)
 Handle 'rgba(float, float, float, float) => Return alpha (+ print message)
 Reorganize function to return ASAP + print warning if unknown color format
This commit is contained in:
0penBrain
2023-04-12 19:44:47 +02:00
parent c77b2f33c2
commit 760f3d7e42
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Mod/Draft/importSVG.py
View File

@@ -244,36 +244,46 @@ def getcolor(color):
(r, g, b, a) (r, g, b, a)
RGBA float tuple, where each value is between 0.0 and 1.0. RGBA float tuple, where each value is between 0.0 and 1.0.
""" """
if color == "none":
FreeCAD.Console.PrintMessage("Color defined as 'none', defaulting to black\n")
return (0.0, 0.0, 0.0, 0.0)
if color[0] == "#": if color[0] == "#":
# Color string '#12ab9f' if len(color) == 7 or len(color) == 9: # Color string '#RRGGBB' or '#RRGGBBAA'
if len(color) == 7:
r = float(int(color[1:3], 16) / 255.0) r = float(int(color[1:3], 16) / 255.0)
g = float(int(color[3:5], 16) / 255.0) g = float(int(color[3:5], 16) / 255.0)
b = float(int(color[5:], 16) / 255.0) b = float(int(color[5:7], 16) / 255.0)
# Color string '#1af' a = 1.0
elif len(color) == 4: if len(color) == 9:
a = float(int(color[7:9], 16) / 255.0)
FreeCAD.Console.PrintMessage(f"Non standard color format #RRGGBBAA : {color}\n")
return (r, g, b, 1-a)
if len(color) == 4: # Color string '#RGB'
# Expand the hex digits # Expand the hex digits
r = float(int(color[1], 16) * 17 / 255.0) r = float(int(color[1], 16) * 17 / 255.0)
g = float(int(color[2], 16) * 17 / 255.0) g = float(int(color[2], 16) * 17 / 255.0)
b = float(int(color[3], 16) * 17 / 255.0) b = float(int(color[3], 16) * 17 / 255.0)
return (r, g, b, 0.0)
# Color string 'rgb(0.12,0.23,0.3,0.0)'
elif color.lower().startswith('rgb('):
cvalues = color[3:].lstrip('(').rstrip(')').replace('%', '').split(',')
if '%' in color:
r, g, b = [int(float(cv)) / 100.0 for cv in cvalues]
else:
r, g, b = [int(float(cv)) / 255.0 for cv in cvalues]
return (r, g, b, 0.0)
# Color string 'MediumAquamarine'
else:
v = svgcolorslower.get(color.lower())
if v:
r, g, b = [float(vf) / 255.0 for vf in v]
return (r, g, b, 0.0) return (r, g, b, 0.0)
# for k, v in svgcolors.items(): if color.lower().startswith('rgb(') or color.lower().startswith('rgba('): # Color string 'rgb[a](0.12,0.23,0.3,0.0)'
# if k.lower() == color.lower(): cvalues = color.lstrip('rgba(').rstrip(')').replace('%', '').split(',')
# pass if len(cvalues) == 3:
a = 1.0
if '%' in color:
r, g, b = [int(float(cv)) / 100.0 for cv in cvalues]
else:
r, g, b = [int(float(cv)) / 255.0 for cv in cvalues]
if len(cvalues) == 4:
if '%' in color:
r, g, b, a = [int(float(cv)) / 100.0 for cv in cvalues]
else:
r, g, b, a = [int(float(cv)) / 255.0 for cv in cvalues]
return (r, g, b, 1-a)
# Trying named color like 'MediumAquamarine'
v = svgcolorslower.get(color.lower())
if v:
r, g, b = [float(vf) / 255.0 for vf in v]
return (r, g, b, 0.0)
FreeCAD.Console.PrintWarning(f"Unknown color format : {color} : defaulting to black\n")
return (0.0, 0.0, 0.0, 0.0)
def transformCopyShape(shape, m): def transformCopyShape(shape, m):