diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..bb6c42e --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Authors: + Kevin Ottens (Lead Developer) + diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..3d9e3a3 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,18 @@ +project(washipad) +cmake_minimum_required(VERSION 3.10) + +find_package(ECM REQUIRED CONFIG) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + +find_package(Qt5 REQUIRED Quick Svg Widgets Test) + +include(KDEInstallDirs) +include(KDECompilerSettings) +include(KDECMakeSettings) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_EXTENSIONS OFF) + +add_subdirectory(src) +add_subdirectory(tests) + diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..a63d981 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ + Washi Pad, + A minimalist application for sketchnoting +===================================================================== + + Copyright (C) 2018 Kevin Ottens + +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) version 3 or any later version +accepted by the membership of KDE e.V. (or its successor approved +by the membership of KDE e.V.), which shall act as a proxy +defined in Section 14 of version 3 of the license. + +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. + +The license texts for both the GPLv2 and GPLv3 are provided with this +source code release in the files "gpl-2.0.txt" and "gpl-3.0.txt". diff --git a/gpl-2.0.txt b/gpl-2.0.txt new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/gpl-3.0.txt b/gpl-3.0.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/gpl-3.0.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..f722b45 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,31 @@ +set(lib_SRCS + pressureequation.cpp + sketchmodel.cpp + stroke.cpp +) + +add_library(washipadlib STATIC ${lib_SRCS}) +target_link_libraries(washipadlib + Qt5::Quick + Qt5::Svg + Qt5::Widgets +) + +set(exec_SRCS + main.cpp + sketchserializer.cpp + sketchview.cpp + strokeitem.cpp + strokelistitem.cpp + strokepainter.cpp + tabletevent.cpp +) + +qt5_add_resources(exec_SRCS + main.qrc +) + +add_executable(washipad ${exec_SRCS}) +target_link_libraries(washipad washipadlib) + +install(TARGETS washipad DESTINATION ${KDE_INSTALL_BINDIR}) diff --git a/src/ColorButton.qml b/src/ColorButton.qml new file mode 100644 index 0000000..02a38cb --- /dev/null +++ b/src/ColorButton.qml @@ -0,0 +1,51 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 + +ToolButton { + id: root + property bool active: false + property color color: "black" + + Rectangle { + color: root.color + + anchors.centerIn: parent + width: height + height: root.height * 0.6 + radius: height / 2 + } + + Rectangle { + visible: root.active + color: "transparent" + border.color: root.color + border.width: 2 + + anchors.centerIn: parent + width: height + height: root.height * 0.8 + radius: height / 2 + } +} diff --git a/src/Page.qml b/src/Page.qml new file mode 100644 index 0000000..16200f5 --- /dev/null +++ b/src/Page.qml @@ -0,0 +1,77 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +Rectangle { + id: root + color: "white" + width: Math.max(Screen.width, 297 * Screen.pixelDensity) + height: Math.max(Screen.height, 210 * Screen.pixelDensity) + + PageMarker { + anchors.centerIn: parent + markerRadius: 1 + } + + PageMarker { + anchors.horizontalCenter: parent.left + anchors.verticalCenter: parent.top + } + + PageMarker { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.top + } + + PageMarker { + anchors.horizontalCenter: parent.right + anchors.verticalCenter: parent.top + } + + PageMarker { + anchors.horizontalCenter: parent.right + anchors.verticalCenter: parent.verticalCenter + } + + PageMarker { + anchors.horizontalCenter: parent.right + anchors.verticalCenter: parent.bottom + } + + PageMarker { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.bottom + } + + PageMarker { + anchors.horizontalCenter: parent.left + anchors.verticalCenter: parent.bottom + } + + PageMarker { + anchors.horizontalCenter: parent.left + anchors.verticalCenter: parent.verticalCenter + } +} diff --git a/src/PageMarker.qml b/src/PageMarker.qml new file mode 100644 index 0000000..e6d4e2d --- /dev/null +++ b/src/PageMarker.qml @@ -0,0 +1,36 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +Rectangle { + property real markerRadius: 5 + + color: "transparent" + border.color: Qt.rgba(0.75, 0.75, 0, 0.5) + border.width: 2 + width: height + height: markerRadius * Screen.pixelDensity + radius: height / 2 +} diff --git a/src/Sketch.qml b/src/Sketch.qml new file mode 100644 index 0000000..6fb8883 --- /dev/null +++ b/src/Sketch.qml @@ -0,0 +1,161 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +import WashiPad 1.0 + +Item { + id: root + readonly property size size: Qt.size(sketchContent.width, sketchContent.height) + readonly property point cursorPos: Qt.point(handler.point.x, handler.point.y) + + property SketchModel model + property color penColor: "black" + readonly property var penType: (penColor === Qt.rgba(0, 0, 0, 1)) ? Stroke.Outline : Stroke.Fill + + Flickable { + id: flickable + anchors.fill: parent + contentWidth: sketchContent.width + contentHeight: sketchContent.height + + Page { + id: sketchContent + + StrokeListItem { + id: fillStrokes + anchors.fill: parent + z: 0 + type: Stroke.Fill + model: root.model + } + + StrokeListItem { + id: outlineStrokes + anchors.fill: parent + z: 1 + type: Stroke.Outline + model: root.model + } + + StrokeItem { + id: currentStroke + anchors.fill: parent + z: stroke.type === Stroke.Outline ? 1 : 0 + } + } + } + + SketchViewHandler { + id: handler + + function isEraser() { + return point.pointer === TabletEvent.Eraser + } + + function isEmpty(rect) { + return rect.left === rect.right + && rect.top === rect.bottom + } + + function createPoint() { + return Qt.point(point.x + flickable.contentX, + point.y + flickable.contentY) + } + + function addSample() { + var sample = createSample(createPoint(), pressureEquation.width) + currentStroke.addSample(sample) + } + + function eraseSamples() { + var point = createPoint() + var radius = cursor.height / 2 + + outlineStrokes.eraseArea(point, radius) + fillStrokes.eraseArea(point, radius) + } + + onPressedChanged: { + if (isEraser()) + return + + if (!pressed && !isEmpty(currentStroke.stroke.boundingRect())) { + addSample() + if (currentStroke.stroke.type === Stroke.Outline) + outlineStrokes.addStroke(currentStroke.stroke) + else + fillStrokes.addStroke(currentStroke.stroke) + currentStroke.stroke = createStroke(penType, root.penColor) + return + } + + currentStroke.stroke = createStroke(penType, root.penColor) + } + + onPointChanged: { + if (!pressed) + return + + if (!isEraser()) + addSample() + else + eraseSamples() + } + } + + PressureEquation { + id: pressureEquation + readonly property real minOutlineWidth: 2 + readonly property real maxOutlineWidth: 10 + + readonly property real minFillWidth: minOutlineWidth * 2 + readonly property real maxFillWidth: maxOutlineWidth * 2 + + readonly property real minEraserWidth: minOutlineWidth * 4 + readonly property real maxEraserWidth: maxOutlineWidth * 8 + + pressure: handler.point.pressure + minWidth: handler.isEraser() ? minEraserWidth + : root.penType === Stroke.Fill ? minFillWidth + : minOutlineWidth + maxWidth: handler.isEraser() ? maxEraserWidth + : root.penType === Stroke.Fill ? maxFillWidth + : maxOutlineWidth + } + + Rectangle { + id: cursor + + color: "transparent" + border.color: handler.isEraser() ? Qt.rgba(1, 0, 0, 0.75) : Qt.rgba(0, 0, 1, 0.75) + border.width: 2 + x: handler.point.x - width / 2 + y: handler.point.y - height / 2 + width: height + height: pressureEquation.width * 1.5 + radius: height / 2 + } +} diff --git a/src/ToolBar.qml b/src/ToolBar.qml new file mode 100644 index 0000000..66cdf2e --- /dev/null +++ b/src/ToolBar.qml @@ -0,0 +1,83 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +import WashiPad 1.0 + +Row { + id: root + property point cursorPos + property color currentColor: "black" + + signal saveRequested + + height: childrenRect.height + opacity: cursorNearToolBar() ? 0 : 1 + + Behavior on opacity { + NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } + } + + function cursorNearToolBar() { + var fivemm = 5 * Screen.pixelDensity + var rect = Qt.rect(root.x - fivemm, root.y - fivemm, + root.width + 2 * fivemm, root.height + 2 * fivemm) + return cursorPos.x > rect.x && cursorPos.x < (rect.x + rect.width) + && cursorPos.y > rect.y && cursorPos.y < (rect.y + rect.height) + } + + Repeater { + model: ["black", "gray", + "#ee7700", "#1188cc", + "#11aa11", "#cc3377", + "#cc1111"] + delegate: ColorButton { + color: model.modelData + active: root.currentColor === color + onClicked: root.currentColor = color + } + } + + ToolButton { + onClicked: root.saveRequested() + + Text { + anchors.centerIn: parent + text: "Save" + font.pixelSize: parent.height * 0.25 + } + } + + ToolButton { + color: "darkRed" + onClicked: Qt.quit() + + Text { + anchors.centerIn: parent + text: "X" + font.pixelSize: parent.height * 0.5 + } + } +} diff --git a/src/ToolButton.qml b/src/ToolButton.qml new file mode 100644 index 0000000..09bfdb0 --- /dev/null +++ b/src/ToolButton.qml @@ -0,0 +1,41 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 + +Rectangle { + id: root + + signal clicked + + implicitHeight: 60 + implicitWidth: implicitHeight * 1.5 + + color: "lightGray" + + MouseArea { + anchors.fill: parent + z: 1 + onClicked: root.clicked() + } +} diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..3c0ce06 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,64 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include +#include +#include + +#include "pressureequation.h" +#include "sketchmodel.h" +#include "sketchserializer.h" +#include "sketchview.h" +#include "strokeitem.h" +#include "strokelistitem.h" + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + SketchView view; + + QObject::connect(view.engine(), &QQmlEngine::quit, &app, &QGuiApplication::quit); + + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + + qmlRegisterType("WashiPad", 1, 0, "PressureEquation"); + qmlRegisterUncreatableType("WashiPad", 1, 0, "StrokeSample", "Use the createSample function on SketchViewHandler instead"); + qmlRegisterUncreatableType("WashiPad", 1, 0, "Stroke", "Use the createStroke function on SketchViewHandler instead"); + + qmlRegisterType("WashiPad", 1, 0, "SketchViewHandler"); + qmlRegisterUncreatableType("WashiPad", 1, 0, "TabletEvent", "They are provided by the SketchViewHandler"); + + qmlRegisterType("WashiPad", 1, 0, "SketchModel"); + qmlRegisterType("WashiPad", 1, 0, "SketchSerializer"); + qmlRegisterType("WashiPad", 1, 0, "StrokeItem"); + qmlRegisterType("WashiPad", 1, 0, "StrokeListItem"); + + view.setResizeMode(QQuickView::SizeRootObjectToView); + view.setSource(QUrl("qrc:/main.qml")); + view.setCursor(Qt::BlankCursor); + view.showFullScreen(); + return app.exec(); +} diff --git a/src/main.qml b/src/main.qml new file mode 100644 index 0000000..37ce290 --- /dev/null +++ b/src/main.qml @@ -0,0 +1,65 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 +import QtQuick.Dialogs 1.0 + +import WashiPad 1.0 + +Rectangle { + id: background + color: Qt.rgba(0.25, 0.25, 0.25, 1.0) + + SketchModel { + id: sketchModel + } + + Sketch { + id: sketch + anchors.fill: parent + penColor: toolBar.currentColor + model: sketchModel + } + + ToolBar { + id: toolBar + anchors.top: parent.top + anchors.right: parent.right + cursorPos: sketch.cursorPos + onSaveRequested: saveDialog.open() + } + + SketchSerializer { + id: serializer + } + + FileDialog { + id: saveDialog + title: "Save as SVG" + folder: shortcuts.home + selectExisting: false + nameFilters: [ "SVG Files (*.svg)" ] + onAccepted: serializer.serialize(sketchModel, sketch.size, fileUrl) + } +} diff --git a/src/main.qrc b/src/main.qrc new file mode 100644 index 0000000..eaa8d39 --- /dev/null +++ b/src/main.qrc @@ -0,0 +1,11 @@ + + + main.qml + ColorButton.qml + Page.qml + PageMarker.qml + Sketch.qml + ToolBar.qml + ToolButton.qml + + diff --git a/src/pressureequation.cpp b/src/pressureequation.cpp new file mode 100644 index 0000000..dc659fb --- /dev/null +++ b/src/pressureequation.cpp @@ -0,0 +1,97 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "pressureequation.h" + +#include +#include + +namespace { + qreal sigmoid(qreal x) + { + const auto lambda = 5.0_r; + return 1.0_r / (1.0_r + std::exp(-lambda * x)); + } + + qreal computeWidth(qreal minWidth, qreal maxWidth, qreal pressure) + { + const auto alpha = sigmoid(2.0_r * pressure - 1.0_r); + return (1.0_r - alpha) * minWidth + alpha * maxWidth; + } +} + +qreal PressureEquation::minWidth() const +{ + return m_minWidth; +} + +qreal PressureEquation::maxWidth() const +{ + return m_maxWidth; +} + +qreal PressureEquation::pressure() const +{ + return m_pressure; +} + +qreal PressureEquation::width() const +{ + return m_width; +} + +void PressureEquation::setMinWidth(qreal minWidth) +{ + if (qFuzzyCompare(m_minWidth, minWidth)) + return; + + m_minWidth = minWidth; + emit minWidthChanged(minWidth); + updateWidth(); +} + +void PressureEquation::setMaxWidth(qreal maxWidth) +{ + if (qFuzzyCompare(m_maxWidth, maxWidth)) + return; + + m_maxWidth = maxWidth; + emit maxWidthChanged(maxWidth); + updateWidth(); +} + +void PressureEquation::setPressure(qreal pressure) +{ + if (qFuzzyCompare(m_pressure, pressure)) + return; + + m_pressure = pressure; + emit pressureChanged(pressure); + updateWidth(); +} + +void PressureEquation::updateWidth() +{ + m_width = computeWidth(m_minWidth, m_maxWidth, m_pressure); + emit widthChanged(m_width); +} diff --git a/src/pressureequation.h b/src/pressureequation.h new file mode 100644 index 0000000..399b63b --- /dev/null +++ b/src/pressureequation.h @@ -0,0 +1,71 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef PRESSUREEQUATION_H +#define PRESSUREEQUATION_H + +#include + +#include "stroke.h" + +class PressureEquation : public QObject +{ + Q_OBJECT + Q_PROPERTY(qreal minWidth READ minWidth WRITE setMinWidth NOTIFY minWidthChanged) + Q_PROPERTY(qreal maxWidth READ maxWidth WRITE setMaxWidth NOTIFY maxWidthChanged) + + Q_PROPERTY(qreal pressure READ pressure WRITE setPressure NOTIFY pressureChanged) + Q_PROPERTY(qreal width READ width NOTIFY widthChanged) +public: + using QObject::QObject; + + qreal minWidth() const; + qreal maxWidth() const; + + qreal pressure() const; + qreal width() const; + +public slots: + void setMinWidth(qreal minWidth); + void setMaxWidth(qreal maxWidth); + + void setPressure(qreal pressure); + +signals: + void minWidthChanged(qreal minWidth); + void maxWidthChanged(qreal maxWidth); + + void pressureChanged(qreal pressure); + void widthChanged(qreal width); + +private: + void updateWidth(); + + qreal m_minWidth = 1.0_r; + qreal m_maxWidth = 1.0_r; + + qreal m_pressure = 0.0_r; + qreal m_width = m_maxWidth; +}; + +#endif // PRESSUREEQUATION_H diff --git a/src/sketchmodel.cpp b/src/sketchmodel.cpp new file mode 100644 index 0000000..1cef405 --- /dev/null +++ b/src/sketchmodel.cpp @@ -0,0 +1,106 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "sketchmodel.h" + +void SketchModel::addStroke(const Stroke &stroke) +{ + strokesRef(stroke.type()).append(stroke); +} + +QVector SketchModel::strokes(Stroke::Type type) const +{ + return strokesRef(type); +} + +QVector SketchModel::strokes() const +{ + return m_fillStrokes + m_outlineStrokes; +} + +void SketchModel::eraseArea(Stroke::Type type, const QPointF ¢er, qreal radius) +{ + auto &strokes = strokesRef(type); + + auto it = std::begin(strokes); + auto end = std::end(strokes); + + while (it != end) { + const auto newStrokes = it->eraseArea(center, radius); + + if (newStrokes.size() == 0) { + // Remove + it = strokes.erase(it); + end = std::end(strokes); + + } else if (newStrokes.size() == 1) { + const auto newStroke = newStrokes.first(); + if (newStroke.samples() != it->samples()) { + // Change + *it = newStroke; + } + it++; + + } else { + // Change + Inserts + *it = newStrokes.first(); + + auto newIt = std::cbegin(newStrokes); + const auto newEnd = std::cend(newStrokes); + + newIt++; // Already in the model due to dataChanged above + + it++; + + while (newIt != newEnd) { + it = strokes.insert(it, *newIt); + end = std::end(strokes); + + newIt++; + it++; + } + } + } +} + +const QVector &SketchModel::strokesRef(Stroke::Type type) const +{ + switch (type) { + case Stroke::Type::Fill: + return m_fillStrokes; + case Stroke::Type::Outline: + return m_outlineStrokes; + } + Q_UNREACHABLE(); +} + +QVector &SketchModel::strokesRef(Stroke::Type type) +{ + switch (type) { + case Stroke::Type::Fill: + return m_fillStrokes; + case Stroke::Type::Outline: + return m_outlineStrokes; + } + Q_UNREACHABLE(); +} diff --git a/src/sketchmodel.h b/src/sketchmodel.h new file mode 100644 index 0000000..4fb4f6c --- /dev/null +++ b/src/sketchmodel.h @@ -0,0 +1,52 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef SKETCHMODEL_H +#define SKETCHMODEL_H + +#include +#include + +#include "stroke.h" + +class SketchModel : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; + + void addStroke(const Stroke &stroke); + QVector strokes(Stroke::Type type) const; + QVector strokes() const; + + void eraseArea(Stroke::Type type, const QPointF ¢er, qreal radius); + +private: + const QVector &strokesRef(Stroke::Type type) const; + QVector &strokesRef(Stroke::Type type); + + QVector m_fillStrokes; + QVector m_outlineStrokes; +}; + +#endif // SKETCHMODEL_H diff --git a/src/sketchserializer.cpp b/src/sketchserializer.cpp new file mode 100644 index 0000000..fdd92ef --- /dev/null +++ b/src/sketchserializer.cpp @@ -0,0 +1,50 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "sketchserializer.h" + +#include + +#include +#include +#include + +#include "sketchmodel.h" +#include "strokepainter.h" + +void SketchSerializer::serialize(SketchModel *model, const QSize &size, const QUrl &fileUrl) +{ + Q_ASSERT(fileUrl.isLocalFile()); + + auto strokes = model->strokes(); + + auto generator = std::make_unique(); + generator->setFileName(fileUrl.toLocalFile()); + generator->setViewBox(QRect{{0, 0}, size}); + + auto painter = std::make_unique(generator.get()); + + for (const auto &stroke : qAsConst(strokes)) { + StrokePainter::render(stroke, painter.get()); + } +} diff --git a/src/sketchserializer.h b/src/sketchserializer.h new file mode 100644 index 0000000..08c27a0 --- /dev/null +++ b/src/sketchserializer.h @@ -0,0 +1,40 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef SKETCHSERIALIZER_H +#define SKETCHSERIALIZER_H + +#include + +class SketchModel; + +class SketchSerializer : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; + + Q_INVOKABLE static void serialize(SketchModel *model, const QSize &size, const QUrl &fileUrl); +}; + +#endif // SKETCHSERIALIZER_H diff --git a/src/sketchview.cpp b/src/sketchview.cpp new file mode 100644 index 0000000..79cf004 --- /dev/null +++ b/src/sketchview.cpp @@ -0,0 +1,90 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "sketchview.h" + +Q_GLOBAL_STATIC(SketchView*, s_instance); + +SketchViewHandler::SketchViewHandler(QObject *parent) + : QObject(parent) +{ + connect(SketchView::instance(), &SketchView::tabletEventReceived, + this, &SketchViewHandler::onTabletEventReceived); +} + +Stroke SketchViewHandler::createStroke(Stroke::Type type, const QColor &color) const +{ + auto result = Stroke{}; + result.setType(type); + result.setColor(color); + return result; +} + +StrokeSample SketchViewHandler::createSample(const QPointF &position, qreal width) const +{ + return {position, width}; +} + +TabletEvent SketchViewHandler::point() const +{ + return m_point; +} + +bool SketchViewHandler::isPressed() const +{ + return m_pressed; +} + +void SketchViewHandler::onTabletEventReceived(QTabletEvent *event) +{ + m_point = TabletEvent::create(event); + emit pointChanged(m_point); + + if (event->type() == QEvent::TabletPress && !m_pressed) { + m_pressed = true; + emit pressedChanged(m_pressed); + } else if (event->type() == QEvent::TabletRelease && m_pressed) { + m_pressed = false; + emit pressedChanged(m_pressed); + } +} + +SketchView *SketchView::instance() +{ + return *s_instance; +} + +SketchView::SketchView(QWindow *parent) + : QQuickView(parent) +{ + if (*s_instance) + qFatal("There must be only one SketchView instance"); + + *s_instance = this; +} + +void SketchView::tabletEvent(QTabletEvent *event) +{ + emit tabletEventReceived(event); + event->accept(); +} diff --git a/src/sketchview.h b/src/sketchview.h new file mode 100644 index 0000000..3fc52b6 --- /dev/null +++ b/src/sketchview.h @@ -0,0 +1,72 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef SKETCHVIEW_H +#define SKETCHVIEW_H + +#include + +#include "tabletevent.h" + +class SketchViewHandler : public QObject +{ + Q_OBJECT + Q_PROPERTY(TabletEvent point READ point NOTIFY pointChanged) + Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged) +public: + explicit SketchViewHandler(QObject *parent = nullptr); + + Q_INVOKABLE Stroke createStroke(Stroke::Type type, const QColor &color) const; + Q_INVOKABLE StrokeSample createSample(const QPointF &position, qreal width) const; + + TabletEvent point() const; + bool isPressed() const; + +signals: + void pointChanged(const TabletEvent &point); + void pressedChanged(bool pressed); + +private slots: + void onTabletEventReceived(QTabletEvent *event); + +private: + TabletEvent m_point; + bool m_active = false; + bool m_pressed = false; +}; + +class SketchView : public QQuickView +{ + Q_OBJECT +public: + static SketchView *instance(); + + explicit SketchView(QWindow *parent = nullptr); + + void tabletEvent(QTabletEvent *event) override; + +signals: + void tabletEventReceived(QTabletEvent *event); +}; + +#endif // SKETCHVIEW_H diff --git a/src/stroke.cpp b/src/stroke.cpp new file mode 100644 index 0000000..6932c64 --- /dev/null +++ b/src/stroke.cpp @@ -0,0 +1,143 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "stroke.h" + +#include + +qreal operator ""_r(long double value) +{ + return static_cast(value); +} + +bool StrokeSample::operator==(const StrokeSample &other) const +{ + return position == other.position + && qFuzzyCompare(width, other.width); +} + +Stroke::Type Stroke::type() const +{ + return m_type; +} + +void Stroke::setType(Stroke::Type type) +{ + m_type = type; +} + +QColor Stroke::color() const +{ + return m_color; +} + +void Stroke::setColor(const QColor &color) +{ + m_color = color; +} + +QVector Stroke::samples() const +{ + return m_samples; +} + +void Stroke::addSample(const StrokeSample &sample) +{ + m_samples << sample; + m_boundingRectCache = QRectF{}; +} + +void Stroke::addSamples(const QVector &samples) +{ + m_samples += samples; + m_boundingRectCache = QRectF{}; +} + +QVector Stroke::eraseArea(const QPointF ¢er, qreal radius) +{ + const auto areaBoundingRect = QRectF{center - QPointF{radius, radius}, + center + QPointF{radius, radius}}; + auto result = QVector{}; + + // For sure won't get any hits + if (!boundingRect().intersects(areaBoundingRect)) { + result.append(*this); + return result; + } + + const auto isHit = [=](const StrokeSample &sample) { + return QVector2D{sample.position - center}.length() <= static_cast(radius); + }; + + auto it = std::cbegin(m_samples); + const auto end = std::cend(m_samples); + + while (it != end) { + auto previous = it; + // Find first hit + it = std::find_if(it, end, isHit); + + // Copy [previous, it) in a new stroke if there's more than one sample + const auto distance = static_cast(std::distance(previous, it)); + if (distance >= 2) { + auto stroke = *this; + stroke.m_samples.clear(); + stroke.m_samples.reserve(distance); + std::copy(previous, it, std::back_inserter(stroke.m_samples)); + + result.append(stroke); + } + + // Jump to next non-hit + it = std::find_if_not(it, end, isHit); + } + + return result; +} + +QRectF Stroke::boundingRect() const +{ + if (!m_boundingRectCache.isValid()) { + auto minX = 0.0_r; + auto minY = 0.0_r; + auto maxX = 0.0_r; + auto maxY = 0.0_r; + + for (const auto &sample : qAsConst(m_samples)) { + const auto position = sample.position; + if (position.x() < minX) + minX = position.x(); + else if (position.x() > maxX) + maxX = position.x(); + + if (position.y() < minY) + minY = position.y(); + else if (position.y() > maxY) + maxY = position.y(); + } + + m_boundingRectCache = {QPointF{minX, minY}, QPointF{maxX, maxY}}; + } + + return m_boundingRectCache; +} diff --git a/src/stroke.h b/src/stroke.h new file mode 100644 index 0000000..10c77ba --- /dev/null +++ b/src/stroke.h @@ -0,0 +1,81 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef STROKE_H +#define STROKE_H + +#include +#include +#include +#include +#include + +qreal operator ""_r(long double value); + +class StrokeSample +{ + Q_GADGET + Q_PROPERTY(QPointF position MEMBER position) + Q_PROPERTY(qreal width MEMBER width) +public: + QPointF position; + qreal width = 1.0_r; + + bool operator==(const StrokeSample &other) const; +}; + +class Stroke +{ + Q_GADGET + Q_PROPERTY(Stroke::Type type READ type WRITE setType) + Q_PROPERTY(QColor color READ color WRITE setColor) +public: + enum class Type + { + Outline, + Fill + }; + Q_ENUM(Type) + + Type type() const; + void setType(Type type); + + QColor color() const; + void setColor(const QColor &color); + + QVector samples() const; + Q_INVOKABLE void addSample(const StrokeSample &sample); + void addSamples(const QVector &samples); + + QVector eraseArea(const QPointF ¢er, qreal radius); + + Q_INVOKABLE QRectF boundingRect() const; + +private: + Type m_type = Type::Outline; + QColor m_color = Qt::black; + QVector m_samples; + mutable QRectF m_boundingRectCache; +}; + +#endif // STROKE_H diff --git a/src/strokeitem.cpp b/src/strokeitem.cpp new file mode 100644 index 0000000..830abc1 --- /dev/null +++ b/src/strokeitem.cpp @@ -0,0 +1,59 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "strokeitem.h" + +#include + +#include "strokepainter.h" + +StrokeItem::StrokeItem(QQuickItem *parent) + : QQuickPaintedItem(parent) +{ + setAntialiasing(true); + setRenderTarget(FramebufferObject); +} + +Stroke StrokeItem::stroke() const +{ + return m_stroke; +} + +void StrokeItem::setStroke(const Stroke &stroke) +{ + m_stroke = stroke; + emit strokeChanged(stroke); + update(); +} + +void StrokeItem::addSample(const StrokeSample &sample) +{ + m_stroke.addSample(sample); + emit strokeChanged(m_stroke); + update(); +} + +void StrokeItem::paint(QPainter *painter) +{ + StrokePainter::render(m_stroke, painter); +} diff --git a/src/strokeitem.h b/src/strokeitem.h new file mode 100644 index 0000000..865e43f --- /dev/null +++ b/src/strokeitem.h @@ -0,0 +1,52 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef STROKEITEM_H +#define STROKEITEM_H + +#include + +#include "stroke.h" + +class StrokeItem : public QQuickPaintedItem +{ + Q_OBJECT + Q_PROPERTY(Stroke stroke READ stroke WRITE setStroke NOTIFY strokeChanged) +public: + explicit StrokeItem(QQuickItem *parent = nullptr); + + Stroke stroke() const; + void setStroke(const Stroke &stroke); + + Q_INVOKABLE void addSample(const StrokeSample &sample); + + void paint(QPainter *painter) override; + +signals: + void strokeChanged(const Stroke &stroke); + +private: + Stroke m_stroke; +}; + +#endif // STROKEITEM_H diff --git a/src/strokelistitem.cpp b/src/strokelistitem.cpp new file mode 100644 index 0000000..8285380 --- /dev/null +++ b/src/strokelistitem.cpp @@ -0,0 +1,88 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "strokelistitem.h" + +#include + +#include "sketchmodel.h" +#include "strokepainter.h" + +StrokeListItem::StrokeListItem(QQuickItem *parent) + : QQuickPaintedItem(parent) +{ + setAntialiasing(true); + setRenderTarget(FramebufferObject); +} + +void StrokeListItem::addStroke(const Stroke &stroke) +{ + Q_ASSERT(m_model); + Q_ASSERT(stroke.type() == m_type); + m_model->addStroke(stroke); + update(); +} + +void StrokeListItem::eraseArea(const QPointF ¢er, qreal radius) +{ + Q_ASSERT(m_model); + m_model->eraseArea(m_type, center, radius); + update(); +} + +void StrokeListItem::paint(QPainter *painter) +{ + const auto strokes = m_model->strokes(m_type); + for (const auto &stroke : qAsConst(strokes)) + StrokePainter::render(stroke, painter); +} + +Stroke::Type StrokeListItem::type() const +{ + return m_type; +} + +SketchModel *StrokeListItem::model() const +{ + return m_model; +} + +void StrokeListItem::setType(Stroke::Type type) +{ + if (m_type == type) + return; + + m_type = type; + emit typeChanged(type); + update(); +} + +void StrokeListItem::setModel(SketchModel *model) +{ + if (m_model == model) + return; + + m_model = model; + emit modelChanged(model); + update(); +} diff --git a/src/strokelistitem.h b/src/strokelistitem.h new file mode 100644 index 0000000..acd544b --- /dev/null +++ b/src/strokelistitem.h @@ -0,0 +1,65 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef STROKELISTITEM_H +#define STROKELISTITEM_H + +#include + +#include +#include + +#include "stroke.h" + +class SketchModel; + +class StrokeListItem : public QQuickPaintedItem +{ + Q_OBJECT + Q_PROPERTY(Stroke::Type type READ type WRITE setType NOTIFY typeChanged) + Q_PROPERTY(SketchModel* model READ model WRITE setModel NOTIFY modelChanged) +public: + explicit StrokeListItem(QQuickItem *parent = nullptr); + + Q_INVOKABLE void addStroke(const Stroke &stroke); + Q_INVOKABLE void eraseArea(const QPointF ¢er, qreal radius); + + void paint(QPainter *painter) override; + + Stroke::Type type() const; + SketchModel *model() const; + +public slots: + void setType(Stroke::Type type); + void setModel(SketchModel *model); + +signals: + void typeChanged(Stroke::Type type); + void modelChanged(SketchModel *model); + +private: + Stroke::Type m_type = Stroke::Type::Outline; + SketchModel *m_model = nullptr; +}; + +#endif // STROKELISTITEM_H diff --git a/src/strokepainter.cpp b/src/strokepainter.cpp new file mode 100644 index 0000000..2927f1f --- /dev/null +++ b/src/strokepainter.cpp @@ -0,0 +1,61 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "strokepainter.h" + +#include + +#include "stroke.h" + +namespace +{ + QPen createPen(const Stroke &stroke, const StrokeSample &sample) + { + return QPen(stroke.color(), + sample.width, + Qt::SolidLine, + Qt::RoundCap, + Qt::RoundJoin); + } +} + +void StrokePainter::render(const Stroke &stroke, QPainter *painter) +{ + const auto samples = stroke.samples(); + if (samples.size() < 2) + return; + + auto it = std::cbegin(samples); + auto lastSample = *it; + it++; + + while (it != std::cend(samples)) { + const auto currentSample = *it; + + painter->setPen(createPen(stroke, currentSample)); + painter->drawLine(lastSample.position, currentSample.position); + + lastSample = currentSample; + it++; + } +} diff --git a/src/strokepainter.h b/src/strokepainter.h new file mode 100644 index 0000000..e489e46 --- /dev/null +++ b/src/strokepainter.h @@ -0,0 +1,35 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef STROKEPAINTER_H +#define STROKEPAINTER_H + +class QPainter; +class Stroke; + +namespace StrokePainter +{ + void render(const Stroke &stroke, QPainter *painter); +}; + +#endif // STROKEPAINTER_H diff --git a/src/tabletevent.cpp b/src/tabletevent.cpp new file mode 100644 index 0000000..bf2e2ff --- /dev/null +++ b/src/tabletevent.cpp @@ -0,0 +1,36 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include "tabletevent.h" + +#include + +TabletEvent TabletEvent::create(QTabletEvent *event) +{ + return { + event->posF().x(), + event->posF().y(), + event->pressure(), + (event->pointerType() == QTabletEvent::Eraser) ? Pointer::Eraser : Pointer::Pen + }; +} diff --git a/src/tabletevent.h b/src/tabletevent.h new file mode 100644 index 0000000..ec05a46 --- /dev/null +++ b/src/tabletevent.h @@ -0,0 +1,54 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#ifndef TABLETEVENT_H +#define TABLETEVENT_H + +#include "stroke.h" + +class QTabletEvent; + +class TabletEvent +{ + Q_GADGET + Q_PROPERTY(qreal x MEMBER x) + Q_PROPERTY(qreal y MEMBER y) + Q_PROPERTY(qreal pressure MEMBER pressure) + Q_PROPERTY(Pointer pointer MEMBER pointer) +public: + enum class Pointer + { + Pen, + Eraser, + }; + Q_ENUM(Pointer) + + static TabletEvent create(QTabletEvent *event); + + qreal x = 0.0_r; + qreal y = 0.0_r; + qreal pressure = 0.0_r; + Pointer pointer = Pointer::Pen; +}; + +#endif // TABLETEVENT_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..ab32928 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories(${CMAKE_SOURCE_DIR}/src) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +macro(washipad_auto_tests) + foreach(_testname ${ARGN}) + add_executable(${_testname} ${_testname}.cpp) + add_test(${_testname} ${_testname}) + target_link_libraries(${_testname} + Qt5::Test + washipadlib + ) + endforeach(_testname) +endmacro(washipad_auto_tests) + +washipad_auto_tests( + sketchmodeltest + stroketest +) diff --git a/tests/sketchmodeltest.cpp b/tests/sketchmodeltest.cpp new file mode 100644 index 0000000..9ae8063 --- /dev/null +++ b/tests/sketchmodeltest.cpp @@ -0,0 +1,318 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include + +#include "sketchmodel.h" + +class SketchModelTest : public QObject +{ + Q_OBJECT +private slots: + void shouldHaveDefaultState() + { + // GIVEN + const auto model = std::make_unique(); + + // THEN + QVERIFY(model->strokes(Stroke::Type::Fill).isEmpty()); + QVERIFY(model->strokes(Stroke::Type::Outline).isEmpty()); + } + + void shouldAddStrokes() + { + // GIVEN + const auto model = std::make_unique(); + const auto fillStroke1 = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Fill); + stroke.setColor(Qt::green); + return stroke; + }(); + const auto fillStroke2 = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Fill); + stroke.setColor(Qt::blue); + return stroke; + }(); + const auto outlineStroke1 = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Outline); + stroke.setColor(Qt::cyan); + return stroke; + }(); + const auto outlineStroke2 = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Outline); + stroke.setColor(Qt::magenta); + return stroke; + }(); + + // WHEN + model->addStroke(fillStroke1); + model->addStroke(outlineStroke1); + model->addStroke(outlineStroke2); + model->addStroke(fillStroke2); + + // THEN + QCOMPARE(model->strokes(Stroke::Type::Fill).size(), 2); + QCOMPARE(model->strokes(Stroke::Type::Fill).at(0).type(), Stroke::Type::Fill); + QCOMPARE(model->strokes(Stroke::Type::Fill).at(0).color(), fillStroke1.color()); + QCOMPARE(model->strokes(Stroke::Type::Fill).at(1).type(), Stroke::Type::Fill); + QCOMPARE(model->strokes(Stroke::Type::Fill).at(1).color(), fillStroke2.color()); + + QCOMPARE(model->strokes(Stroke::Type::Outline).size(), 2); + QCOMPARE(model->strokes(Stroke::Type::Outline).at(0).type(), Stroke::Type::Outline); + QCOMPARE(model->strokes(Stroke::Type::Outline).at(0).color(), outlineStroke1.color()); + QCOMPARE(model->strokes(Stroke::Type::Outline).at(1).type(), Stroke::Type::Outline); + QCOMPARE(model->strokes(Stroke::Type::Outline).at(1).color(), outlineStroke2.color()); + + QCOMPARE(model->strokes().size(), 4); + QCOMPARE(model->strokes().at(0).type(), Stroke::Type::Fill); + QCOMPARE(model->strokes().at(0).color(), fillStroke1.color()); + QCOMPARE(model->strokes().at(1).type(), Stroke::Type::Fill); + QCOMPARE(model->strokes().at(1).color(), fillStroke2.color()); + QCOMPARE(model->strokes().at(2).type(), Stroke::Type::Outline); + QCOMPARE(model->strokes().at(2).color(), outlineStroke1.color()); + QCOMPARE(model->strokes().at(3).type(), Stroke::Type::Outline); + QCOMPARE(model->strokes().at(3).color(), outlineStroke2.color()); + } + + + void shouldEraseAreas_data() + { + QTest::addColumn("input"); + QTest::addColumn("inputType"); + QTest::addColumn("otherType"); + QTest::addColumn("center"); + QTest::addColumn("radius"); + QTest::addColumn>>("expectedSamples"); + + auto straightLine = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Outline); + stroke.setColor(Qt::blue); + stroke.addSample({{0.0_r, 0.0_r}, 0.5_r}); + stroke.addSample({{0.125_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.25_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.375_r, 0.375_r}, 0.5_r}); + stroke.addSample({{0.5_r, 0.5_r}, 0.5_r}); + stroke.addSample({{0.625_r, 0.625_r}, 0.5_r}); + stroke.addSample({{0.75_r, 0.75_r}, 0.5_r}); + stroke.addSample({{0.875_r, 0.875_r}, 0.5_r}); + stroke.addSample({{1.0_r, 1.0_r}, 0.5_r}); + return stroke; + }(); + + QTest::newRow("straight outline, no hit") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{-1.0_r, -1.0_r} << 0.5_r + << QVector>{straightLine.samples()}; + + QTest::newRow("straight outline, all hits") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{0.5_r, 0.5_r} << 1.5_r + << QVector>{}; + + QTest::newRow("straight outline, begin hits with isolated sample") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{0.1875_r, 0.1875_r} << 0.125_r + << QVector>{ + {{{0.375_r, 0.375_r}, 0.5_r}, {{0.5_r, 0.5_r}, 0.5_r}, + {{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, + {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight outline, begin hits") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{0.0_r, 0.0_r} << 0.25_r + << QVector>{ + {{{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, + {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight outline, middle hits") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{0.375_r, 0.375_r} << 0.2_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}}, + {{{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight outline, end hits") + << straightLine << straightLine.type() << Stroke::Type::Fill + << QPointF{1.0_r, 1.0_r} << 0.25_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, + {{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}} + }; + + + straightLine.setType(Stroke::Type::Fill); + + QTest::newRow("straight fill, no hit") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{-1.0_r, -1.0_r} << 0.5_r + << QVector>{straightLine.samples()}; + + QTest::newRow("straight fill, all hits") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{0.5_r, 0.5_r} << 1.5_r + << QVector>{}; + + QTest::newRow("straight fill, begin hits with isolated sample") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{0.1875_r, 0.1875_r} << 0.125_r + << QVector>{ + {{{0.375_r, 0.375_r}, 0.5_r}, {{0.5_r, 0.5_r}, 0.5_r}, + {{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, + {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight fill, begin hits") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{0.0_r, 0.0_r} << 0.25_r + << QVector>{ + {{{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, + {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight fill, middle hits") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{0.375_r, 0.375_r} << 0.2_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}}, + {{{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight fill, end hits") + << straightLine << straightLine.type() << Stroke::Type::Outline + << QPointF{1.0_r, 1.0_r} << 0.25_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, + {{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}} + }; + + + auto complexLine = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Outline); + stroke.setColor(Qt::red); + stroke.addSample({{0.0_r, 0.0_r}, 0.5_r}); + stroke.addSample({{0.125_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.25_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.375_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.5_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.625_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.75_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.875_r, 0.375_r}, 0.5_r}); + stroke.addSample({{1.0_r, 0.25_r}, 0.5_r}); + stroke.addSample({{1.125_r, 0.125_r}, 0.5_r}); + return stroke; + }(); + + QTest::newRow("complex outline, multiple hits") + << complexLine << complexLine.type() << Stroke::Type::Fill + << QPointF{0.5625_r, 0.4375_r} << 0.27_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, {{0.25_r, 0.25_r}, 0.5_r}}, + {{{0.5_r, 0.125_r}, 0.5_r}, {{0.625_r, 0.125_r}, 0.5_r}}, + {{{0.875_r, 0.375_r}, 0.5_r}, {{1.0_r, 0.25_r}, 0.5_r}, {{1.125_r, 0.125_r}, 0.5_r}} + }; + + complexLine.setType(Stroke::Type::Fill); + + QTest::newRow("complex fill, multiple hits") + << complexLine << complexLine.type() << Stroke::Type::Outline + << QPointF{0.5625_r, 0.4375_r} << 0.27_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, {{0.25_r, 0.25_r}, 0.5_r}}, + {{{0.5_r, 0.125_r}, 0.5_r}, {{0.625_r, 0.125_r}, 0.5_r}}, + {{{0.875_r, 0.375_r}, 0.5_r}, {{1.0_r, 0.25_r}, 0.5_r}, {{1.125_r, 0.125_r}, 0.5_r}} + }; + } + + void shouldEraseAreas() + { + // GIVEN + QFETCH(Stroke, input); + QFETCH(Stroke::Type, inputType); + QFETCH(Stroke::Type, otherType); + QFETCH(QPointF, center); + QFETCH(qreal, radius); + + const auto model = std::make_unique(); + model->addStroke([=] { + auto stroke = Stroke{}; + stroke.setType(inputType); + stroke.addSample({{-10.0_r, -10.0_r}, 0.5_r}); + stroke.addSample({{-11.0_r, -11.0_r}, 0.5_r}); + return stroke; + }()); + + model->addStroke(input); + + model->addStroke([=] { + auto stroke = Stroke{}; + stroke.setType(inputType); + stroke.addSample({{10.0_r, 10.0_r}, 0.5_r}); + stroke.addSample({{11.0_r, 11.0_r}, 0.5_r}); + return stroke; + }()); + + model->addStroke([=] { + auto stroke = Stroke{}; + stroke.setType(otherType); + stroke.addSample({center, 0.5_r}); + stroke.addSample({{center.x() + radius / 2.0_r, center.y()}, 0.5_r}); + return stroke; + }()); + + // WHEN + model->eraseArea(inputType, center, radius); + + // THEN + QCOMPARE(model->strokes(otherType).size(), 1); + + QFETCH(QVector>, expectedSamples); + QCOMPARE(model->strokes(inputType).size(), expectedSamples.size() + 2); + for (int i = 0; i < expectedSamples.size(); i++) { + const auto stroke = model->strokes(inputType).at(i + 1); + QCOMPARE(stroke.type(), input.type()); + QCOMPARE(stroke.color(), input.color()); + QCOMPARE(stroke.samples(), expectedSamples.at(i)); + } + } +}; + +QTEST_APPLESS_MAIN(SketchModelTest) + +#include "sketchmodeltest.moc" diff --git a/tests/stroketest.cpp b/tests/stroketest.cpp new file mode 100644 index 0000000..9a13f39 --- /dev/null +++ b/tests/stroketest.cpp @@ -0,0 +1,241 @@ +/* This file is part of Washi Pad + + Copyright 2018 Kevin Ottens + + 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) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. +*/ + +#include + +#include "stroke.h" + +class StrokeTest : public QObject +{ + Q_OBJECT +private slots: + void shouldHaveDefaultState() + { + // GIVEN + const auto stroke = Stroke{}; + + // THEN + QCOMPARE(stroke.type(), Stroke::Type::Outline); + QCOMPARE(stroke.color(), QColor(Qt::black)); + QVERIFY(stroke.samples().isEmpty()); + + // GIVEN + const auto sample = StrokeSample{}; + + // THEN + QVERIFY(sample.position.isNull()); + QCOMPARE(sample.width, 1.0_r); + } + + void shouldHaveType() + { + // GIVEN + auto stroke = Stroke{}; + + // WHEN + stroke.setType(Stroke::Type::Outline); + + // THEN + QCOMPARE(stroke.type(), Stroke::Type::Outline); + } + + void shouldHaveColor() + { + // GIVEN + auto stroke = Stroke{}; + + // WHEN + stroke.setColor(Qt::red); + + // THEN + QCOMPARE(stroke.color(), QColor(Qt::red)); + } + + void shouldHaveSamples() + { + // GIVEN + auto stroke = Stroke{}; + + // WHEN + const auto sample = StrokeSample{{0.5_r, 0.5_r}, 0.1_r}; + stroke.addSample(sample); + + // THEN + QCOMPARE(stroke.samples().size(), 1); + QCOMPARE(stroke.samples().first(), sample); + + // WHEN + const auto samples = QVector{ + {{1.0_r, 1.5_r}, 0.2_r}, + {{1.1_r, 1.75_r}, 0.4_r} + }; + stroke.addSamples(samples); + + // THEN + QCOMPARE(stroke.samples().size(), 3); + QCOMPARE(stroke.samples().at(0), sample); + QCOMPARE(stroke.samples().at(1), samples.at(0)); + QCOMPARE(stroke.samples().at(2), samples.at(1)); + } + + void shouldEraseAreas_data() + { + QTest::addColumn("input"); + QTest::addColumn("center"); + QTest::addColumn("radius"); + QTest::addColumn>>("expectedSamples"); + + const auto straightLine = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Fill); + stroke.setColor(Qt::blue); + stroke.addSample({{0.0_r, 0.0_r}, 0.5_r}); + stroke.addSample({{0.125_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.25_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.375_r, 0.375_r}, 0.5_r}); + stroke.addSample({{0.5_r, 0.5_r}, 0.5_r}); + stroke.addSample({{0.625_r, 0.625_r}, 0.5_r}); + stroke.addSample({{0.75_r, 0.75_r}, 0.5_r}); + stroke.addSample({{0.875_r, 0.875_r}, 0.5_r}); + stroke.addSample({{1.0_r, 1.0_r}, 0.5_r}); + return stroke; + }(); + + QTest::newRow("straight line, no hit") + << straightLine + << QPointF{-1.0_r, -1.0_r} << 0.5_r + << QVector>{straightLine.samples()}; + + QTest::newRow("straight line, all hits") + << straightLine + << QPointF{0.5_r, 0.5_r} << 1.5_r + << QVector>{}; + + QTest::newRow("straight line, begin hits with isolated sample") + << straightLine + << QPointF{0.1875_r, 0.1875_r} << 0.125_r + << QVector>{ + {{{0.375_r, 0.375_r}, 0.5_r}, {{0.5_r, 0.5_r}, 0.5_r}, + {{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, + {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight line, begin hits") + << straightLine + << QPointF{0.0_r, 0.0_r} << 0.25_r + << QVector>{ + {{{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, + {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight line, middle hits") + << straightLine + << QPointF{0.375_r, 0.375_r} << 0.2_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}}, + {{{0.625_r, 0.625_r}, 0.5_r}, {{0.75_r, 0.75_r}, 0.5_r}, {{0.875_r, 0.875_r}, 0.5_r}, {{1.0_r, 1.0_r}, 0.5_r}} + }; + + QTest::newRow("straight line, end hits") + << straightLine + << QPointF{1.0_r, 1.0_r} << 0.25_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, + {{0.25_r, 0.25_r}, 0.5_r}, {{0.375_r, 0.375_r}, 0.5_r}, + {{0.5_r, 0.5_r}, 0.5_r}, {{0.625_r, 0.625_r}, 0.5_r}, + {{0.75_r, 0.75_r}, 0.5_r}} + }; + + + const auto complexLine = [] { + auto stroke = Stroke{}; + stroke.setType(Stroke::Type::Outline); + stroke.setColor(Qt::red); + stroke.addSample({{0.0_r, 0.0_r}, 0.5_r}); + stroke.addSample({{0.125_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.25_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.375_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.5_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.625_r, 0.125_r}, 0.5_r}); + stroke.addSample({{0.75_r, 0.25_r}, 0.5_r}); + stroke.addSample({{0.875_r, 0.375_r}, 0.5_r}); + stroke.addSample({{1.0_r, 0.25_r}, 0.5_r}); + stroke.addSample({{1.125_r, 0.125_r}, 0.5_r}); + return stroke; + }(); + + QTest::newRow("complex line, multiple hits") + << complexLine + << QPointF{0.5625_r, 0.4375_r} << 0.27_r + << QVector>{ + {{{0.0_r, 0.0_r}, 0.5_r}, {{0.125_r, 0.125_r}, 0.5_r}, {{0.25_r, 0.25_r}, 0.5_r}}, + {{{0.5_r, 0.125_r}, 0.5_r}, {{0.625_r, 0.125_r}, 0.5_r}}, + {{{0.875_r, 0.375_r}, 0.5_r}, {{1.0_r, 0.25_r}, 0.5_r}, {{1.125_r, 0.125_r}, 0.5_r}} + }; + } + + void shouldEraseAreas() + { + // GIVEN + QFETCH(Stroke, input); + + // WHEN + QFETCH(QPointF, center); + QFETCH(qreal, radius); + const auto output = input.eraseArea(center, radius); + + // THEN + QFETCH(QVector>, expectedSamples); + QCOMPARE(output.size(), expectedSamples.size()); + for (int i = 0; i < output.size(); i++) { + QCOMPARE(output.at(i).type(), input.type()); + QCOMPARE(output.at(i).color(), input.color()); + QCOMPARE(output.at(i).samples(), expectedSamples.at(i)); + } + } + + void shouldHaveBoundingRect() + { + // GIVEN + auto stroke = Stroke{}; + stroke.addSample({{0.5_r, 0.5_r}, 1.0_r}); + stroke.addSample({{5.0_r, -0.5_r}, 1.0_r}); + stroke.addSample({{-5.0_r, 0.5_r}, 1.0_r}); + stroke.addSample({{0.25_r, 1.5_r}, 1.0_r}); + stroke.addSample({{0.25_r, 5.0_r}, 1.0_r}); + stroke.addSample({{0.25_r, -5.0_r}, 1.0_r}); + + // WHEN + const auto rect = stroke.boundingRect(); + + // THEN + const auto expected = QRectF{QPointF{-5.0_r, -5.0_r}, QPointF{5.0_r, 5.0_r}}; + QCOMPARE(rect, expected); + } +}; + +QTEST_APPLESS_MAIN(StrokeTest) + +#include "stroketest.moc"