adjust logic in dimple generator

This commit is contained in:
Mario Voigt 2021-10-16 16:21:04 +02:00
parent 062317c97f
commit e8bbf0c997

View File

@ -263,8 +263,6 @@ class JoinPaths(inkex.EffectExtension):
ellipse.set('sodipodi:cy', "{:0.6f}".format(midPoint[1])) ellipse.set('sodipodi:cy', "{:0.6f}".format(midPoint[1]))
ellipse.set('sodipodi:rx', "{:0.6f}".format(dimple_height)) ellipse.set('sodipodi:rx', "{:0.6f}".format(dimple_height))
ellipse.set('sodipodi:ry', "{:0.6f}".format(dist2 / 2)) ellipse.set('sodipodi:ry', "{:0.6f}".format(dist2 / 2))
if self.options.draw_both_sides is False:
ellipse.set('sodipodi:open', 'true')
if self.options.dimple_invert is True: if self.options.dimple_invert is True:
ellipse.set('sodipodi:start', "{:0.6f}".format(math.radians(90.0))) ellipse.set('sodipodi:start', "{:0.6f}".format(math.radians(90.0)))
ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(270.0))) ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(270.0)))
@ -273,6 +271,23 @@ class JoinPaths(inkex.EffectExtension):
ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(90.0))) ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(90.0)))
ellipse.style = dimple_style ellipse.style = dimple_style
if self.options.draw_both_sides is True:
ellipse = dimpleGroup.add(inkex.Ellipse(id=self.svg.get_unique_id('dimple')))
ellipse.set('transform', "rotate({:0.6f} {:0.6f} {:0.6f})".format(slope_angle, midPoint[0], midPoint[1]))
ellipse.set('sodipodi:arc-type', "arc")
ellipse.set('sodipodi:type', "arc")
ellipse.set('sodipodi:cx', "{:0.6f}".format(midPoint[0]))
ellipse.set('sodipodi:cy', "{:0.6f}".format(midPoint[1]))
ellipse.set('sodipodi:rx', "{:0.6f}".format(dimple_height))
ellipse.set('sodipodi:ry', "{:0.6f}".format(dist2 / 2))
if self.options.dimple_invert is True:
ellipse.set('sodipodi:start', "{:0.6f}".format(math.radians(270.0)))
ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(90.0)))
else:
ellipse.set('sodipodi:start', "{:0.6f}".format(math.radians(90.0)))
ellipse.set('sodipodi:end', "{:0.6f}".format(math.radians(270.0)))
ellipse.style = dimple_style
#cleanup groups #cleanup groups
if len(dimpleGroup) == 1: ##move up child if group has only one child if len(dimpleGroup) == 1: ##move up child if group has only one child
for child in dimpleGroup: for child in dimpleGroup: