From cef247db2eb74b1dfdde50924341ece8d08408ee Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Thu, 11 Jun 2020 23:35:34 -0400 Subject: [PATCH 01/19] Initial implementation of simplify script --- scripts/simplify.py | 215 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) create mode 100644 scripts/simplify.py diff --git a/scripts/simplify.py b/scripts/simplify.py new file mode 100644 index 0000000..b6db629 --- /dev/null +++ b/scripts/simplify.py @@ -0,0 +1,215 @@ +#!/usr/bin/python3 + +import sys +import getopt +import uuid +from xml.dom import minidom + +default_layer_attrs = { + 'inkscape:groupmode': 'layer', + 'sodipodi': 'true', # Force layer locked by default + 'style': 'display:inline' +} + +default_trace_style = 'fill:none;stroke:#ff0000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1' +default_zone_style = 'opacity:0.5;fill:#00ffff;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1' +default_zone_label = 'Copper Fill' + +def sort_element_attr(element): + attributes = element.attributes.items() + + # Remove attributes from element + keys = list(element.attributes.keys()) if element.attributes else [] + for attribute in keys: + element.removeAttribute(attribute) + + # Sort + attributes.sort(key=lambda name: name[0]) + + # Add attributes back + for name, value in attributes: + element.setAttribute(name, value) + +def process_image_layer(xml, layer, new_layer): + images = layer.getElementsByTagName('image') + + image_allowed_attrs = ['xlink:href', 'y', 'x', 'preserveAspectRatio', 'height', 'width'] + for image in images: + new_image = xml.createElement('path') + + # Recreate each allowed attribute in the newly created element + for allowed_attr in image_allowed_attrs: + # Check if field has a value + if not image.getAttribute(allowed_attr): + continue + + new_image.setAttribute(allowed_attr, image.getAttribute(allowed_attr)) + + # Add UUID if needed + if not new_image.getAttribute('pcbre:uuid'): + new_image.setAttribute('pcbre:uuid', str(uuid.uuid4())) + + # Sort attributes + sort_element_attr(new_image) + + new_layer.appendChild(new_image) + + # Sort elements + new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + +def process_zones_layer(xml, layer, new_layer): + zones = layer.getElementsByTagName('path') + + trace_allowed_attrs = ['d', 'transform', 'inkscape:connector-curvature', 'inkscape:label', 'pcbre:uuid'] + for zone in zones: + new_zone = xml.createElement('path') + + # Recreate each allowed attribute in the newly created element + for allowed_attr in trace_allowed_attrs: + # Check if field has a value + if not zone.getAttribute(allowed_attr): + continue + + new_zone.setAttribute(allowed_attr, zone.getAttribute(allowed_attr)) + + # TODO: Remove transforms + + # Assign default zone style + new_zone.setAttribute('style', default_zone_style) + + # Assign default zone label + if not new_zone.getAttribute('inkscape:label'): + new_zone.setAttribute('inkscape:label', default_zone_label) + + # Add UUID if needed + if not new_zone.getAttribute('pcbre:uuid'): + new_zone.setAttribute('pcbre:uuid', str(uuid.uuid4())) + + # Sort attributes + sort_element_attr(new_zone) + + new_layer.appendChild(new_zone) + + # Sort elements + new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + +def process_traces_layer(xml, layer, new_layer): + traces = layer.getElementsByTagName('path') + + trace_allowed_attrs = ['d', 'inkscape:connector-curvature', 'pcbre:uuid'] + for trace in traces: + new_trace = xml.createElement('path') + + # Recreate each allowed attribute in the newly created element + for allowed_attr in trace_allowed_attrs: + # Check if field has a value + if not trace.getAttribute(allowed_attr): + continue + + new_trace.setAttribute(allowed_attr, trace.getAttribute(allowed_attr)) + + # Assign default trace style + new_trace.setAttribute('style', default_trace_style) + + # Add UUID if needed + if not new_trace.getAttribute('pcbre:uuid'): + new_trace.setAttribute('pcbre:uuid', str(uuid.uuid4())) + + # Sort attributes + sort_element_attr(new_trace) + + new_layer.appendChild(new_trace) + + # Sort elements + new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + +def main(argv): + # Load and parse SVG + input_xml = minidom.parse(argv[0]) + input_svg = input_xml.getElementsByTagName('svg')[0] + + # Get 'layers' from SVG + layers = [] + + for element in input_xml.getElementsByTagName('g'): + # Sanity check + if element.getAttribute('inkscape:groupmode') != 'layer': + raise Exception('None layer groups are not supported at this time!') + + if not element.getAttribute('pcbre:uuid'): + print('WARNING: No UUID assigned to layer. Skipping layer', element.getAttribute('inkscape:label')) + continue + + layers += [element] + + # Sort layers + layers.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + + # Create our 'clean' SVG object + clean_xml = minidom.Document() + clean_svg = clean_xml.createElement('svg') + + # Recreate each allowed attribute + svg_allowed_attrs = ['width', 'height', 'viewBox'] + for svg_allowed_attr in svg_allowed_attrs: + # Check if field has a value + if not input_svg.getAttribute(svg_allowed_attr): + continue + + clean_svg.setAttribute(svg_allowed_attr, input_svg.getAttribute(svg_allowed_attr)) + + # Add back XML namespcaes + input_svg_attributes = list(input_svg.attributes.keys()) if input_svg.attributes else [] + for attribute in input_svg_attributes: + if attribute.startswith('xmlns:'): + clean_svg.setAttribute(attribute, input_svg.getAttribute(attribute)) + + # Sort attributes + sort_element_attr(clean_svg) + + # Process each layer + layer_allowed_attrs = ['inkscape:label', 'transform', 'pcbre:uuid'] + for layer in layers: + print('Processsing layer:', layer.getAttribute('inkscape:label')) + + # Create group element + new_layer = clean_xml.createElement('g') + + # Set default attributes + for layer_attr, value in default_layer_attrs.items(): + new_layer.setAttribute(layer_attr, value) + + # Recreate each allowed attribute in the newly created element + for svg_allowed_attr in layer_allowed_attrs: + # Check if field has a value + if not layer.getAttribute(svg_allowed_attr): + continue + + new_layer.setAttribute(svg_allowed_attr, layer.getAttribute(svg_allowed_attr)) + + # Add UUID if needed + if not element.getAttribute('pcbre:uuid'): + element.setAttribute('pcbre:uuid', str(uuid.uuid4())) + + # Sort attributes + sort_element_attr(new_layer) + + # Sub elements of current layer + if layer.getAttribute('inkscape:label') in ['Board Bottom', 'Board Top']: + process_image_layer(clean_xml, layer, new_layer) + elif layer.getAttribute('inkscape:label') in ['Bottom Zones', 'Top Zones']: + process_zones_layer(clean_xml, layer, new_layer) + elif layer.getAttribute('inkscape:label') in ['Top Traces', 'Bottom Traces']: + process_traces_layer(clean_xml, layer, new_layer) + + # + clean_svg.appendChild(new_layer) + + # Append SVG object to the document + clean_xml.appendChild(clean_svg) + + # Write out simplified SVG + open('./clean.svg', 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) + +if __name__ == '__main__': + main(sys.argv[1:]) \ No newline at end of file From f1f6ee665c5ddc4d3fc023be4482d7b0203394ef Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 05:56:56 -0400 Subject: [PATCH 02/19] Fix image element Element was incorrectly being created with a path tag --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index b6db629..cc5eafe 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -35,7 +35,7 @@ def process_image_layer(xml, layer, new_layer): image_allowed_attrs = ['xlink:href', 'y', 'x', 'preserveAspectRatio', 'height', 'width'] for image in images: - new_image = xml.createElement('path') + new_image = xml.createElement('image') # Recreate each allowed attribute in the newly created element for allowed_attr in image_allowed_attrs: From b9b0e21f60b3bd84fcb2a1bc21aab84033e1790e Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 16:43:29 -0400 Subject: [PATCH 03/19] Formatting cleanup --- scripts/simplify.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index cc5eafe..721024e 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -42,7 +42,7 @@ def process_image_layer(xml, layer, new_layer): # Check if field has a value if not image.getAttribute(allowed_attr): continue - + new_image.setAttribute(allowed_attr, image.getAttribute(allowed_attr)) # Add UUID if needed @@ -69,7 +69,7 @@ def process_zones_layer(xml, layer, new_layer): # Check if field has a value if not zone.getAttribute(allowed_attr): continue - + new_zone.setAttribute(allowed_attr, zone.getAttribute(allowed_attr)) # TODO: Remove transforms @@ -105,7 +105,7 @@ def process_traces_layer(xml, layer, new_layer): # Check if field has a value if not trace.getAttribute(allowed_attr): continue - + new_trace.setAttribute(allowed_attr, trace.getAttribute(allowed_attr)) # Assign default trace style @@ -155,7 +155,7 @@ def main(argv): # Check if field has a value if not input_svg.getAttribute(svg_allowed_attr): continue - + clean_svg.setAttribute(svg_allowed_attr, input_svg.getAttribute(svg_allowed_attr)) # Add back XML namespcaes @@ -184,7 +184,7 @@ def main(argv): # Check if field has a value if not layer.getAttribute(svg_allowed_attr): continue - + new_layer.setAttribute(svg_allowed_attr, layer.getAttribute(svg_allowed_attr)) # Add UUID if needed @@ -212,4 +212,4 @@ def main(argv): open('./clean.svg', 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) if __name__ == '__main__': - main(sys.argv[1:]) \ No newline at end of file + main(sys.argv[1:]) From 82a9cdbb9d53cfbd51cf2611a14d9864b223174a Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 16:56:14 -0400 Subject: [PATCH 04/19] Add license --- scripts/LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 scripts/LICENSE diff --git a/scripts/LICENSE b/scripts/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/scripts/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From feb9999712989d9d8c0921ced65358f9aba42bf1 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 18:28:49 -0400 Subject: [PATCH 05/19] Implement default styles as dictionary --- scripts/simplify.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 721024e..8cd6419 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -11,10 +11,30 @@ 'style': 'display:inline' } -default_trace_style = 'fill:none;stroke:#ff0000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1' -default_zone_style = 'opacity:0.5;fill:#00ffff;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1' +default_trace_style = { + 'fill': 'none', + 'stroke': '#ff0000', + 'stroke-width': '1.25', + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round', + 'stroke-miterlimit': '4', + 'stroke-dasharray': 'none', + 'stroke-opacity': '1' +} +default_zone_style = { + 'opacity': '0.5', + 'fill': '#00ffff', + 'stroke': '#000000', + 'stroke-width': '0.99999994px', + 'stroke-linecap': 'butt', + 'stroke-linejoin': 'miter', + 'stroke-opacity': '1' +} default_zone_label = 'Copper Fill' +def dict_to_style(dict): + return ';'.join("{}:{}".format(key,val) for (key,val) in dict.items()) + def sort_element_attr(element): attributes = element.attributes.items() @@ -75,7 +95,7 @@ def process_zones_layer(xml, layer, new_layer): # TODO: Remove transforms # Assign default zone style - new_zone.setAttribute('style', default_zone_style) + new_zone.setAttribute('style', dict_to_style(default_zone_style)) # Assign default zone label if not new_zone.getAttribute('inkscape:label'): @@ -109,7 +129,7 @@ def process_traces_layer(xml, layer, new_layer): new_trace.setAttribute(allowed_attr, trace.getAttribute(allowed_attr)) # Assign default trace style - new_trace.setAttribute('style', default_trace_style) + new_trace.setAttribute('style', dict_to_style(default_trace_style)) # Add UUID if needed if not new_trace.getAttribute('pcbre:uuid'): From 80d27b76b7b43083975c533d0158ded271fc5abb Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 18:37:48 -0400 Subject: [PATCH 06/19] Implement image element style attribute as dictionary Matches other elements --- scripts/simplify.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 8cd6419..fc513cf 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -8,7 +8,6 @@ default_layer_attrs = { 'inkscape:groupmode': 'layer', 'sodipodi': 'true', # Force layer locked by default - 'style': 'display:inline' } default_trace_style = { @@ -30,6 +29,10 @@ 'stroke-linejoin': 'miter', 'stroke-opacity': '1' } +default_image_style = { + 'style': 'display:inline' +} + default_zone_label = 'Copper Fill' def dict_to_style(dict): @@ -65,6 +68,9 @@ def process_image_layer(xml, layer, new_layer): new_image.setAttribute(allowed_attr, image.getAttribute(allowed_attr)) + # Assign default image style + new_image.setAttribute('style', dict_to_style(default_image_style)) + # Add UUID if needed if not new_image.getAttribute('pcbre:uuid'): new_image.setAttribute('pcbre:uuid', str(uuid.uuid4())) From 377efb42498b9f404a554eb2ae31f785727f8b11 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 19:22:25 -0400 Subject: [PATCH 07/19] Improve readability of image_allowed_attrs --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index fc513cf..abb5e85 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -56,7 +56,7 @@ def sort_element_attr(element): def process_image_layer(xml, layer, new_layer): images = layer.getElementsByTagName('image') - image_allowed_attrs = ['xlink:href', 'y', 'x', 'preserveAspectRatio', 'height', 'width'] + image_allowed_attrs = ['x', 'y', 'width', 'height', 'xlink:href', 'preserveAspectRatio'] for image in images: new_image = xml.createElement('image') From a37f20dcf2c923a252a65ec5480e7f5d9c1b16ec Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 19:48:45 -0400 Subject: [PATCH 08/19] Implement default_svg_attrs Forces us to track the attributes on the SVG element and allows to remove easily remove unneeded namespaces in the future. --- scripts/simplify.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index abb5e85..8f41921 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -5,6 +5,16 @@ import uuid from xml.dom import minidom +default_svg_attrs = { + 'xmlns:cc': 'http://creativecommons.org/ns#', + 'xmlns:dc': 'http://purl.org/dc/elements/1.1/', + 'xmlns:inkscape': 'http://www.inkscape.org/namespaces/inkscape', + 'xmlns:pcbre': 'https://github.com/LoveMHz/xbox-board-re/namespaces/inkscape', + 'xmlns:rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', + 'xmlns:sodipodi': 'http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd', + 'xmlns:svg': 'http://www.w3.org/2000/svg', + 'xmlns:xlink': 'http://www.w3.org/1999/xlink' +} default_layer_attrs = { 'inkscape:groupmode': 'layer', 'sodipodi': 'true', # Force layer locked by default @@ -184,11 +194,9 @@ def main(argv): clean_svg.setAttribute(svg_allowed_attr, input_svg.getAttribute(svg_allowed_attr)) - # Add back XML namespcaes - input_svg_attributes = list(input_svg.attributes.keys()) if input_svg.attributes else [] - for attribute in input_svg_attributes: - if attribute.startswith('xmlns:'): - clean_svg.setAttribute(attribute, input_svg.getAttribute(attribute)) + # Set SVG default attributes + for attribute, value in default_svg_attrs.items(): + clean_svg.setAttribute(attribute, value) # Sort attributes sort_element_attr(clean_svg) @@ -235,7 +243,7 @@ def main(argv): clean_xml.appendChild(clean_svg) # Write out simplified SVG - open('./clean.svg', 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) + open(argv[0], 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) if __name__ == '__main__': main(sys.argv[1:]) From 1c7ceb1fbbade2d6de2ad3e17e6a3849d2b55e63 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 19:49:03 -0400 Subject: [PATCH 09/19] Implement output file argument --- scripts/simplify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 8f41921..384f117 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -174,7 +174,7 @@ def main(argv): if not element.getAttribute('pcbre:uuid'): print('WARNING: No UUID assigned to layer. Skipping layer', element.getAttribute('inkscape:label')) - continue + #continue layers += [element] @@ -243,7 +243,7 @@ def main(argv): clean_xml.appendChild(clean_svg) # Write out simplified SVG - open(argv[0], 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) + open(argv[1], 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) if __name__ == '__main__': main(sys.argv[1:]) From 2f235019a2561ef8effb020e1e819deca2deb3f2 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 22:13:04 -0400 Subject: [PATCH 10/19] Fix shebang on script --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 384f117..470fb4d 100644 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import sys import getopt From 8064a96b61e9a202657b192401c4303bf9b11ca1 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 22:13:37 -0400 Subject: [PATCH 11/19] Fix file permissions --- scripts/simplify.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/simplify.py diff --git a/scripts/simplify.py b/scripts/simplify.py old mode 100644 new mode 100755 From f3277365787f9aa8112f77eaeca83fb2549c81c3 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 22:16:32 -0400 Subject: [PATCH 12/19] Remove SVG namespace dependency and unneeded attributes --- scripts/simplify.py | 67 +++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 42 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 470fb4d..58a941d 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -6,19 +6,10 @@ from xml.dom import minidom default_svg_attrs = { - 'xmlns:cc': 'http://creativecommons.org/ns#', - 'xmlns:dc': 'http://purl.org/dc/elements/1.1/', - 'xmlns:inkscape': 'http://www.inkscape.org/namespaces/inkscape', - 'xmlns:pcbre': 'https://github.com/LoveMHz/xbox-board-re/namespaces/inkscape', - 'xmlns:rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', - 'xmlns:sodipodi': 'http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd', 'xmlns:svg': 'http://www.w3.org/2000/svg', 'xmlns:xlink': 'http://www.w3.org/1999/xlink' } -default_layer_attrs = { - 'inkscape:groupmode': 'layer', - 'sodipodi': 'true', # Force layer locked by default -} +default_layer_attrs = { } default_trace_style = { 'fill': 'none', @@ -43,8 +34,6 @@ 'style': 'display:inline' } -default_zone_label = 'Copper Fill' - def dict_to_style(dict): return ';'.join("{}:{}".format(key,val) for (key,val) in dict.items()) @@ -82,8 +71,8 @@ def process_image_layer(xml, layer, new_layer): new_image.setAttribute('style', dict_to_style(default_image_style)) # Add UUID if needed - if not new_image.getAttribute('pcbre:uuid'): - new_image.setAttribute('pcbre:uuid', str(uuid.uuid4())) + if not new_image.getAttribute('id'): + new_image.setAttribute('id', str(uuid.uuid4())) # Sort attributes sort_element_attr(new_image) @@ -91,12 +80,12 @@ def process_image_layer(xml, layer, new_layer): new_layer.appendChild(new_image) # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) def process_zones_layer(xml, layer, new_layer): zones = layer.getElementsByTagName('path') - trace_allowed_attrs = ['d', 'transform', 'inkscape:connector-curvature', 'inkscape:label', 'pcbre:uuid'] + trace_allowed_attrs = ['d', 'transform', 'id'] for zone in zones: new_zone = xml.createElement('path') @@ -113,13 +102,9 @@ def process_zones_layer(xml, layer, new_layer): # Assign default zone style new_zone.setAttribute('style', dict_to_style(default_zone_style)) - # Assign default zone label - if not new_zone.getAttribute('inkscape:label'): - new_zone.setAttribute('inkscape:label', default_zone_label) - # Add UUID if needed - if not new_zone.getAttribute('pcbre:uuid'): - new_zone.setAttribute('pcbre:uuid', str(uuid.uuid4())) + if not new_zone.getAttribute('id'): + new_zone.setAttribute('id', str(uuid.uuid4())) # Sort attributes sort_element_attr(new_zone) @@ -127,12 +112,12 @@ def process_zones_layer(xml, layer, new_layer): new_layer.appendChild(new_zone) # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) def process_traces_layer(xml, layer, new_layer): traces = layer.getElementsByTagName('path') - trace_allowed_attrs = ['d', 'inkscape:connector-curvature', 'pcbre:uuid'] + trace_allowed_attrs = ['d', 'id'] for trace in traces: new_trace = xml.createElement('path') @@ -148,8 +133,8 @@ def process_traces_layer(xml, layer, new_layer): new_trace.setAttribute('style', dict_to_style(default_trace_style)) # Add UUID if needed - if not new_trace.getAttribute('pcbre:uuid'): - new_trace.setAttribute('pcbre:uuid', str(uuid.uuid4())) + if not new_trace.getAttribute('id'): + new_trace.setAttribute('id', str(uuid.uuid4())) # Sort attributes sort_element_attr(new_trace) @@ -157,7 +142,7 @@ def process_traces_layer(xml, layer, new_layer): new_layer.appendChild(new_trace) # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) def main(argv): # Load and parse SVG @@ -168,18 +153,14 @@ def main(argv): layers = [] for element in input_xml.getElementsByTagName('g'): - # Sanity check - if element.getAttribute('inkscape:groupmode') != 'layer': - raise Exception('None layer groups are not supported at this time!') - - if not element.getAttribute('pcbre:uuid'): - print('WARNING: No UUID assigned to layer. Skipping layer', element.getAttribute('inkscape:label')) + if not element.getAttribute('id'): + print('WARNING: No id assigned to layer. Skipping layer', element.getAttribute('id')) #continue layers += [element] # Sort layers - layers.sort(key=lambda x: x.getAttribute('pcbre:uuid')) + layers.sort(key=lambda x: x.getAttribute('id')) # Create our 'clean' SVG object clean_xml = minidom.Document() @@ -202,9 +183,9 @@ def main(argv): sort_element_attr(clean_svg) # Process each layer - layer_allowed_attrs = ['inkscape:label', 'transform', 'pcbre:uuid'] + layer_allowed_attrs = ['id', 'transform'] for layer in layers: - print('Processsing layer:', layer.getAttribute('inkscape:label')) + print('Processsing layer:', layer.getAttribute('id')) # Create group element new_layer = clean_xml.createElement('g') @@ -221,19 +202,21 @@ def main(argv): new_layer.setAttribute(svg_allowed_attr, layer.getAttribute(svg_allowed_attr)) - # Add UUID if needed - if not element.getAttribute('pcbre:uuid'): - element.setAttribute('pcbre:uuid', str(uuid.uuid4())) + # Add ID if needed + if not element.getAttribute('id'): + element.setAttribute('id', str(uuid.uuid4())) # Sort attributes sort_element_attr(new_layer) # Sub elements of current layer - if layer.getAttribute('inkscape:label') in ['Board Bottom', 'Board Top']: + layer_id = layer.getAttribute('id') + + if layer_id in ['bottom_board', 'top_board']: process_image_layer(clean_xml, layer, new_layer) - elif layer.getAttribute('inkscape:label') in ['Bottom Zones', 'Top Zones']: + elif layer_id in ['bottom_zones', 'top_zones']: process_zones_layer(clean_xml, layer, new_layer) - elif layer.getAttribute('inkscape:label') in ['Top Traces', 'Bottom Traces']: + elif layer_id in ['bottom_traces', 'top_traces']: process_traces_layer(clean_xml, layer, new_layer) # From 9c7fd8282c7f4fdc950b84e88317672381f90f5c Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 22:39:04 -0400 Subject: [PATCH 13/19] Refactor element processing --- scripts/simplify.py | 133 ++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 79 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 58a941d..6dcf336 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -9,6 +9,44 @@ 'xmlns:svg': 'http://www.w3.org/2000/svg', 'xmlns:xlink': 'http://www.w3.org/1999/xlink' } + +element_group_format_rules = { + 'image': { + 'default_styles': { + 'style': 'display:inline' + }, + 'allowed_attrs': ['x', 'y', 'width', 'height', 'xlink:href', 'preserveAspectRatio'], + 'element_tag': 'image' + }, + 'traces':{ + 'default_styles': { + 'fill': 'none', + 'stroke': '#ff0000', + 'stroke-width': '1.25', + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round', + 'stroke-miterlimit': '4', + 'stroke-dasharray': 'none', + 'stroke-opacity': '1' + }, + 'allowed_attrs': ['d', 'transform', 'id'], + 'element_tag': 'path' + }, + 'zones':{ + 'default_styles': { + 'opacity': '0.5', + 'fill': '#00ffff', + 'stroke': '#000000', + 'stroke-width': '0.99999994px', + 'stroke-linecap': 'butt', + 'stroke-linejoin': 'miter', + 'stroke-opacity': '1' + }, + 'allowed_attrs': ['d', 'id'], + 'element_tag': 'path' + } +} + default_layer_attrs = { } default_trace_style = { @@ -52,94 +90,31 @@ def sort_element_attr(element): for name, value in attributes: element.setAttribute(name, value) -def process_image_layer(xml, layer, new_layer): - images = layer.getElementsByTagName('image') - - image_allowed_attrs = ['x', 'y', 'width', 'height', 'xlink:href', 'preserveAspectRatio'] - for image in images: - new_image = xml.createElement('image') - - # Recreate each allowed attribute in the newly created element - for allowed_attr in image_allowed_attrs: - # Check if field has a value - if not image.getAttribute(allowed_attr): - continue - - new_image.setAttribute(allowed_attr, image.getAttribute(allowed_attr)) - - # Assign default image style - new_image.setAttribute('style', dict_to_style(default_image_style)) - - # Add UUID if needed - if not new_image.getAttribute('id'): - new_image.setAttribute('id', str(uuid.uuid4())) - - # Sort attributes - sort_element_attr(new_image) - - new_layer.appendChild(new_image) - - # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) - -def process_zones_layer(xml, layer, new_layer): - zones = layer.getElementsByTagName('path') - - trace_allowed_attrs = ['d', 'transform', 'id'] - for zone in zones: - new_zone = xml.createElement('path') - - # Recreate each allowed attribute in the newly created element - for allowed_attr in trace_allowed_attrs: - # Check if field has a value - if not zone.getAttribute(allowed_attr): - continue - - new_zone.setAttribute(allowed_attr, zone.getAttribute(allowed_attr)) - - # TODO: Remove transforms - - # Assign default zone style - new_zone.setAttribute('style', dict_to_style(default_zone_style)) - - # Add UUID if needed - if not new_zone.getAttribute('id'): - new_zone.setAttribute('id', str(uuid.uuid4())) - - # Sort attributes - sort_element_attr(new_zone) - - new_layer.appendChild(new_zone) - - # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) - -def process_traces_layer(xml, layer, new_layer): - traces = layer.getElementsByTagName('path') +def format_group_elements(xml, layer, new_layer, ruleset): + elements = layer.getElementsByTagName(ruleset['element_tag']) - trace_allowed_attrs = ['d', 'id'] - for trace in traces: - new_trace = xml.createElement('path') + for element in elements: + new_element = xml.createElement(ruleset['element_tag']) # Recreate each allowed attribute in the newly created element - for allowed_attr in trace_allowed_attrs: + for allowed_attr in ruleset['allowed_attrs']: # Check if field has a value - if not trace.getAttribute(allowed_attr): + if not element.getAttribute(allowed_attr): continue - new_trace.setAttribute(allowed_attr, trace.getAttribute(allowed_attr)) + new_element.setAttribute(allowed_attr, element.getAttribute(allowed_attr)) # Assign default trace style - new_trace.setAttribute('style', dict_to_style(default_trace_style)) + new_element.setAttribute('style', dict_to_style(default_trace_style)) # Add UUID if needed - if not new_trace.getAttribute('id'): - new_trace.setAttribute('id', str(uuid.uuid4())) + if not new_element.getAttribute('id'): + new_element.setAttribute('id', str(uuid.uuid4())) # Sort attributes - sort_element_attr(new_trace) + sort_element_attr(new_element) - new_layer.appendChild(new_trace) + new_layer.appendChild(new_element) # Sort elements new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) @@ -211,13 +186,13 @@ def main(argv): # Sub elements of current layer layer_id = layer.getAttribute('id') - + if layer_id in ['bottom_board', 'top_board']: - process_image_layer(clean_xml, layer, new_layer) + format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['image']) elif layer_id in ['bottom_zones', 'top_zones']: - process_zones_layer(clean_xml, layer, new_layer) + format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['zones']) elif layer_id in ['bottom_traces', 'top_traces']: - process_traces_layer(clean_xml, layer, new_layer) + format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['traces']) # clean_svg.appendChild(new_layer) From a612c2d587b33e70fc8d11a1aa6806a8dfb19e22 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 23:18:25 -0400 Subject: [PATCH 14/19] Fix default_styles in format_group_elements --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 6dcf336..03b72cd 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -105,7 +105,7 @@ def format_group_elements(xml, layer, new_layer, ruleset): new_element.setAttribute(allowed_attr, element.getAttribute(allowed_attr)) # Assign default trace style - new_element.setAttribute('style', dict_to_style(default_trace_style)) + new_element.setAttribute('style', dict_to_style(ruleset['default_styles'])) # Add UUID if needed if not new_element.getAttribute('id'): From 66616830603f954201714417fb32fe6d19ea153a Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 23:19:49 -0400 Subject: [PATCH 15/19] Remove leftover variables --- scripts/simplify.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 03b72cd..ccf3c9e 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -49,29 +49,6 @@ default_layer_attrs = { } -default_trace_style = { - 'fill': 'none', - 'stroke': '#ff0000', - 'stroke-width': '1.25', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round', - 'stroke-miterlimit': '4', - 'stroke-dasharray': 'none', - 'stroke-opacity': '1' -} -default_zone_style = { - 'opacity': '0.5', - 'fill': '#00ffff', - 'stroke': '#000000', - 'stroke-width': '0.99999994px', - 'stroke-linecap': 'butt', - 'stroke-linejoin': 'miter', - 'stroke-opacity': '1' -} -default_image_style = { - 'style': 'display:inline' -} - def dict_to_style(dict): return ';'.join("{}:{}".format(key,val) for (key,val) in dict.items()) From 5d47696d1980b36868c57c1e8d8d06094732678a Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 23:31:24 -0400 Subject: [PATCH 16/19] Refactor layer variable to group Better matches the usage as this part of the code is handling the SVG root groups. --- scripts/simplify.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index ccf3c9e..59476de 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -102,17 +102,17 @@ def main(argv): input_svg = input_xml.getElementsByTagName('svg')[0] # Get 'layers' from SVG - layers = [] + groups = [] for element in input_xml.getElementsByTagName('g'): if not element.getAttribute('id'): - print('WARNING: No id assigned to layer. Skipping layer', element.getAttribute('id')) + print('WARNING: No id assigned to object group. Skipping object group', element.getAttribute('id')) #continue - layers += [element] + groups += [element] # Sort layers - layers.sort(key=lambda x: x.getAttribute('id')) + groups.sort(key=lambda x: x.getAttribute('id')) # Create our 'clean' SVG object clean_xml = minidom.Document() @@ -134,45 +134,45 @@ def main(argv): # Sort attributes sort_element_attr(clean_svg) - # Process each layer + # Process each object group layer_allowed_attrs = ['id', 'transform'] - for layer in layers: - print('Processsing layer:', layer.getAttribute('id')) + for group in groups: + print('Processsing layer:', group.getAttribute('id')) # Create group element - new_layer = clean_xml.createElement('g') + new_group = clean_xml.createElement('g') # Set default attributes for layer_attr, value in default_layer_attrs.items(): - new_layer.setAttribute(layer_attr, value) + new_group.setAttribute(layer_attr, value) # Recreate each allowed attribute in the newly created element for svg_allowed_attr in layer_allowed_attrs: # Check if field has a value - if not layer.getAttribute(svg_allowed_attr): + if not group.getAttribute(svg_allowed_attr): continue - new_layer.setAttribute(svg_allowed_attr, layer.getAttribute(svg_allowed_attr)) + new_group.setAttribute(svg_allowed_attr, group.getAttribute(svg_allowed_attr)) # Add ID if needed if not element.getAttribute('id'): element.setAttribute('id', str(uuid.uuid4())) # Sort attributes - sort_element_attr(new_layer) + sort_element_attr(new_group) # Sub elements of current layer - layer_id = layer.getAttribute('id') + group_id = group.getAttribute('id') - if layer_id in ['bottom_board', 'top_board']: - format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['image']) - elif layer_id in ['bottom_zones', 'top_zones']: - format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['zones']) - elif layer_id in ['bottom_traces', 'top_traces']: - format_group_elements(clean_xml, layer, new_layer, element_group_format_rules['traces']) + if group_id in ['bottom_board', 'top_board']: + format_group_elements(clean_xml, group, new_group, element_group_format_rules['image']) + elif group_id in ['bottom_zones', 'top_zones']: + format_group_elements(clean_xml, group, new_group, element_group_format_rules['zones']) + elif group_id in ['bottom_traces', 'top_traces']: + format_group_elements(clean_xml, group, new_group, element_group_format_rules['traces']) # - clean_svg.appendChild(new_layer) + clean_svg.appendChild(new_group) # Append SVG object to the document clean_xml.appendChild(clean_svg) From ed2bdbeb5c1fd16c97080353249eeed08388b409 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 23:31:52 -0400 Subject: [PATCH 17/19] Change default stroke width of traces to sane value --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 59476de..1782918 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -37,7 +37,7 @@ 'opacity': '0.5', 'fill': '#00ffff', 'stroke': '#000000', - 'stroke-width': '0.99999994px', + 'stroke-width': '1px', 'stroke-linecap': 'butt', 'stroke-linejoin': 'miter', 'stroke-opacity': '1' From b84721f642b9395b7a46015e009baf6e9d96db09 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Fri, 12 Jun 2020 23:52:55 -0400 Subject: [PATCH 18/19] Add pixel unit to stroke-width --- scripts/simplify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 1782918..5076e71 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -22,7 +22,7 @@ 'default_styles': { 'fill': 'none', 'stroke': '#ff0000', - 'stroke-width': '1.25', + 'stroke-width': '1.25px', 'stroke-linecap': 'round', 'stroke-linejoin': 'round', 'stroke-miterlimit': '4', From 5ff7a98fcada10c5bd60320fc2b5d61e1a853093 Mon Sep 17 00:00:00 2001 From: Dustin Holden Date: Sat, 13 Jun 2020 05:42:38 -0400 Subject: [PATCH 19/19] Partial rewrite --- scripts/simplify.py | 198 +++++++++++++++++++------------------------- 1 file changed, 84 insertions(+), 114 deletions(-) diff --git a/scripts/simplify.py b/scripts/simplify.py index 5076e71..8c63e68 100755 --- a/scripts/simplify.py +++ b/scripts/simplify.py @@ -5,50 +5,58 @@ import uuid from xml.dom import minidom -default_svg_attrs = { - 'xmlns:svg': 'http://www.w3.org/2000/svg', - 'xmlns:xlink': 'http://www.w3.org/1999/xlink' -} - -element_group_format_rules = { +element_format_rules = { + 'svg': { + 'default_styles': { }, + 'allowed_attrs': ['width', 'height', 'viewBox', 'xmlns:xlink', 'xmlns:svg'], + 'element_tag': 'image' + }, + 'groups': { + 'default_styles': { + 'style': 'display:inline' + }, + 'allowed_attrs': ['id', 'transform'], + 'element_tag': 'g' + }, 'image': { 'default_styles': { 'style': 'display:inline' }, 'allowed_attrs': ['x', 'y', 'width', 'height', 'xlink:href', 'preserveAspectRatio'], - 'element_tag': 'image' + 'element_tag': 'image', + 'id_subfix': 'image_' }, 'traces':{ 'default_styles': { - 'fill': 'none', - 'stroke': '#ff0000', - 'stroke-width': '1.25px', - 'stroke-linecap': 'round', - 'stroke-linejoin': 'round', - 'stroke-miterlimit': '4', - 'stroke-dasharray': 'none', + 'fill': 'none', + 'stroke': '#ff0000', + 'stroke-width': '1.25px', + 'stroke-linecap': 'round', + 'stroke-linejoin': 'round', + 'stroke-miterlimit': '4', + 'stroke-dasharray': 'none', 'stroke-opacity': '1' }, 'allowed_attrs': ['d', 'transform', 'id'], - 'element_tag': 'path' + 'element_tag': 'path', + 'id_subfix': 'trace_' }, 'zones':{ 'default_styles': { - 'opacity': '0.5', - 'fill': '#00ffff', - 'stroke': '#000000', - 'stroke-width': '1px', - 'stroke-linecap': 'butt', - 'stroke-linejoin': 'miter', + 'opacity': '0.5', + 'fill': '#00ffff', + 'stroke': '#000000', + 'stroke-width': '1px', + 'stroke-linecap': 'butt', + 'stroke-linejoin': 'miter', 'stroke-opacity': '1' }, 'allowed_attrs': ['d', 'id'], - 'element_tag': 'path' + 'element_tag': 'path', + 'id_subfix': 'zone_' } } -default_layer_attrs = { } - def dict_to_style(dict): return ';'.join("{}:{}".format(key,val) for (key,val) in dict.items()) @@ -67,118 +75,80 @@ def sort_element_attr(element): for name, value in attributes: element.setAttribute(name, value) -def format_group_elements(xml, layer, new_layer, ruleset): - elements = layer.getElementsByTagName(ruleset['element_tag']) +def filter_allowed_attributes(element, allowed_attrs): + attributes = element.attributes.items() - for element in elements: - new_element = xml.createElement(ruleset['element_tag']) + # Check every attributes + for [name, value] in attributes: + if not name in allowed_attrs: + print('\tRemoving attribute', name) + element.removeAttribute(name) - # Recreate each allowed attribute in the newly created element - for allowed_attr in ruleset['allowed_attrs']: - # Check if field has a value - if not element.getAttribute(allowed_attr): - continue +def format_group_elements(xml, source, ruleset): + elements = source.getElementsByTagName(ruleset['element_tag']) - new_element.setAttribute(allowed_attr, element.getAttribute(allowed_attr)) + for element in elements: + filter_allowed_attributes(element, ruleset['allowed_attrs']) - # Assign default trace style - new_element.setAttribute('style', dict_to_style(ruleset['default_styles'])) + # Assign default style + element.setAttribute('style', dict_to_style(ruleset['default_styles'])) - # Add UUID if needed - if not new_element.getAttribute('id'): - new_element.setAttribute('id', str(uuid.uuid4())) + # Check if we should apply a ID to this element + if 'id_subfix' in ruleset: + # Check if element already has an ID assigned by the script + id_value = element.getAttribute('id') or '' - # Sort attributes - sort_element_attr(new_element) + if not id_value.startswith(ruleset['id_subfix']): + print('\tAdding ID to element') + element.setAttribute('id', ruleset['id_subfix'] + str(uuid.uuid4())[:8]) - new_layer.appendChild(new_element) + # Sort attributes + sort_element_attr(element) # Sort elements - new_layer.childNodes.sort(key=lambda x: x.getAttribute('id')) + source.childNodes.sort(key=lambda x: x.getAttribute('id')) + +def remove_none_element_nodes(child_nodes): + for node in list(child_nodes): + if not node.nodeType == node.ELEMENT_NODE: + node.parentNode.removeChild(node) + else: + remove_none_element_nodes(node.childNodes) def main(argv): # Load and parse SVG input_xml = minidom.parse(argv[0]) input_svg = input_xml.getElementsByTagName('svg')[0] - # Get 'layers' from SVG - groups = [] - - for element in input_xml.getElementsByTagName('g'): - if not element.getAttribute('id'): - print('WARNING: No id assigned to object group. Skipping object group', element.getAttribute('id')) - #continue - - groups += [element] - - # Sort layers - groups.sort(key=lambda x: x.getAttribute('id')) - - # Create our 'clean' SVG object - clean_xml = minidom.Document() - clean_svg = clean_xml.createElement('svg') - - # Recreate each allowed attribute - svg_allowed_attrs = ['width', 'height', 'viewBox'] - for svg_allowed_attr in svg_allowed_attrs: - # Check if field has a value - if not input_svg.getAttribute(svg_allowed_attr): - continue - - clean_svg.setAttribute(svg_allowed_attr, input_svg.getAttribute(svg_allowed_attr)) - - # Set SVG default attributes - for attribute, value in default_svg_attrs.items(): - clean_svg.setAttribute(attribute, value) + # Remove none element nodes + remove_none_element_nodes(input_xml.childNodes) - # Sort attributes - sort_element_attr(clean_svg) + # Format SVG element + print('Formatting SVG tag') + filter_allowed_attributes(input_svg, element_format_rules['svg']['allowed_attrs']) + sort_element_attr(input_svg) - # Process each object group - layer_allowed_attrs = ['id', 'transform'] - for group in groups: - print('Processsing layer:', group.getAttribute('id')) - - # Create group element - new_group = clean_xml.createElement('g') - - # Set default attributes - for layer_attr, value in default_layer_attrs.items(): - new_group.setAttribute(layer_attr, value) - - # Recreate each allowed attribute in the newly created element - for svg_allowed_attr in layer_allowed_attrs: - # Check if field has a value - if not group.getAttribute(svg_allowed_attr): - continue - - new_group.setAttribute(svg_allowed_attr, group.getAttribute(svg_allowed_attr)) - - # Add ID if needed - if not element.getAttribute('id'): - element.setAttribute('id', str(uuid.uuid4())) - - # Sort attributes - sort_element_attr(new_group) + # Format groups + print('Formatting groups') + format_group_elements(input_xml, input_svg, element_format_rules['groups']) - # Sub elements of current layer - group_id = group.getAttribute('id') - - if group_id in ['bottom_board', 'top_board']: - format_group_elements(clean_xml, group, new_group, element_group_format_rules['image']) - elif group_id in ['bottom_zones', 'top_zones']: - format_group_elements(clean_xml, group, new_group, element_group_format_rules['zones']) - elif group_id in ['bottom_traces', 'top_traces']: - format_group_elements(clean_xml, group, new_group, element_group_format_rules['traces']) + for element in list(input_svg.childNodes): + element_id = element.getAttribute('id') - # - clean_svg.appendChild(new_group) + print('Formatting SVG child elements:', element_id) - # Append SVG object to the document - clean_xml.appendChild(clean_svg) + if element_id in ['bottom_board', 'top_board']: + format_group_elements(input_xml, element, element_format_rules['image']) + elif element_id in ['bottom_zones', 'top_zones']: + format_group_elements(input_xml, element, element_format_rules['zones']) + elif element_id in ['bottom_traces', 'top_traces']: + format_group_elements(input_xml, element, element_format_rules['traces']) + else: + print('\tWARNING: Removing unknown child element', element.tagName, element_id) + element.parentNode.removeChild(element) # Write out simplified SVG - open(argv[1], 'wb').write(clean_xml.toprettyxml('\t', '\n', 'UTF-8')) + open(argv[1], 'wb').write(input_xml.toprettyxml('\t', '\n', 'UTF-8')) if __name__ == '__main__': main(sys.argv[1:])