enhancements in lasercheck
This commit is contained in:
parent
f779f813d8
commit
c8e93a5c66
@ -422,12 +422,14 @@ class LaserCheck(inkex.EffectExtension):
|
|||||||
inkex.utils.debug("{} different stroke widths in total".format(len(strokeWidths)))
|
inkex.utils.debug("{} different stroke widths in total".format(len(strokeWidths)))
|
||||||
if len(strokeWidths) > so.stroke_widths_max:
|
if len(strokeWidths) > so.stroke_widths_max:
|
||||||
for strokeWidth in strokeWidths:
|
for strokeWidth in strokeWidths:
|
||||||
swConverted = self.svg.uutounit(float(self.svg.unittouu(strokeWidth))) #possibly w/o units. we unify to some internal float. The value "none" converts to 0.0
|
if strokeWidth != "none":
|
||||||
inkex.utils.debug("stroke width {}px ({}mm)".format(
|
swConverted = self.svg.uutounit(float(self.svg.unittouu(strokeWidth))) #possibly w/o units. we unify to some internal float. The value "none" converts to 0.0
|
||||||
round(self.svg.uutounit(swConverted, "px"),4),
|
inkex.utils.debug("stroke width {}px ({}mm)".format(
|
||||||
round(self.svg.uutounit(swConverted, "mm"),4),
|
round(self.svg.uutounit(swConverted, "px"),4),
|
||||||
)
|
round(self.svg.uutounit(swConverted, "mm"),4),
|
||||||
)
|
))
|
||||||
|
else:
|
||||||
|
inkex.utils.debug("stroke width none")
|
||||||
|
|
||||||
|
|
||||||
'''
|
'''
|
||||||
@ -501,8 +503,8 @@ class LaserCheck(inkex.EffectExtension):
|
|||||||
strokeOpacityVis = 1
|
strokeOpacityVis = 1
|
||||||
stroke_opacity = element.style.get('stroke-opacity')
|
stroke_opacity = element.style.get('stroke-opacity')
|
||||||
if stroke_opacity is not None:
|
if stroke_opacity is not None:
|
||||||
if stroke_opacity == "none":
|
if stroke_opacity == "none": #none means visible!
|
||||||
strokeOpacityVis = 0
|
strokeOpacityVis = 1
|
||||||
elif stroke_opacity is not None and self.svg.unittouu(stroke_opacity) < 0.05: #nearly invisible (<5% opacity)
|
elif stroke_opacity is not None and self.svg.unittouu(stroke_opacity) < 0.05: #nearly invisible (<5% opacity)
|
||||||
strokeOpacityVis = 0
|
strokeOpacityVis = 0
|
||||||
else:
|
else:
|
||||||
@ -522,7 +524,7 @@ class LaserCheck(inkex.EffectExtension):
|
|||||||
fillVis = 1
|
fillVis = 1
|
||||||
fill = element.style.get('fill')
|
fill = element.style.get('fill')
|
||||||
if fill is not None:
|
if fill is not None:
|
||||||
if fill == "none":
|
if fill == "none": #none means invisible! (opposite of stroke behaviour)
|
||||||
fillVis = 0
|
fillVis = 0
|
||||||
elif fill in invisColors:
|
elif fill in invisColors:
|
||||||
fillVis = 0
|
fillVis = 0
|
||||||
@ -586,8 +588,6 @@ class LaserCheck(inkex.EffectExtension):
|
|||||||
if len(slopes) < 2:
|
if len(slopes) < 2:
|
||||||
pathVis = 0
|
pathVis = 0
|
||||||
|
|
||||||
flags = "id={}, strokeVis={}, widthVis={}, strokeOpacityVis={} | fillVis={}, fillOpacityVis={} | displayVis={}, displayAttrVis = {} | pathVis = {}"\
|
|
||||||
.format(element.get('id'), strokeVis, widthVis, strokeOpacityVis, fillVis, fillOpacityVis, displayVis, displayAttrVis, pathVis)
|
|
||||||
if element.style is not None: #f if the style attribute is not set at all, the element will be visible with default black color fill and w/o stroke
|
if element.style is not None: #f if the style attribute is not set at all, the element will be visible with default black color fill and w/o stroke
|
||||||
if (strokeVis == 0 or widthVis == 0 or strokeOpacityVis == 0):
|
if (strokeVis == 0 or widthVis == 0 or strokeOpacityVis == 0):
|
||||||
strokeInvis = True
|
strokeInvis = True
|
||||||
@ -597,6 +597,8 @@ class LaserCheck(inkex.EffectExtension):
|
|||||||
fillInvis = True
|
fillInvis = True
|
||||||
else:
|
else:
|
||||||
fillInvis = False
|
fillInvis = False
|
||||||
|
flags = "id={},strokeVis={},widthVis={},strokeOpacityVis={}=>strokeInvisble:{}|fillVis={},fillOpacityVis={}=>fillInvisble:{}|displayVis={},displayAttrVis=, {}|pathVis={}"\
|
||||||
|
.format(element.get('id'), strokeVis, widthVis, strokeOpacityVis, strokeInvis, fillVis, fillOpacityVis, fillInvis, displayVis, displayAttrVis, pathVis)
|
||||||
if strokeInvis is True and fillInvis is True:
|
if strokeInvis is True and fillInvis is True:
|
||||||
if element not in invisibles:
|
if element not in invisibles:
|
||||||
invisibles.append(flags)
|
invisibles.append(flags)
|
||||||
|
Reference in New Issue
Block a user