Some fixes

This commit is contained in:
Mario Voigt 2020-08-23 21:09:57 +02:00
parent dc5995fbf9
commit c40128850e
4 changed files with 19 additions and 22 deletions

View File

@ -55,5 +55,4 @@ class Gears(inkex.Effect):
'd' : svg } 'd' : svg }
g = etree.SubElement(self.svg.get_current_layer(), inkex.addNS('path','svg'), g_attribs) g = etree.SubElement(self.svg.get_current_layer(), inkex.addNS('path','svg'), g_attribs)
if __name__ == '__main__': Gears().run()
Gears().run()

View File

@ -657,9 +657,4 @@ class Gears(inkex.Effect):
self.add_text(g, note, [0,y], text_height) self.add_text(g, note, [0,y], text_height)
y += text_height * 1.2 y += text_height * 1.2
if __name__ == '__main__': Gears().run()
e = Gears()
e.run()
# Notes

View File

@ -42,6 +42,7 @@
<param name="clipPath" type="bool" gui-text="clipPath">true</param> <param name="clipPath" type="bool" gui-text="clipPath">true</param>
<param name="defs" type="bool" gui-text="defs">true</param> <param name="defs" type="bool" gui-text="defs">true</param>
<param name="image" type="bool" gui-text="image">true</param> <param name="image" type="bool" gui-text="image">true</param>
<param name="metadata" type="bool" gui-text="metadata">true</param>
<param name="script" type="bool" gui-text="script">true</param> <param name="script" type="bool" gui-text="script">true</param>
<param name="svg" type="bool" gui-text="svg">true</param> <param name="svg" type="bool" gui-text="svg">true</param>
<param name="use" type="bool" gui-text="use">true</param> <param name="use" type="bool" gui-text="use">true</param>

View File

@ -45,6 +45,7 @@ class MigrateGroups(inkex.Effect):
self.arg_parser.add_argument("--meshgradient", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--meshgradient", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--meshrow", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--meshrow", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--meshpatch", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--meshpatch", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--metadata", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--script", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--script", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--stop", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--stop", type=inkex.Boolean, default=True)
self.arg_parser.add_argument("--use", type=inkex.Boolean, default=True) self.arg_parser.add_argument("--use", type=inkex.Boolean, default=True)
@ -74,6 +75,7 @@ class MigrateGroups(inkex.Effect):
namespace.append("{http://www.w3.org/2000/svg}meshrow") if self.options.meshrow else "" namespace.append("{http://www.w3.org/2000/svg}meshrow") if self.options.meshrow else ""
namespace.append("{http://www.w3.org/2000/svg}meshpatch") if self.options.meshpatch else "" namespace.append("{http://www.w3.org/2000/svg}meshpatch") if self.options.meshpatch else ""
namespace.append("{http://www.w3.org/2000/svg}script") if self.options.script else "" namespace.append("{http://www.w3.org/2000/svg}script") if self.options.script else ""
namespace.append("{http://www.w3.org/2000/svg}metadata") if self.options.metadata else ""
namespace.append("{http://www.w3.org/2000/svg}stop") if self.options.stop else "" namespace.append("{http://www.w3.org/2000/svg}stop") if self.options.stop else ""
namespace.append("{http://www.w3.org/2000/svg}use") if self.options.use else "" namespace.append("{http://www.w3.org/2000/svg}use") if self.options.use else ""
namespace.append("{http://www.w3.org/2000/svg}flowRoot") if self.options.flowRoot else "" namespace.append("{http://www.w3.org/2000/svg}flowRoot") if self.options.flowRoot else ""
@ -120,31 +122,31 @@ class MigrateGroups(inkex.Effect):
if len(self.allElements) > 0: if len(self.allElements) > 0:
#copy all element into the new group #copy all element into the new group
newGroup = self.document.getroot().add(inkex.Group()) #make a new group at root level
for oldElement in self.allElements: for oldElement in self.allElements:
#oldElementId = oldElement.get('id') #oldElementId = oldElement.get('id')
newElement = oldElement.copy()
#newElement.set('id', oldElementId)
newGroup.add(newElement)
if self.options.droponly:
if oldElement.getparent() is not None: if oldElement.getparent() is not None:
oldElement.getparent().remove(oldElement) oldElement.getparent().remove(oldElement)
#newElement.set('id', oldElementId)
if self.options.droponly == False:
#make a new group at root level
newGroup = self.document.getroot().add(inkex.Group())
newElement = oldElement.copy()
newGroup.add(newElement)
if self.options.droponly == False: if self.options.droponly == False:
#now remove all the obsolete groups #now remove all the obsolete groups
if len(self.allGroups) > 0: if len(self.allGroups) > 0:
for group in self.allGroups: for group in self.allGroups:
if group.getparent() is not None: #if group.getparent() is not None:
group.getparent().remove(group) group.getparent().remove(group)
#remove the selected, now empty group (if it's the case) - this applies not if there is no user selection at all so some dangling group(s) might be left over #remove the selected, now empty group (if it's the case) - this applies not if there is no user selection at all so some dangling group(s) might be left over
if len(self.svg.selected) > 0 and len(self.allElements) > 0: if len(self.svg.selected) > 0 and len(self.allElements) > 0:
if self.svg.selected[0].tag == inkex.addNS('g','svg') or self.svg.selected[0].tag == inkex.addNS('svg','svg'): if self.svg.selected[0].tag == inkex.addNS('g','svg') or self.svg.selected[0].tag == inkex.addNS('svg','svg'):
if self.svg.selected[0].getparent() is not None: if self.svg.selected[0].getparent() is not None:
self.svg.selected[0].getparent().remove(self.svg.selected[0]) self.svg.selected[0].getparent().remove(self.svg.selected[0])
if self.options.showdroplist and len(self.allNonMigrates) > 0: if self.options.showdroplist:
self.msg(str(len(self.allNonMigrates)) + " elements were removed during nodes while migration:") self.msg(str(len(self.allNonMigrates)) + " elements were removed during nodes while migration:")
for i in self.allNonMigrates: for i in self.allNonMigrates:
self.msg(i.tag.replace("{http://www.w3.org/2000/svg}","svg:") + " id:" + i.get('id')) self.msg(i.tag.replace("{http://www.w3.org/2000/svg}","svg:") + " id:" + i.get('id'))