aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--LICENSE661
-rw-r--r--Makefile11
-rw-r--r--src/lambda_sink.cpp36
-rw-r--r--src/main.cpp105
-rw-r--r--src/out_gerber.cpp99
-rw-r--r--src/out_svg.cpp80
-rw-r--r--src/svg_color.cpp44
-rw-r--r--src/svg_color.h38
-rw-r--r--src/svg_doc.cpp105
-rw-r--r--src/svg_doc.h97
-rw-r--r--src/svg_geom.cpp44
-rw-r--r--src/svg_geom.h38
-rw-r--r--src/svg_import_util.cpp46
-rw-r--r--src/svg_import_util.h38
-rw-r--r--src/svg_path.cpp36
-rw-r--r--src/svg_path.h36
-rw-r--r--src/svg_pattern.cpp36
-rw-r--r--src/svg_pattern.h38
-rw-r--r--src/vec_core.cpp50
-rw-r--r--src/vec_core.h39
-rw-r--r--src/vec_grid.cpp40
-rw-r--r--src/vec_grid.h41
m---------upstream/argagg0
24 files changed, 1281 insertions, 480 deletions
diff --git a/.gitmodules b/.gitmodules
index 01440f9..dfae908 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "upstream/poisson-disk-sampling"]
path = upstream/poisson-disk-sampling
url = https://github.com/thinks/poisson-disk-sampling
+[submodule "upstream/argagg"]
+ path = upstream/argagg
+ url = https://github.com/vietjtnguyen/argagg
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..be3f7b2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are 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.
+
+ 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.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ 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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ 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 AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/Makefile b/Makefile
index 062c50e..a835928 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CXX := clang
+CXX := clang++
LD := ld
PKG_CONFIG ?= pkg-config
@@ -12,14 +12,19 @@ SOURCES := src/svg_color.cpp \
src/svg_path.cpp \
src/svg_pattern.cpp \
src/vec_core.cpp \
- src/vec_grid.cpp
+ src/vec_grid.cpp \
+ src/main.cpp \
+ src/out_svg.cpp \
+ src/out_gerber.cpp \
+ src/lambda_sink.cpp \
CLIPPER_SOURCES := upstream/clipper-6.4.2/cpp/clipper.cpp upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.cpp
CLIPPER_INCLUDES := -Iupstream/clipper-6.4.2/cpp -Iupstream/clipper-6.4.2/cpp/cpp_cairo/
VORONOI_INCLUDES := -Iupstream/voronoi/src
POISSON_INCLUDES := -Iupstream/poisson-disk-sampling/thinks/poisson_disk_sampling/
BASE64_INCLUDES := -Iupstream/cpp-base64
-INCLUDES := $(CLIPPER_INCLUDES) $(VORONOI_INCLUDES) $(POISSON_INCLUDES) $(BASE64_INCLUDES)
+ARGAGG_INCLUDES := -Iupstream/argagg/include/argagg
+INCLUDES := -Iinclude -Isrc $(CLIPPER_INCLUDES) $(VORONOI_INCLUDES) $(POISSON_INCLUDES) $(BASE64_INCLUDES) $(ARGAGG_INCLUDES)
CXXFLAGS := -std=c++2a -g -Wall -Wextra
CXXFLAGS += $(shell $(PKG_CONFIG) --cflags pangocairo pugixml opencv4)
diff --git a/src/lambda_sink.cpp b/src/lambda_sink.cpp
new file mode 100644
index 0000000..5172f24
--- /dev/null
+++ b/src/lambda_sink.cpp
@@ -0,0 +1,36 @@
+/*
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <gerbolyze.hpp>
+#include <svg_import_defs.h>
+
+using namespace gerbolyze;
+using namespace std;
+
+LambdaPolygonSink& LambdaPolygonSink::operator<<(const Polygon &poly) {
+ m_lambda(poly, m_currentPolarity);
+ return *this;
+}
+
+LambdaPolygonSink& LambdaPolygonSink::operator<<(GerberPolarityToken pol) {
+ m_currentPolarity = pol;
+ return *this;
+}
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..0ea1fba
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,105 @@
+
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <argagg.hpp>
+#include <gerbolyze.hpp>
+
+using argagg::parser_results;
+using argagg::parser;
+using namespace std;
+using namespace gerbolyze;
+
+int main(int argc, char **argv) {
+ parser argparser {{
+ {"help", {"-h", "--help"},
+ "Print help and exit",
+ 0},
+ {"version", {"-v", "--version"},
+ "Print version and exit",
+ 0},
+ {"ofmt", {"-o", "--output-format"},
+ "Output format. Supported: gerber, svg, s-exp (KiCAD S-Expression)",
+ 1},
+ {"flatten", {"-f", "--flatten"},
+ "Flatten output so it only consists of non-overlapping white polygons. This perform composition at the vector level. Potentially slow.",
+ 0},
+ }};
+
+
+ ostringstream usage;
+ usage
+ << argv[0] << " " << lib_version << endl
+ << endl
+ << "Usage: " << argv[0] << " [options]... [input_file] [output_file]" << endl
+ << endl
+ << "Specify \"-\" for stdin/stdout." << endl
+ << endl;
+
+ argagg::parser_results args;
+ try {
+ args = argparser.parse(argc, argv);
+ } catch (const std::exception& e) {
+ argagg::fmt_ostream fmt(cerr);
+ fmt << usage.str() << argparser << '\n'
+ << "Encountered exception while parsing arguments: " << e.what()
+ << '\n';
+ return EXIT_FAILURE;
+ }
+
+ if (args["help"]) {
+ argagg::fmt_ostream fmt(cerr);
+ fmt << usage.str() << argparser;
+ return EXIT_SUCCESS;
+ }
+
+ if (args["version"]) {
+ cerr << lib_version << endl;
+ return EXIT_SUCCESS;
+ }
+
+ string in_f_name;
+ istream *in_f = &cin;
+ ifstream in_f_file;
+ string out_f_name;
+ ostream *out_f = &cout;
+ ofstream out_f_file;
+
+ if (args.pos.size() >= 1) {
+ in_f_name = args.pos[0];
+
+ if (args.pos.size() >= 2) {
+ out_f_name = args.pos[1];
+ }
+ }
+
+ if (!in_f_name.empty() && in_f_name != "-") {
+ in_f_file.open(in_f_name);
+ if (!in_f_file) {
+ cerr << "Cannot open input file \"" << in_f_name << "\"" << endl;
+ return EXIT_FAILURE;
+ }
+ in_f = &in_f_file;
+ }
+
+ if (!out_f_name.empty() && out_f_name != "-") {
+ out_f_file.open(out_f_name);
+ if (!out_f_file) {
+ cerr << "Cannot open output file \"" << out_f_name << "\"" << endl;
+ return EXIT_FAILURE;
+ }
+ out_f = &out_f_file;
+ }
+
+
+ SVGDocument doc;
+ if (!doc.load(*in_f)) {
+ cerr << "Error loading input file \"" << in_f_name << "\", exiting." << endl;
+ return EXIT_FAILURE;
+ }
+
+ SimpleGerberOutput out(*out_f);
+ doc.render(out);
+ return EXIT_SUCCESS;
+}
diff --git a/src/out_gerber.cpp b/src/out_gerber.cpp
new file mode 100644
index 0000000..c320184
--- /dev/null
+++ b/src/out_gerber.cpp
@@ -0,0 +1,99 @@
+/*
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <iostream>
+#include <iomanip>
+#include <gerbolyze.hpp>
+#include <svg_import_defs.h>
+
+using namespace gerbolyze;
+using namespace std;
+
+SimpleGerberOutput::SimpleGerberOutput(ostream &out, bool only_polys, int digits_int, int digits_frac, d2p offset)
+ : StreamPolygonSink(out, only_polys),
+ m_digits_int(digits_int),
+ m_digits_frac(digits_frac),
+ m_offset(offset)
+{
+ assert(1 <= digits_int && digits_int <= 9);
+ assert(0 <= digits_frac && digits_frac <= 9);
+ m_gerber_scale = round(pow(10, m_digits_frac));
+}
+
+void SimpleGerberOutput::header_impl(d2p origin, d2p size) {
+ m_offset[0] += origin[0];
+ m_offset[1] += origin[1];
+ m_width = size[0] - origin[0];
+ m_height = size[1] - origin[1];
+
+ if (pow(10, m_digits_int-1) < max(m_width, m_height)) {
+ cerr << "Warning: Input has bounding box too large for " << m_digits_int << "." << m_digits_frac << " gerber resolution!" << endl;
+ }
+
+ m_out << "%FSLAX" << m_digits_int << m_digits_frac << "Y" << m_digits_int << m_digits_frac << "*%" << endl;
+ m_out << "%MOMM*%" << endl;
+ m_out << "%LPD*%" << endl;
+ m_out << "G01*" << endl;
+ m_out << "%ADD10C,0.050000*%" << endl;
+ m_out << "D10*" << endl;
+}
+
+SimpleGerberOutput& SimpleGerberOutput::operator<<(GerberPolarityToken pol) {
+ if (pol == GRB_POL_DARK) {
+ m_out << "%LPD*%" << endl;
+ } else if (pol == GRB_POL_CLEAR) {
+ m_out << "%LPC*%" << endl;
+ } else {
+ assert(false);
+ }
+
+ return *this;
+}
+SimpleGerberOutput& SimpleGerberOutput::operator<<(const Polygon &poly) {
+ if (poly.size() < 3) {
+ cerr << "Warning: " << poly.size() << "-element polygon passed to SimpleGerberOutput" << endl;
+ return *this;
+ }
+
+ /* NOTE: Clipper and gerber both have different fixed-point scales. We get points in double mm. */
+ double x = round((poly[0][0] + m_offset[0]) * m_gerber_scale);
+ double y = round((m_height - poly[0][1] + m_offset[1]) * m_gerber_scale);
+ m_out << "G36*" << endl;
+ m_out << "X" << setw(m_digits_int + m_digits_frac) << setfill('0') << (long long int)x
+ << "Y" << setw(m_digits_int + m_digits_frac) << setfill('0') << (long long int)y
+ << "D02*" << endl;
+ m_out << "G01*" << endl;
+ for (size_t i=1; i<poly.size(); i++) {
+ double x = round((poly[i][0] + m_offset[0]) * m_gerber_scale);
+ double y = round((m_height - poly[i][1] + m_offset[1]) * m_gerber_scale);
+ m_out << "X" << setw(m_digits_int + m_digits_frac) << setfill('0') << (long long int)x
+ << "Y" << setw(m_digits_int + m_digits_frac) << setfill('0') << (long long int)y
+ << "D01*" << endl;
+ }
+ m_out << "G37*" << endl;
+
+ return *this;
+}
+
+void SimpleGerberOutput::footer_impl() {
+ m_out << "M02*" << endl;
+}
+
diff --git a/src/out_svg.cpp b/src/out_svg.cpp
new file mode 100644
index 0000000..159bf13
--- /dev/null
+++ b/src/out_svg.cpp
@@ -0,0 +1,80 @@
+/*
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <cmath>
+#include <algorithm>
+#include <string>
+#include <iostream>
+#include <iomanip>
+#include <gerbolyze.hpp>
+#include <svg_import_defs.h>
+
+using namespace gerbolyze;
+using namespace std;
+
+SimpleSVGOutput::SimpleSVGOutput(ostream &out, bool only_polys, int digits_frac, string dark_color, string clear_color)
+ : StreamPolygonSink(out, only_polys),
+ m_digits_frac(digits_frac),
+ m_dark_color(dark_color),
+ m_clear_color(clear_color),
+ m_current_color(dark_color)
+{
+}
+
+void SimpleSVGOutput::header_impl(d2p origin, d2p size) {
+ m_offset[0] = origin[0];
+ m_offset[1] = origin[1];
+ m_out << "<svg width=\"" << size[0] << "mm\" height=\"" << size[1] << "mm\" viewBox=\"0 0 "
+ << size[0] << " " << size[1] << "\" xmlns=\"http://www.w3.org/2000/svg\">" << endl;
+}
+
+SimpleSVGOutput &SimpleSVGOutput::operator<<(GerberPolarityToken pol) {
+ if (pol == GRB_POL_DARK) {
+ m_current_color = m_dark_color;
+ } else if (pol == GRB_POL_CLEAR) {
+ m_current_color = m_clear_color;
+ } else {
+ assert(false);
+ }
+
+ return *this;
+}
+
+SimpleSVGOutput &SimpleSVGOutput::operator<<(const Polygon &poly) {
+ if (poly.size() < 3) {
+ cerr << "Warning: " << poly.size() << "-element polygon passed to SimpleGerberOutput" << endl;
+ return *this;
+ }
+
+ m_out << "<path fill=\"" << m_current_color << "\" d=\"";
+ m_out << "M " << setprecision(m_digits_frac) << (poly[0][0] + m_offset[0])
+ << " " << setprecision(m_digits_frac) << (poly[0][1] + m_offset[1]);
+ for (size_t i=1; i<poly.size(); i++) {
+ m_out << " L " << setprecision(m_digits_frac) << (poly[i][0] + m_offset[0])
+ << " " << setprecision(m_digits_frac) << (poly[i][1] + m_offset[1]);
+ }
+ m_out << " Z";
+ m_out << "\"/>" << endl;
+
+ return *this;
+}
+
+void SimpleSVGOutput::footer_impl() {
+ m_out << "</svg>" << endl;
+}
+
diff --git a/src/svg_color.cpp b/src/svg_color.cpp
index acd793d..5f1d693 100644
--- a/src/svg_color.cpp
+++ b/src/svg_color.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "svg_color.h"
@@ -28,7 +22,7 @@
#include <string>
#include <cmath>
-using namespace svg_plugin;
+using namespace gerbolyze;
using namespace std;
/* Map an SVG fill or stroke definition (color, but may also be a pattern) to a gerber color.
@@ -36,7 +30,7 @@ using namespace std;
* This function handles transparency: Transparent SVG colors are mapped such that no gerber output is generated for
* them.
*/
-enum gerber_color svg_plugin::svg_color_to_gerber(string color, string opacity, enum gerber_color default_val) {
+enum gerber_color gerbolyze::svg_color_to_gerber(string color, string opacity, enum gerber_color default_val) {
float alpha = 1.0;
if (!opacity.empty() && opacity[0] != '\0') {
char *endptr = nullptr;
@@ -71,7 +65,7 @@ enum gerber_color svg_plugin::svg_color_to_gerber(string color, string opacity,
return GRB_DARK;
}
-svg_plugin::RGBColor::RGBColor(string hex) {
+gerbolyze::RGBColor::RGBColor(string hex) {
assert(hex[0] == '#');
char *endptr = nullptr;
const char *c = hex.data();
@@ -84,7 +78,7 @@ svg_plugin::RGBColor::RGBColor(string hex) {
b = ((rgb >> 0) & 0xff) / 255.0f;
};
-svg_plugin::HSVColor::HSVColor(const RGBColor &color) {
+gerbolyze::HSVColor::HSVColor(const RGBColor &color) {
float xmax = fmax(color.r, fmax(color.g, color.b));
float xmin = fmin(color.r, fmin(color.g, color.b));
float c = xmax - xmin;
@@ -104,7 +98,7 @@ svg_plugin::HSVColor::HSVColor(const RGBColor &color) {
}
/* Invert gerber color */
-enum gerber_color svg_plugin::gerber_color_invert(enum gerber_color color) {
+enum gerber_color gerbolyze::gerber_color_invert(enum gerber_color color) {
switch (color) {
case GRB_CLEAR: return GRB_DARK;
case GRB_DARK: return GRB_CLEAR;
@@ -113,12 +107,12 @@ enum gerber_color svg_plugin::gerber_color_invert(enum gerber_color color) {
}
/* Read node's fill attribute and convert it to a gerber color */
-enum gerber_color svg_plugin::gerber_fill_color(const pugi::xml_node &node) {
+enum gerber_color gerbolyze::gerber_fill_color(const pugi::xml_node &node) {
return svg_color_to_gerber(node.attribute("fill").value(), node.attribute("fill-opacity").value(), GRB_DARK);
}
/* Read node's stroke attribute and convert it to a gerber color */
-enum gerber_color svg_plugin::gerber_stroke_color(const pugi::xml_node &node) {
+enum gerber_color gerbolyze::gerber_stroke_color(const pugi::xml_node &node) {
return svg_color_to_gerber(node.attribute("stroke").value(), node.attribute("stroke-opacity").value(), GRB_NONE);
}
diff --git a/src/svg_color.h b/src/svg_color.h
index 5183dab..2817cd9 100644
--- a/src/svg_color.h
+++ b/src/svg_color.h
@@ -1,33 +1,26 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef SVG_COLOR_H
-#define SVG_COLOR_H
+#pragma once
#include <pugixml.hpp>
-namespace svg_plugin {
+namespace gerbolyze {
/* Enum that describes the color with which an SVG primite should be exported */
enum gerber_color {
@@ -54,6 +47,5 @@ enum gerber_color gerber_color_invert(enum gerber_color color);
enum gerber_color gerber_fill_color(const pugi::xml_node &node);
enum gerber_color gerber_stroke_color(const pugi::xml_node &node);
-} /* namespace svg_plugin */
+} /* namespace gerbolyze */
-#endif /* SVG_COLOR_H */
diff --git a/src/svg_doc.cpp b/src/svg_doc.cpp
index 2543146..518e7ed 100644
--- a/src/svg_doc.cpp
+++ b/src/svg_doc.cpp
@@ -1,57 +1,59 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <iostream>
+#include <fstream>
+
#include "svg_import_defs.h"
-#include "svg_doc.h"
#include "svg_color.h"
#include "svg_geom.h"
#include "svg_path.h"
#include "vec_core.h"
-using namespace svg_plugin;
+using namespace gerbolyze;
using namespace std;
using namespace ClipperLib;
-using namespace vectorizer;
-svg_plugin::SVGDocument::~SVGDocument() {
+gerbolyze::SVGDocument::~SVGDocument() {
if (cr)
cairo_destroy (cr);
if (surface)
cairo_surface_destroy (surface);
}
-bool svg_plugin::SVGDocument::load(string filename, string debug_out_filename) {
+bool gerbolyze::SVGDocument::load(string filename, string debug_out_filename) {
+ ifstream in_f;
+ in_f.open(filename);
+
+ return in_f && load(in_f, debug_out_filename);
+}
+
+bool gerbolyze::SVGDocument::load(istream &in, string debug_out_filename) {
/* Load XML document */
- auto res = svg_doc.load_file(filename.c_str());
+ auto res = svg_doc.load(in);
if (!res) {
- cerr << "Cannot open input file \"" << filename << "\": " << res << endl;
+ cerr << "Cannot parse input file" << endl;
return false;
}
root_elem = svg_doc.child("svg");
if (!root_elem) {
- cerr << "Cannot load input file \"" << filename << endl;
+ cerr << "Input file is missing root <svg> element" << endl;
return false;
}
@@ -90,7 +92,7 @@ bool svg_plugin::SVGDocument::load(string filename, string debug_out_filename) {
return true;
}
-const Paths *svg_plugin::SVGDocument::lookup_clip_path(const pugi::xml_node &node) {
+const Paths *gerbolyze::SVGDocument::lookup_clip_path(const pugi::xml_node &node) {
string id(usvg_id_url(node.attribute("clip-path").value()));
if (id.empty() || !clip_path_map.contains(id)) {
return nullptr;
@@ -98,7 +100,7 @@ const Paths *svg_plugin::SVGDocument::lookup_clip_path(const pugi::xml_node &nod
return &clip_path_map[id];
}
-Pattern *svg_plugin::SVGDocument::lookup_pattern(const string id) {
+Pattern *gerbolyze::SVGDocument::lookup_pattern(const string id) {
if (id.empty() || !pattern_map.contains(id)) {
return nullptr;
}
@@ -106,16 +108,16 @@ Pattern *svg_plugin::SVGDocument::lookup_pattern(const string id) {
};
/* Used to convert mm values from configuration such as the minimum feature size into document units. */
-double svg_plugin::SVGDocument::mm_to_doc_units(double mm) const {
+double gerbolyze::SVGDocument::mm_to_doc_units(double mm) const {
return mm * (vb_w / page_w_mm);
}
-double svg_plugin::SVGDocument::doc_units_to_mm(double px) const {
+double gerbolyze::SVGDocument::doc_units_to_mm(double px) const {
return px / (vb_w / page_w_mm);
}
/* Recursively export all SVG elements in the given group. */
-void svg_plugin::SVGDocument::export_svg_group(const pugi::xml_node &group, Paths &parent_clip_path) {
+void gerbolyze::SVGDocument::export_svg_group(const pugi::xml_node &group, Paths &parent_clip_path) {
/* Enter the group's coordinate system */
cairo_save(cr);
apply_cairo_transform_from_svg(cr, group.attribute("transform").value());
@@ -137,19 +139,12 @@ void svg_plugin::SVGDocument::export_svg_group(const pugi::xml_node &group, Path
/* Clip against parent's clip path (both are now in document coordinates) */
if (!parent_clip_path.empty()) {
if (!clip_path.empty()) {
- cerr << "Combining clip paths" << endl;
combine_clip_paths(parent_clip_path, clip_path, clip_path);
} else {
- cerr << "using parent clip path" << endl;
clip_path = parent_clip_path;
}
}
- ClipperLib::Clipper c2;
- c2.AddPaths(clip_path, ptSubject, /* closed */ true);
- ClipperLib::IntRect bbox = c2.GetBounds();
- cerr << "clip path is now: bbox={" << bbox.left << ", " << bbox.top << "} - {" << bbox.right << ", " << bbox.bottom << "}" << endl;
-
/* Iterate over the group's children, exporting them one by one. */
for (const auto &node : group.children()) {
string name(node.name());
@@ -162,7 +157,7 @@ void svg_plugin::SVGDocument::export_svg_group(const pugi::xml_node &group, Path
} else if (name == "image") {
double min_feature_size_mm = 0.1; /* TODO make configurable */
double min_feature_size_px = mm_to_doc_units(min_feature_size_mm);
- vectorize_image(cr, node, min_feature_size_px, clip_path, viewport_matrix);
+ vectorize_image(cr, node, min_feature_size_px, clip_path, viewport_matrix, *polygon_sink);
} else if (name == "defs") {
/* ignore */
} else {
@@ -174,7 +169,7 @@ void svg_plugin::SVGDocument::export_svg_group(const pugi::xml_node &group, Path
}
/* Export an SVG path element to gerber. Apply patterns and clip on the fly. */
-void svg_plugin::SVGDocument::export_svg_path(const pugi::xml_node &node, Paths &clip_path) {
+void gerbolyze::SVGDocument::export_svg_path(const pugi::xml_node &node, Paths &clip_path) {
enum gerber_color fill_color = gerber_fill_color(node);
enum gerber_color stroke_color = gerber_stroke_color(node);
@@ -253,8 +248,7 @@ void svg_plugin::SVGDocument::export_svg_path(const pugi::xml_node &node, Paths
out.push_back(std::array<double, 2>{
((double)p.X) / clipper_scale, ((double)p.Y) / clipper_scale
});
- std::cerr << "calling sink" << std::endl;
- polygon_sink(out, fill_color == GRB_DARK);
+ *polygon_sink << (fill_color == GRB_DARK ? GRB_POL_DARK : GRB_POL_CLEAR) << out;
}
cairo_restore(cr);
}
@@ -341,28 +335,37 @@ void svg_plugin::SVGDocument::export_svg_path(const pugi::xml_node &node, Paths
out.push_back(std::array<double, 2>{
((double)p.X) / clipper_scale, ((double)p.Y) / clipper_scale
});
- std::cerr << "calling sink" << std::endl;
- polygon_sink(out, stroke_color == GRB_DARK);
+ *polygon_sink << (stroke_color == GRB_DARK ? GRB_POL_DARK : GRB_POL_CLEAR) << out;
}
cairo_restore(cr);
}
}
}
-void svg_plugin::SVGDocument::do_export(string debug_out_filename) {
+void gerbolyze::SVGDocument::render(PolygonSink &sink) {
assert(_valid);
/* Export the actual SVG document to both SVG for debuggin and to gerber. We do this as we go, i.e. we immediately
* process each element to gerber as we encounter it instead of first rendering everything to a giant list of gerber
* primitives and then serializing those later. Exporting them on the fly saves a ton of memory and is much faster.
*/
+ polygon_sink = &sink;
+ sink.header({vb_x, vb_y}, {vb_w, vb_h});
ClipperLib::Clipper c;
c.AddPaths(vb_paths, ptSubject, /* closed */ true);
ClipperLib::IntRect bbox = c.GetBounds();
cerr << "document viewbox clip: bbox={" << bbox.left << ", " << bbox.top << "} - {" << bbox.right << ", " << bbox.bottom << "}" << endl;
export_svg_group(root_elem, vb_paths);
+ sink.footer();
}
-void svg_plugin::SVGDocument::setup_debug_output(string filename) {
+void gerbolyze::SVGDocument::render_to_list(vector<pair<Polygon, GerberPolarityToken>> &out) {
+ LambdaPolygonSink sink([&out](const Polygon &poly, GerberPolarityToken pol) {
+ out.emplace_back(pair<Polygon, GerberPolarityToken>{poly, pol});
+ });
+ render(sink);
+}
+
+void gerbolyze::SVGDocument::setup_debug_output(string filename) {
/* Setup cairo to draw into a SVG surface (for debugging). For actual rendering, something like a recording surface
* would work fine, too. */
/* Cairo expects the SVG surface size to be given in pt (72.0 pt = 1.0 in = 25.4 mm) */
@@ -387,31 +390,27 @@ void svg_plugin::SVGDocument::setup_debug_output(string filename) {
cairo_set_source_rgba (cr, 1.0, 0.0, 0.0, 1.0);
}
-void svg_plugin::SVGDocument::setup_viewport_clip() {
+void gerbolyze::SVGDocument::setup_viewport_clip() {
/* Set up view port clip path */
Path vb_path;
for (auto &elem : vector<pair<double, double>> {{vb_x, vb_y}, {vb_x+vb_w, vb_y}, {vb_x+vb_w, vb_y+vb_h}, {vb_x, vb_y+vb_h}}) {
double x = elem.first, y = elem.second;
vb_path.push_back({ (cInt)round(x * clipper_scale), (cInt)round(y * clipper_scale) });
- cerr << "adding to path: " << (cInt)round(x * clipper_scale) << ", " << (cInt)round(y * clipper_scale) << endl;
}
vb_paths.push_back(vb_path);
ClipperLib::Clipper c;
c.AddPaths(vb_paths, ptSubject, /* closed */ true);
- ClipperLib::IntRect bbox = c.GetBounds();
- cerr << "did set up viewbox clip: bbox={" << bbox.left << ", " << bbox.top << "} - {" << bbox.right << ", " << bbox.bottom << "}" << endl;
- export_svg_group(root_elem, vb_paths);
}
-void svg_plugin::SVGDocument::load_patterns() {
+void gerbolyze::SVGDocument::load_patterns() {
/* Set up document-wide pattern registry. Load patterns from <defs> node. */
for (const auto &node : defs_node.children("pattern")) {
pattern_map.emplace(std::piecewise_construct, std::forward_as_tuple(node.attribute("id").value()), std::forward_as_tuple(node, *this));
}
}
-void svg_plugin::SVGDocument::load_clips() {
+void gerbolyze::SVGDocument::load_clips() {
/* Set up document-wide clip path registry: Extract clip path definitions from <defs> element */
for (const auto &node : defs_node.children("clipPath")) {
cairo_save(cr);
diff --git a/src/svg_doc.h b/src/svg_doc.h
deleted file mode 100644
index 01a4e7a..0000000
--- a/src/svg_doc.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef SVG_DOC_H
-#define SVG_DOC_H
-
-#include <map>
-
-#include <pugixml.hpp>
-
-#include "svg_pattern.h"
-
-namespace svg_plugin {
-
- typedef std::function<void (std::vector<std::array<double, 2>>, bool)> polygon_sink_fun;
-
- class SVGDocument {
- public:
- SVGDocument() : _valid(false) {}
- SVGDocument(polygon_sink_fun sink_fun) : _valid(false), polygon_sink(sink_fun) {}
- ~SVGDocument();
-
- /* true -> load successful */
- bool load(std::string filename, std::string debug_out_filename="/tmp/kicad_svg_debug.svg");
- /* true -> load successful */
- bool valid() const { return _valid; }
- operator bool() const { return valid(); }
-
- double mm_to_doc_units(double) const;
- double doc_units_to_mm(double) const;
-
- double width() const { return page_w_mm; }
- double height() const { return page_h_mm; }
-
- void do_export(std::string debug_out_filename="");
-
- private:
- friend class Pattern;
-
- cairo_t *cairo() { return cr; }
- const ClipperLib::Paths *lookup_clip_path(const pugi::xml_node &node);
- Pattern *lookup_pattern(const std::string id);
-
- void export_svg_group(const pugi::xml_node &group, ClipperLib::Paths &parent_clip_path);
- void export_svg_path(const pugi::xml_node &node, ClipperLib::Paths &clip_path);
- void setup_debug_output(std::string filename="");
- void setup_viewport_clip();
- void load_clips();
- void load_patterns();
-
- bool _valid;
- pugi::xml_document svg_doc;
- pugi::xml_node root_elem;
- pugi::xml_node defs_node;
- double vb_x, vb_y, vb_w, vb_h;
- double page_w, page_h;
- double page_w_mm, page_h_mm;
- std::map<std::string, Pattern> pattern_map;
- std::map<std::string, ClipperLib::Paths> clip_path_map;
- cairo_matrix_t viewport_matrix;
- ClipperLib::Paths vb_paths; /* viewport clip rect */
-
- cairo_t *cr = nullptr;
- cairo_surface_t *surface = nullptr;
-
- polygon_sink_fun polygon_sink;
-
- static constexpr double dbg_fill_alpha = 0.8;
- static constexpr double dbg_stroke_alpha = 1.0;
- static constexpr double assumed_usvg_dpi = 96.0;
- };
-
-} /* namespace svg_plugin */
-
-#endif /* SVG_DOC_H */
-
diff --git a/src/svg_geom.cpp b/src/svg_geom.cpp
index 0e40e7b..e152f3a 100644
--- a/src/svg_geom.cpp
+++ b/src/svg_geom.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "svg_geom.h"
@@ -35,7 +29,7 @@ using namespace ClipperLib;
using namespace std;
/* Get bounding box of a Clipper Paths */
-IntRect svg_plugin::get_paths_bounds(const Paths &paths) {
+IntRect gerbolyze::get_paths_bounds(const Paths &paths) {
if (paths.empty()) {
return {0, 0, 0, 0};
}
@@ -66,7 +60,7 @@ IntRect svg_plugin::get_paths_bounds(const Paths &paths) {
return {x0, y0, x1, y1};
}
-enum ClipperLib::PolyFillType svg_plugin::clipper_fill_rule(const pugi::xml_node &node) {
+enum ClipperLib::PolyFillType gerbolyze::clipper_fill_rule(const pugi::xml_node &node) {
string val(node.attribute("fill-rule").value());
if (val == "evenodd")
return ClipperLib::pftEvenOdd;
@@ -74,7 +68,7 @@ enum ClipperLib::PolyFillType svg_plugin::clipper_fill_rule(const pugi::xml_node
return ClipperLib::pftNonZero; /* default */
}
-enum ClipperLib::EndType svg_plugin::clipper_end_type(const pugi::xml_node &node) {
+enum ClipperLib::EndType gerbolyze::clipper_end_type(const pugi::xml_node &node) {
string val(node.attribute("stroke-linecap").value());
if (val == "round")
return ClipperLib::etOpenRound;
@@ -85,7 +79,7 @@ enum ClipperLib::EndType svg_plugin::clipper_end_type(const pugi::xml_node &node
return ClipperLib::etOpenButt;
}
-enum ClipperLib::JoinType svg_plugin::clipper_join_type(const pugi::xml_node &node) {
+enum ClipperLib::JoinType gerbolyze::clipper_join_type(const pugi::xml_node &node) {
string val(node.attribute("stroke-linejoin").value());
if (val == "round")
return ClipperLib::jtRound;
@@ -100,7 +94,7 @@ enum ClipperLib::JoinType svg_plugin::clipper_join_type(const pugi::xml_node &no
* all holes from it. We remove holes by splitting each polygon that has a hole into two or more pieces so that the hole
* is no more. These pieces perfectly fit each other so there is no visual or functional difference.
*/
-void svg_plugin::dehole_polytree(PolyNode &ptree, Paths &out) {
+void gerbolyze::dehole_polytree(PolyNode &ptree, Paths &out) {
for (int i=0; i<ptree.ChildCount(); i++) {
PolyNode *nod = ptree.Childs[i];
assert(nod);
@@ -149,7 +143,7 @@ void svg_plugin::dehole_polytree(PolyNode &ptree, Paths &out) {
}
/* Intersect two clip paths. Both must share a coordinate system. */
-void svg_plugin::combine_clip_paths(Paths &in_a, Paths &in_b, Paths &out) {
+void gerbolyze::combine_clip_paths(Paths &in_a, Paths &in_b, Paths &out) {
Clipper c;
c.StrictlySimple(true);
c.AddPaths(in_a, ptClip, /* closed */ true);
@@ -160,7 +154,7 @@ void svg_plugin::combine_clip_paths(Paths &in_a, Paths &in_b, Paths &out) {
/* Transform given clipper paths under the given cairo transform. If no transform is given, use cairo's current
* user-to-device transform. */
-void svg_plugin::transform_paths(cairo_t *cr, Paths &paths, cairo_matrix_t *mat) {
+void gerbolyze::transform_paths(cairo_t *cr, Paths &paths, cairo_matrix_t *mat) {
cairo_save(cr);
if (mat != nullptr) {
cairo_set_matrix(cr, mat);
diff --git a/src/svg_geom.h b/src/svg_geom.h
index dfd1c80..1763d52 100644
--- a/src/svg_geom.h
+++ b/src/svg_geom.h
@@ -1,35 +1,28 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef SVG_GEOM_H
-#define SVG_GEOM_H
+#pragma once
#include <cairo.h>
#include <clipper.hpp>
#include <pugixml.hpp>
-namespace svg_plugin {
+namespace gerbolyze {
ClipperLib::IntRect get_paths_bounds(const ClipperLib::Paths &paths);
enum ClipperLib::PolyFillType clipper_fill_rule(const pugi::xml_node &node);
@@ -39,6 +32,5 @@ void dehole_polytree(ClipperLib::PolyNode &ptree, ClipperLib::Paths &out);
void combine_clip_paths(ClipperLib::Paths &in_a, ClipperLib::Paths &in_b, ClipperLib::Paths &out);
void transform_paths(cairo_t *cr, ClipperLib::Paths &paths, cairo_matrix_t *mat=nullptr);
-} /* namespace svg_plugin */
+} /* namespace gerbolyze */
-#endif /* SVG_GEOM_H */
diff --git a/src/svg_import_util.cpp b/src/svg_import_util.cpp
index 5624bd9..efa7701 100644
--- a/src/svg_import_util.cpp
+++ b/src/svg_import_util.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <cmath>
@@ -28,7 +22,7 @@
using namespace std;
-void svg_plugin::print_matrix(cairo_t *cr, bool print_examples) {
+void gerbolyze::print_matrix(cairo_t *cr, bool print_examples) {
cairo_matrix_t mat;
cairo_get_matrix(cr, &mat);
cerr << " xform matrix = { xx=" << mat.xx << ", yx=" << mat.yx << ", xy=" << mat.xy << ", yy=" << mat.yy << ", x0=" << mat.x0 << ", y0=" << mat.y0 << " }" << endl;
@@ -49,7 +43,7 @@ void svg_plugin::print_matrix(cairo_t *cr, bool print_examples) {
}
/* Read a double value formatted like usvg formats doubles from an SVG attribute */
-double svg_plugin::usvg_double_attr(const pugi::xml_node &node, const char *attr, double default_value) {
+double gerbolyze::usvg_double_attr(const pugi::xml_node &node, const char *attr, double default_value) {
const auto *val = node.attribute(attr).value();
if (*val == '\0')
return default_value;
@@ -58,7 +52,7 @@ double svg_plugin::usvg_double_attr(const pugi::xml_node &node, const char *attr
}
/* Read an url from an usvg attribute */
-string svg_plugin::usvg_id_url(string attr) {
+string gerbolyze::usvg_id_url(string attr) {
if (attr.rfind("url(#", 0) == string::npos)
return string();
@@ -67,7 +61,7 @@ string svg_plugin::usvg_id_url(string attr) {
return attr;
}
-svg_plugin::RelativeUnits svg_plugin::map_str_to_units(string str, svg_plugin::RelativeUnits default_val) {
+gerbolyze::RelativeUnits gerbolyze::map_str_to_units(string str, gerbolyze::RelativeUnits default_val) {
if (str == "objectBoundingBox")
return SVG_ObjectBoundingBox;
else if (str == "userSpaceOnUse")
@@ -75,7 +69,7 @@ svg_plugin::RelativeUnits svg_plugin::map_str_to_units(string str, svg_plugin::R
return default_val;
}
-void svg_plugin::load_cairo_matrix_from_svg(const string &transform, cairo_matrix_t &mat) {
+void gerbolyze::load_cairo_matrix_from_svg(const string &transform, cairo_matrix_t &mat) {
if (transform.empty()) {
cairo_matrix_init_identity(&mat);
return;
@@ -97,14 +91,14 @@ void svg_plugin::load_cairo_matrix_from_svg(const string &transform, cairo_matri
cairo_matrix_init(&mat, a, b, c, d, e, f);
}
-void svg_plugin::apply_cairo_transform_from_svg(cairo_t *cr, const string &transform) {
+void gerbolyze::apply_cairo_transform_from_svg(cairo_t *cr, const string &transform) {
cairo_matrix_t mat;
load_cairo_matrix_from_svg(transform, mat);
cairo_transform(cr, &mat); /* or cairo_transform? */
}
/* Cf. https://tools.ietf.org/html/rfc2397 */
-string svg_plugin::parse_data_iri(const string &data_url) {
+string gerbolyze::parse_data_iri(const string &data_url) {
if (data_url.rfind("data:", 0) == string::npos) /* check if url starts with "data:" */
return string();
@@ -119,7 +113,7 @@ string svg_plugin::parse_data_iri(const string &data_url) {
}
/* for debug svg output */
-void svg_plugin::apply_viewport_matrix(cairo_t *cr, cairo_matrix_t &viewport_matrix) {
+void gerbolyze::apply_viewport_matrix(cairo_t *cr, cairo_matrix_t &viewport_matrix) {
/* Multiply viewport matrix *from the left*, i.e. as if it had been applied *before* the currently set matrix. */
cairo_matrix_t old_matrix;
cairo_get_matrix(cr, &old_matrix);
diff --git a/src/svg_import_util.h b/src/svg_import_util.h
index 8485957..a6cd2d6 100644
--- a/src/svg_import_util.h
+++ b/src/svg_import_util.h
@@ -1,29 +1,22 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef SVG_IMPORT_UTIL_H
-#define SVG_IMPORT_UTIL_H
+#pragma once
#include <math.h>
#include <cmath>
@@ -46,7 +39,7 @@
#include "svg_import_defs.h"
-namespace svg_plugin {
+namespace gerbolyze {
/* Coordinate system selection for things like "patternContentUnits" */
enum RelativeUnits {
@@ -64,6 +57,5 @@ void apply_cairo_transform_from_svg(cairo_t *cr, const std::string &transform);
std::string parse_data_iri(const std::string &data_url);
void apply_viewport_matrix(cairo_t *cr, cairo_matrix_t &viewport_matrix);
-} /* namespace svg_plugin */
+} /* namespace gerbolyze */
-#endif /* SVG_IMPORT_UTIL_H */
diff --git a/src/svg_path.cpp b/src/svg_path.cpp
index 9137e1a..537b5dd 100644
--- a/src/svg_path.cpp
+++ b/src/svg_path.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <cmath>
@@ -101,7 +95,7 @@ static void path_to_clipper_via_cairo(cairo_t *cr, ClipperLib::Clipper &c, const
}
}
-void svg_plugin::load_svg_path(cairo_t *cr, const pugi::xml_node &node, ClipperLib::PolyTree &ptree) {
+void gerbolyze::load_svg_path(cairo_t *cr, const pugi::xml_node &node, ClipperLib::PolyTree &ptree) {
auto *path_data = node.attribute("d").value();
auto fill_rule = clipper_fill_rule(node);
@@ -118,7 +112,7 @@ void svg_plugin::load_svg_path(cairo_t *cr, const pugi::xml_node &node, ClipperL
c.Execute(ClipperLib::ctUnion, ptree, fill_rule, ClipperLib::pftNonZero);
}
-void svg_plugin::parse_dasharray(const pugi::xml_node &node, vector<double> &out) {
+void gerbolyze::parse_dasharray(const pugi::xml_node &node, vector<double> &out) {
out.clear();
string val(node.attribute("stroke-dasharray").value());
@@ -140,7 +134,7 @@ void svg_plugin::parse_dasharray(const pugi::xml_node &node, vector<double> &out
/* Take a Clipper path in clipper-scaled document units, and apply the given SVG dash array to it. Do this by walking
* the path from start to end while emitting dashes. */
-void svg_plugin::dash_path(const ClipperLib::Path &in, ClipperLib::Paths &out, const vector<double> dasharray, double dash_offset) {
+void gerbolyze::dash_path(const ClipperLib::Path &in, ClipperLib::Paths &out, const vector<double> dasharray, double dash_offset) {
out.clear();
if (dasharray.empty() || in.size() < 2) {
out.push_back(in);
diff --git a/src/svg_path.h b/src/svg_path.h
index 0a527f6..9c65fdd 100644
--- a/src/svg_path.h
+++ b/src/svg_path.h
@@ -1,38 +1,30 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef SVG_PATH_H
-#define SVG_PATH_H
+#pragma once
#include <vector>
#include <cairo.h>
#include "svg_geom.h"
-namespace svg_plugin {
+namespace gerbolyze {
void load_svg_path(cairo_t *cr, const pugi::xml_node &node, ClipperLib::PolyTree &ptree);
void parse_dasharray(const pugi::xml_node &node, std::vector<double> &out);
void dash_path(const ClipperLib::Path &in, ClipperLib::Paths &out, const std::vector<double> dasharray, double dash_offset=0.0);
}
-#endif /* SVG_PATH_H */
diff --git a/src/svg_pattern.cpp b/src/svg_pattern.cpp
index 8ca6572..b7eec2e 100644
--- a/src/svg_pattern.cpp
+++ b/src/svg_pattern.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <assert.h>
@@ -27,11 +21,11 @@
#include "svg_pattern.h"
#include "svg_import_defs.h"
#include "svg_geom.h"
-#include "svg_doc.h"
+#include <gerbolyze.hpp>
using namespace std;
-svg_plugin::Pattern::Pattern(const pugi::xml_node &node, SVGDocument &doc) : _node(node), doc(&doc) {
+gerbolyze::Pattern::Pattern(const pugi::xml_node &node, SVGDocument &doc) : _node(node), doc(&doc) {
/* Read pattern attributes from SVG node */
cerr << "creating pattern for node with id \"" << node.attribute("id").value() << "\"" << endl;
x = usvg_double_attr(node, "x");
@@ -53,7 +47,7 @@ svg_plugin::Pattern::Pattern(const pugi::xml_node &node, SVGDocument &doc) : _no
/* Tile pattern into gerber. Note that this function may be called several times in case the pattern is
* referenced from multiple places, so we must not clobber any of the object's state. */
-void svg_plugin::Pattern::tile (ClipperLib::Paths &clip) {
+void gerbolyze::Pattern::tile (ClipperLib::Paths &clip) {
assert(doc);
cairo_t *cr = doc->cairo();
assert(cr);
diff --git a/src/svg_pattern.h b/src/svg_pattern.h
index e11fde5..3780d79 100644
--- a/src/svg_pattern.h
+++ b/src/svg_pattern.h
@@ -1,29 +1,22 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef SVG_PATTERN_H
-#define SVG_PATTERN_H
+#pragma once
#include <string>
#include <cairo.h>
@@ -33,7 +26,7 @@
#include "svg_import_util.h"
-namespace svg_plugin {
+namespace gerbolyze {
class SVGDocument;
@@ -55,6 +48,5 @@ private:
SVGDocument *doc = nullptr;
};
-} /* namespace svg_plugin */
+} /* namespace gerbolyze */
-#endif /* SVG_PATTERN_H */
diff --git a/src/vec_core.cpp b/src/vec_core.cpp
index 0c60c7d..d329722 100644
--- a/src/vec_core.cpp
+++ b/src/vec_core.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <cmath>
@@ -32,7 +26,7 @@
#include "svg_import_defs.h"
#include "jc_voronoi.h"
-using namespace svg_plugin;
+using namespace gerbolyze;
using namespace std;
/* debug function */
@@ -84,7 +78,7 @@ static void voronoi_relax_points(const jcv_diagram* diagram, jcv_point* points)
* 4. It scales each of these voronoi cell polygons to match the input images brightness at the spot covered by this
* cell.
*/
-void vectorizer::vectorize_image(cairo_t *cr, const pugi::xml_node &node, double min_feature_size_px, ClipperLib::Paths &clip_path, cairo_matrix_t &viewport_matrix) {
+void gerbolyze::vectorize_image(cairo_t *cr, const pugi::xml_node &node, double min_feature_size_px, ClipperLib::Paths &clip_path, cairo_matrix_t &viewport_matrix, PolygonSink &sink) {
/* Read XML node attributes */
auto x = usvg_double_attr(node, "x", 0.0);
auto y = usvg_double_attr(node, "y", 0.0);
@@ -158,8 +152,12 @@ void vectorizer::vectorize_image(cairo_t *cr, const pugi::xml_node &node, double
cairo_save(cr);
cairo_identity_matrix(cr);
for (const auto &poly : rect_out) {
- /* FIXME */
- //export_as_gerber(cr, poly, /* dark */ false);
+ vector<array<double, 2>> out;
+ for (const auto &p : poly)
+ out.push_back(std::array<double, 2>{
+ ((double)p.X) / clipper_scale, ((double)p.Y) / clipper_scale
+ });
+ sink << GRB_POL_CLEAR << out;
}
cairo_restore(cr);
@@ -324,8 +322,12 @@ void vectorizer::vectorize_image(cairo_t *cr, const pugi::xml_node &node, double
cairo_save(cr);
cairo_identity_matrix(cr);
for (const auto &poly : polys) {
- /* FIXME */
- //export_as_gerber(cr, poly, /* dark */ true);
+ vector<array<double, 2>> out;
+ for (const auto &p : poly)
+ out.push_back(std::array<double, 2>{
+ ((double)p.X) / clipper_scale, ((double)p.Y) / clipper_scale
+ });
+ sink << GRB_POL_DARK << out;
}
cairo_restore(cr);
}
diff --git a/src/vec_core.h b/src/vec_core.h
index 20ffd24..643efc9 100644
--- a/src/vec_core.h
+++ b/src/vec_core.h
@@ -1,37 +1,30 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef VEC_CORE_H
-#define VEC_CORE_H
+#pragma once
#include <cairo.h>
#include <pugixml.hpp>
#include <clipper.hpp>
+#include <gerbolyze.hpp>
#include "vec_grid.h"
-namespace vectorizer {
- void vectorize_image(cairo_t *cr, const pugi::xml_node &node, double min_feature_size_px, ClipperLib::Paths &clip_path, cairo_matrix_t &viewport_matrix);
+namespace gerbolyze {
+ void vectorize_image(cairo_t *cr, const pugi::xml_node &node, double min_feature_size_px, ClipperLib::Paths &clip_path, cairo_matrix_t &viewport_matrix, PolygonSink &sink);
}
-#endif /* VEC_CORE_H */
diff --git a/src/vec_grid.cpp b/src/vec_grid.cpp
index 0a3eaa2..2a61153 100644
--- a/src/vec_grid.cpp
+++ b/src/vec_grid.cpp
@@ -1,25 +1,19 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "poisson_disk_sampling.h"
@@ -27,9 +21,9 @@
#include "vec_grid.h"
using namespace std;
-using namespace vectorizer;
+using namespace gerbolyze;
-sampling_fun vectorizer::get_sampler(enum grid_type type) {
+sampling_fun gerbolyze::get_sampler(enum grid_type type) {
switch(type) {
case POISSON_DISC:
return sample_poisson_disc;
@@ -42,13 +36,13 @@ sampling_fun vectorizer::get_sampler(enum grid_type type) {
}
}
-vector<d2p> *vectorizer::sample_poisson_disc(double w, double h, double center_distance) {
+vector<d2p> *gerbolyze::sample_poisson_disc(double w, double h, double center_distance) {
d2p top_left {0, 0};
d2p bottom_right {w, h};
return new auto(thinks::PoissonDiskSampling(center_distance, top_left, bottom_right));
}
-vector<d2p> *vectorizer::sample_hexgrid(double w, double h, double center_distance) {
+vector<d2p> *gerbolyze::sample_hexgrid(double w, double h, double center_distance) {
double radius = center_distance / 2.0 / (sqrt(3) / 2.0); /* radius of hexagon */
double pitch_v = 1.5 * radius;
double pitch_h = center_distance;
@@ -81,7 +75,7 @@ vector<d2p> *vectorizer::sample_hexgrid(double w, double h, double center_distan
return out;
}
-vector<d2p> *vectorizer::sample_squaregrid(double w, double h, double center_distance) {
+vector<d2p> *gerbolyze::sample_squaregrid(double w, double h, double center_distance) {
/* offset of first square to make sure the entire area is covered. We use slightly larger values here to avoid
* corner cases during clipping in the voronoi map generator. The inaccuracies this causes at the edges are
* negligible. */
diff --git a/src/vec_grid.h b/src/vec_grid.h
index cdd61df..b574484 100644
--- a/src/vec_grid.h
+++ b/src/vec_grid.h
@@ -1,37 +1,29 @@
/*
- * This program source code file is part of KICAD, a free EDA CAD application.
- *
- * Copyright (C) 2021 Jan Sebastian Götte <kicad@jaseg.de>
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * 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 2
- * of the License, or (at your option) any later version.
- *
+ * This file is part of gerbolyze, a vector image preprocessing toolchain
+ * Copyright (C) 2021 Jan Sebastian Götte <gerbolyze@jaseg.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef VEC_GRID_H
-#define VEC_GRID_H
+#pragma once
#include <array>
#include <vector>
#include <functional>
+#include <gerbolyze.hpp>
-namespace vectorizer {
-
-typedef std::array<double, 2> d2p;
+namespace gerbolyze {
enum grid_type {
POISSON_DISC,
@@ -47,6 +39,5 @@ std::vector<d2p> *sample_poisson_disc(double w, double h, double center_distance
std::vector<d2p> *sample_hexgrid(double w, double h, double center_distance);
std::vector<d2p> *sample_squaregrid(double w, double h, double center_distance);
-} /* namespace vectorizer */
+} /* namespace gerbolyze */
-#endif /* VEC_GRID_H */
diff --git a/upstream/argagg b/upstream/argagg
new file mode 160000
+Subproject 79e4adfa2c6e2bfbe63da05cc668eb9ad559674