bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed an issue when exporting huge SVG files from the Film Tool by adding a fallback and using a custom XML parser with the 'huge_tree' option set

Browse Source
This commit is contained in:
Marius Stanciu
2022-10-19 16:59:05 +03:00
committed by Marius
parent 2c229d8677
commit 6509089dc4
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM Evo beta
19.10.2022 19.10.2022
- added a hack so the Gerber files from Allegro 17.2 (which do not follow the Gerber specifications) can be loaded - added a hack so the Gerber files from Allegro 17.2 (which do not follow the Gerber specifications) can be loaded
- fixed an issue when exporting huge SVG files from the Film Tool by adding a fallback and using a custom XML parser with the 'huge_tree' option set
2.10.2022 2.10.2022

23
appPlugins/ToolFilm.py
View File

@@ -707,8 +707,13 @@ class Film(AppTool):
# Change the attributes of the exported SVG # Change the attributes of the exported SVG
# We don't need stroke-width - wrong, we do when we have lines with certain width # We don't need stroke-width - wrong, we do when we have lines with certain width
# We set opacity to maximum # We set opacity to maximum
# We set the color to the inversed color # We set the color to the inverted color
root = ET.fromstring(svg_geo) try:
root = ET.fromstring(svg_geo)
except Exception:
self.app.log.debug("Film.create_negative_svg() getting XML root failed. Trying to use huge_tree option.")
root = ET.fromstring(svg_geo, parser=ET.XMLParser(huge_tree=True))
for child in root: for child in root:
child.set('fill', self.get_complementary(color)) child.set('fill', self.get_complementary(color))
child.set('opacity', str(opacity)) child.set('opacity', str(opacity))
@@ -925,13 +930,17 @@ class Film(AppTool):
make_positive_film(color=color, transparency_level=transparency_level, make_positive_film(color=color, transparency_level=transparency_level,
scale_factor_x=scale_factor_x, scale_factor_y=scale_factor_y) scale_factor_x=scale_factor_x, scale_factor_y=scale_factor_y)
@staticmethod def create_positive_svg(self, svg_geo, box_bounds, margin, color, opacity, svg_units):
def create_positive_svg(svg_geo, box_bounds, margin, color, opacity, svg_units):
# Change the attributes of the exported SVG # Change the attributes of the exported SVG
# We don't need stroke-width # We don't need stroke-width
# We set opacity to maximum # We set opacity to maximum
# We set the colour to WHITE # We set the colour to WHITE
root = ET.fromstring(svg_geo) try:
root = ET.fromstring(svg_geo)
except Exception:
self.app.log.debug("Film.create_positive_svg() getting XML root failed. Trying to use huge_tree option.")
root = ET.fromstring(svg_geo, parser=ET.XMLParser(huge_tree=True))
for child in root: for child in root:
child.set('fill', str(color)) child.set('fill', str(color))
child.set('opacity', str(opacity)) child.set('opacity', str(opacity))
@@ -939,7 +948,7 @@ class Film(AppTool):
exported_svg = ET.tostring(root) exported_svg = ET.tostring(root)
# This contain the measure units # This contains the measure units
uom = svg_units uom = svg_units
# Convert everything to strings for use in the xml doc # Convert everything to strings for use in the xml doc
@@ -1208,7 +1217,7 @@ class Film(AppTool):
if scale_stroke_factor <= 0: if scale_stroke_factor <= 0:
scale_stroke_factor = 0.01 scale_stroke_factor = 0.01
# Convert to a SVG # Convert to a SVG file
svg_elem = geom.svg(scale_factor=scale_stroke_factor) svg_elem = geom.svg(scale_factor=scale_stroke_factor)
return svg_elem return svg_elem