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

- fixed Film Plugin (Tool) negative generation to have the black background in sync with the actual geometry when transformations are applied

Browse Source 
- fixed Film Plugin (Tool) to have mirroring done only with reference 'center' regardless of what is selected in the UI
- in Film Plugin now multiple adjustments can be applied at the same time and correctly
This commit is contained in:
Marius
2021-06-19 15:44:40 +03:00
parent ba59e9ed58
commit 91bdcf674e
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
camlib.py
View File

@@ -2355,26 +2355,26 @@ class Geometry(object):
geom = geom_svg
if scale_factor_x and not scale_factor_y:
geom = affinity.scale(geom_svg, scale_factor_x, 1.0, origin=scale_ref)
geom = affinity.scale(geom, scale_factor_x, 1.0, origin=scale_ref)
elif not scale_factor_x and scale_factor_y:
geom = affinity.scale(geom_svg, 1.0, scale_factor_y, origin=scale_ref)
geom = affinity.scale(geom, 1.0, scale_factor_y, origin=scale_ref)
elif scale_factor_x and scale_factor_y:
geom = affinity.scale(geom_svg, scale_factor_x, scale_factor_y, origin=scale_ref)
geom = affinity.scale(geom, scale_factor_x, scale_factor_y, origin=scale_ref)
if skew_factor_x and not skew_factor_y:
geom = affinity.skew(geom_svg, skew_factor_x, 0.0, origin=skew_ref)
geom = affinity.skew(geom, skew_factor_x, 0.0, origin=skew_ref)
elif not skew_factor_x and skew_factor_y:
geom = affinity.skew(geom_svg, 0.0, skew_factor_y, origin=skew_ref)
geom = affinity.skew(geom, 0.0, skew_factor_y, origin=skew_ref)
elif skew_factor_x and skew_factor_y:
geom = affinity.skew(geom_svg, skew_factor_x, skew_factor_y, origin=skew_ref)
geom = affinity.skew(geom, skew_factor_x, skew_factor_y, origin=skew_ref)
if mirror:
if mirror == 'x':
geom = affinity.scale(geom_svg, 1.0, -1.0, origin=mirror_ref)
geom = affinity.scale(geom, 1.0, -1.0, origin=mirror_ref)
if mirror == 'y':
geom = affinity.scale(geom_svg, -1.0, 1.0, origin=mirror_ref)
geom = affinity.scale(geom, -1.0, 1.0, origin=mirror_ref)
if mirror == 'both':
geom = affinity.scale(geom_svg, -1.0, -1.0, origin=mirror_ref)
geom = affinity.scale(geom, -1.0, -1.0, origin=mirror_ref)
# scale_factor is a multiplication factor for the SVG stroke-width used within shapely's svg export
# If 0 or less which is invalid then default to 0.01