diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..66ba3a6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,675 @@
+ 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:
+
+ {{ project }} Copyright (C) {{ year }} {{ organization }}
+ 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/README.md b/README.md
index 4a11c19..e21aa8a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Flash _oscilloscope_. In the Oscilloscope app configure the serial port. By defa
You can connect any signal up to 5 volts to the analog pin A0. For signals over 5V a voltage divider is needed.
For ATmega boards it is defined a PWM signal at pin OC1B. To test the Oscilloscope app connect pin OC1B to pin A0
-Adjust PWM signal with PWM_FREQ and PWM_DUTY. Default is 100Hz, 50% duty.
+Adjust PWM signal with PWM_FREQ and PWM_DUTY. Default is 1000Hz, 50% duty.
Pin OC1B location:
- Uno: pin 10 (PB2)
diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp
deleted file mode 100644
index cca3b84..0000000
--- a/src/qt/aboutdialog.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "aboutdialog.h"
-#include "ui_aboutdialog.h"
-
-AboutDialog::AboutDialog(QWidget *parent) :
- QDialog(parent),
- ui(new Ui::AboutDialog)
-{
- ui->setupUi(this);
-}
-
-AboutDialog::~AboutDialog()
-{
- delete ui;
-}
diff --git a/src/qt/aboutdialog.h b/src/qt/aboutdialog.h
deleted file mode 100644
index 4474ece..0000000
--- a/src/qt/aboutdialog.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef ABOUTDIALOG_H
-#define ABOUTDIALOG_H
-
-#include
-
-namespace Ui {
-class AboutDialog;
-}
-
-class AboutDialog : public QDialog
-{
- Q_OBJECT
-
-public:
- explicit AboutDialog(QWidget *parent = nullptr);
- ~AboutDialog();
-
-private:
- Ui::AboutDialog *ui;
-};
-
-#endif // ABOUTDIALOG_H
diff --git a/src/qt/aboutdialog.ui b/src/qt/aboutdialog.ui
deleted file mode 100644
index 1f5139d..0000000
--- a/src/qt/aboutdialog.ui
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
- AboutDialog
-
-
-
- 0
- 0
- 525
- 300
-
-
-
- About
-
-
-
-
- 20
- 220
- 481
- 51
-
-
-
-
- 8
-
-
-
- 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.
-
-
-
- Qt::AlignCenter
-
-
-
-
-
- 190
- 140
- 121
- 61
-
-
-
-
-
-
- :/oscilloscope.bmp
-
-
- true
-
-
-
-
-
- 170
- 40
- 171
- 19
-
-
-
-
- 12
- 50
- false
-
-
-
- Oscilloscope Serial
-
-
- Qt::AlignCenter
-
-
-
-
-
- 220
- 70
- 66
- 19
-
-
-
- 0.1
-
-
- Qt::AlignCenter
-
-
-
-
-
- 190
- 100
- 121
- 19
-
-
-
- Daniel GeA, 2021
-
-
- Qt::AlignCenter
-
-
-
-
-
-
-
-
diff --git a/src/qt/application-exit.png b/src/qt/application-exit.png
new file mode 100644
index 0000000..32be6b3
Binary files /dev/null and b/src/qt/application-exit.png differ
diff --git a/src/qt/connect.png b/src/qt/connect.png
new file mode 100644
index 0000000..dd5a51e
Binary files /dev/null and b/src/qt/connect.png differ
diff --git a/src/qt/disconnect.png b/src/qt/disconnect.png
new file mode 100644
index 0000000..fd58f7a
Binary files /dev/null and b/src/qt/disconnect.png differ
diff --git a/src/qt/main.cpp b/src/qt/main.cpp
index fd3e533..46d059e 100644
--- a/src/qt/main.cpp
+++ b/src/qt/main.cpp
@@ -1,3 +1,18 @@
+/*
+ * 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 .
+ */
+
#include "mainwindow.h"
#include
diff --git a/src/qt/mainwindow.cpp b/src/qt/mainwindow.cpp
index 9d5a2ba..8df939b 100644
--- a/src/qt/mainwindow.cpp
+++ b/src/qt/mainwindow.cpp
@@ -1,7 +1,21 @@
+/*
+ * 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 .
+ */
+
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "settingsdialog.h"
-#include "aboutdialog.h"
MainWindow::MainWindow(QWidget* parent)
: QMainWindow(parent)
@@ -10,40 +24,98 @@ MainWindow::MainWindow(QWidget* parent)
m_pixmap(new QPixmap(500, 400)),
m_paint(new QPainter(m_pixmap)),
m_ui_settings(new SettingsDialog()),
- m_ui_about(new AboutDialog()),
m_statusLabel(new QLabel())
{
ui->setupUi(this);
- connect(ui->actionExit, SIGNAL(triggered()), this, SLOT(exitApp()));
- connect(ui->actionSettings, SIGNAL(triggered()), this, SLOT(settings()));
- connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()));
- connect(ui->btOpen, SIGNAL(released()), this, SLOT(openSerialPort()));
- connect(ui->btClose, SIGNAL(released()), this, SLOT(closeSerialPort()));
- connect(m_serial, &QSerialPort::readyRead, this, &MainWindow::readData);
- connect(ui->sbTrigger, SIGNAL(valueChanged(double)), this, SLOT(updateTrigger()));
- connect(ui->rbNone, SIGNAL(clicked()), this, SLOT(updateTriggerType()));
- connect(ui->rbRising, SIGNAL(clicked()), this, SLOT(updateTriggerType()));
- connect(ui->rbFalling, SIGNAL(clicked()), this, SLOT(updateTriggerType()));
- connect(ui->rbV20, SIGNAL(clicked()), this, SLOT(updateVdiv()));
- connect(ui->rbV10, SIGNAL(clicked()), this, SLOT(updateVdiv()));
- connect(ui->rbV5, SIGNAL(clicked()), this, SLOT(updateVdiv()));
- connect(ui->rbV1, SIGNAL(clicked()), this, SLOT(updateVdiv()));
- connect(ui->rbH100, SIGNAL(clicked()), this, SLOT(updateHdiv()));
- connect(ui->rbH50, SIGNAL(clicked()), this, SLOT(updateHdiv()));
- connect(ui->rbH10, SIGNAL(clicked()), this, SLOT(updateHdiv()));
- connect(ui->rbH5, SIGNAL(clicked()), this, SLOT(updateHdiv()));
- //connect(ui->rbH1, SIGNAL(clicked()), this, SLOT(updateHdiv()));
- connect(ui->rbH1, &QRadioButton::clicked, this, &MainWindow::updateHdiv);
- connect(ui->btExport, &QPushButton::clicked, this, &MainWindow::exportData);
- ui->rbV10->setChecked(true);
- ui->rbH10->setChecked(true);
- ui->sbTrigger->setValue(trigger);
- ui->btClose->setEnabled(false);
- ui->lbPic->setMinimumSize(400, 250);
+
+ ui->lbPic->setMinimumSize(1, 1);
+ //ui->lbPic->adjustSize();
drawBackground();
ui->lbPic->setPixmap(*m_pixmap);
statusBar()->addWidget(m_statusLabel);
m_statusLabel->setText("Disconnected");
+
+ ui->cbVdiv->addItem("2V/d");
+ ui->cbVdiv->addItem("1V/d");
+ ui->cbVdiv->addItem("500mV/d");
+ ui->cbVdiv->addItem("100mV/d");
+ ui->cbVdiv->setItemData(0, 2000);
+ ui->cbVdiv->setItemData(1, 1000);
+ ui->cbVdiv->setItemData(2, 500);
+ ui->cbVdiv->setItemData(3, 100);
+ ui->cbVdiv->setCurrentIndex(1);
+
+ ui->cbHdiv->addItem("10ms/d");
+ ui->cbHdiv->addItem("5ms/d");
+ ui->cbHdiv->addItem("1ms/d");
+ ui->cbHdiv->addItem("500us/d");
+ ui->cbHdiv->addItem("100us/d");
+ ui->cbHdiv->setItemData(0, 10000);
+ ui->cbHdiv->setItemData(1, 5000);
+ ui->cbHdiv->setItemData(2, 100);
+ ui->cbHdiv->setItemData(3, 500);
+ ui->cbHdiv->setItemData(4, 100);
+ ui->cbHdiv->setCurrentIndex(2);
+
+ ui->cbTriggerType->addItem("None");
+ ui->cbTriggerType->addItem("Rising");
+ ui->cbTriggerType->addItem("Falling");
+ ui->cbTriggerType->setCurrentIndex(1);
+
+ QMenu *menu = menuBar()->addMenu(tr("&Menu"));
+
+ const QIcon connectIcon = QIcon::fromTheme("connect", QIcon("connect.png"));
+ connectAct = new QAction(connectIcon, tr("&Connect"), this);
+ menu->addAction(connectAct);
+
+
+ const QIcon disconnectIcon = QIcon::fromTheme("disconnect", QIcon("disconnect.png"));
+ disconnectAct = new QAction(disconnectIcon, tr("&Disconnect"), this);
+ menu->addAction(disconnectAct);
+ menu->addSeparator();
+
+ const QIcon exportIcon = QIcon::fromTheme("export", QIcon("save.png"));
+ QAction *exportAct = new QAction(exportIcon, tr("&Export..."), this);
+ menu->addAction(exportAct);
+
+ const QIcon settingsIcon = QIcon::fromTheme("settings", QIcon("settings.png"));
+ QAction *settingsAct = new QAction(settingsIcon, tr("&Settings..."), this);
+ menu->addAction(settingsAct);
+ menu->addSeparator();
+
+ QAction *aboutAct = new QAction(tr("&About"), this);
+ menu->addAction(aboutAct);
+
+ const QIcon exitIcon = QIcon::fromTheme("exit", QIcon("application-exit.png"));
+ QAction *exitAct = new QAction(exitIcon, tr("&Exit"), this);
+ menu->addAction(exitAct);
+
+#ifndef Q_OS_ANDROID
+ QToolBar *toolBar = addToolBar(tr("Toolbar"));
+ toolBar->addAction(connectAct);
+ toolBar->addAction(disconnectAct);
+ toolBar->addSeparator();
+ toolBar->addAction(exportAct);
+ toolBar->addAction(settingsAct);
+ toolBar->addSeparator();
+ toolBar->addAction(exitAct);
+#endif
+ disconnectAct->setEnabled(false);
+
+ connect(m_serial, &QSerialPort::readyRead, this, &MainWindow::readData);
+ connect(connectAct, &QAction::triggered, this, &MainWindow::openSerialPort);
+ connect(disconnectAct, &QAction::triggered, this, &MainWindow::closeSerialPort);
+ connect(settingsAct, &QAction::triggered, this, &MainWindow::settings);
+ connect(exportAct, &QAction::triggered, this, &MainWindow::exportData);
+ connect(aboutAct, &QAction::triggered, this, &MainWindow::about);
+ connect(exitAct, &QAction::triggered, this, &MainWindow::exitApp);
+ connect(ui->cbHdiv, &QComboBox::currentIndexChanged, this, &MainWindow::updateHdiv);
+ connect(ui->cbVdiv, &QComboBox::currentIndexChanged, this, &MainWindow::updateVdiv);
+ connect(ui->cbTriggerType, &QComboBox::currentIndexChanged, this, &MainWindow::updateTriggerType);
+ connect(ui->sbTriggerValue, &QDoubleSpinBox::valueChanged, this, &MainWindow::updateTrigger);
+ connect(m_ui_settings, &SettingsDialog::accepted, this, &MainWindow::refresh);
+
+ qInfo() << QString::number(ui->lbPic->height()) + " " + QString::number(ui->lbPic->width());
}
MainWindow::~MainWindow()
@@ -55,49 +127,42 @@ void MainWindow::readData()
{
static bool isTriggered = true;
static float oldxPos = 0;
- static uint16_t oldyPos = m_pixmap->height();
+ static int16_t oldyPos = m_pixmap->height();
static uint8_t prevValue = 0;
static uint8_t deltaRising = 0;
static uint8_t deltaFalling = 0;
static uint16_t tsRising = 0;
static uint16_t tsFalling = 0;
static uint16_t cont = 0;
- uint16_t interval = 13;
+ m_paint->setPen(QPen(QColor(m_ui_settings->m_currentSettings.signalcolor), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
QByteArray data = m_serial->readAll();
float xDelta = m_pixmap->width() * interval / 1000.0 / timeLenght; // float needed in case delta is less than one
- for (uint16_t i = 0; i < data.size(); i++)
- {
+ for (uint16_t i = 0; i < data.size(); i++) {
// Find V limits
- if ((uint8_t)data[i] > maxValue)
- {
+ if ((uint8_t)data[i] > maxValue) {
maxValue = data[i];
}
- if ((uint8_t)data[i] < minValue)
- {
+ if ((uint8_t)data[i] < minValue) {
minValue = data[i];
}
- // Find triggers
- if ((uint8_t)data[i] - prevValue > 0) // rising
- {
+ // Find triggers and signal properties
+ if ((uint8_t)data[i] - prevValue > 0) { // rising
deltaRising += (uint8_t)data[i] - prevValue;
deltaFalling = 0;
}
- if ((uint8_t)data[i] - prevValue < 0) // falling
- {
+ if ((uint8_t)data[i] - prevValue < 0) { // falling
deltaFalling += prevValue - (uint8_t)data[i];
deltaRising = 0;
}
prevValue = data[i];
- if (((float)deltaRising) / 0xFF * 5 > trigger)
- {
- if ((triggerType == rising || triggerType == none) && cont - tsRising > 2)
- {
+ if (((float)deltaRising) / 0xFF * 5 > trigger) {
+ if ((triggerType == rising || triggerType == none) && cont - tsRising > 2) {
isTriggered = true;
rawFreq = cont - tsRising;
rawDuty = cont - tsFalling;
@@ -108,10 +173,8 @@ void MainWindow::readData()
tsRising = cont;
}
- if (((float)deltaFalling) / 0xFF * 5 > trigger)
- {
- if (triggerType == falling && cont - tsFalling > 2)
- {
+ if (((float)deltaFalling) / 0xFF * 5 > trigger) {
+ if (triggerType == falling && cont - tsFalling > 2) {
isTriggered = true;
rawFreq = cont - tsFalling;
rawDuty = cont - tsRising;
@@ -124,21 +187,15 @@ void MainWindow::readData()
cont++;
- if (isTriggered == true || triggerType == none) // draw new value
- {
+ // Draw new value
+ if (isTriggered == true || triggerType == none) {
float newxPos = oldxPos + xDelta;
- uint16_t newyPos = m_pixmap->height() - (uint8_t)data[i] * m_pixmap->height() / 0xFF;
+ int16_t newyPos = m_pixmap->height() - (uint8_t)data[i] * m_pixmap->height() / 0xFF;
newyPos = newyPos * 5 / volt + m_pixmap->height() * (6 - 5 / vDiv) / 6 / 2;
- if (newyPos < 0)
- {
- newyPos = 0;
- }
-
- if (newxPos > m_pixmap->width())
- {
- if (triggerType != none)
- {
+ // End of pixmap
+ if (newxPos > m_pixmap->width()) {
+ if (triggerType != none) {
isTriggered = false;
deltaRising = 0;
deltaFalling = 0;
@@ -146,14 +203,10 @@ void MainWindow::readData()
ui->lbPic->setPixmap(*m_pixmap);
- if (pendingExport)
- {
- if (!m_pixmap->toImage().save(fileName))
- {
+ if (pendingExport) {
+ if (!m_pixmap->toImage().save(fileName)) {
statusBar()->showMessage("Export error", 3000);
- }
- else
- {
+ } else {
statusBar()->showMessage("Saved", 3000);
}
@@ -161,14 +214,15 @@ void MainWindow::readData()
}
drawBackground();
- newxPos -= m_pixmap->width();
+ m_paint->setPen(QPen(QColor(m_ui_settings->m_currentSettings.signalcolor), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+ newxPos = 0;
maxValue = 0;
minValue = 0;
}
- else
- {
+ // Draw new value
+ else {
float timePos = (float)ui->slTime->value() / (ui->slTime->maximum() - ui->slTime->minimum()) * 0.25;
- float voltPos = (float)ui->slVolt->value() / (ui->slVolt->maximum() - ui->slVolt->minimum()) * 0.50;
+ float voltPos = (float)ui->slVolt->value() / (ui->slVolt->maximum() - ui->slVolt->minimum());
m_paint->drawLine(newxPos + m_pixmap->width() * timePos, newyPos + m_pixmap->height() * voltPos, oldxPos + m_pixmap->width() * timePos, oldyPos + m_pixmap->height() * voltPos);
}
@@ -182,47 +236,42 @@ void MainWindow::drawBackground()
{
uint16_t height = m_pixmap->height();
uint16_t width = m_pixmap->width();
- m_paint->fillRect(0, 0, width, height, QColor(255, 255, 255, 255));
+ m_paint->fillRect(0, 0, width, height, QColor(m_ui_settings->m_currentSettings.backgroundcolor));
+ // 0 volts line
+ m_paint->setPen(QPen(Qt::red, 1, Qt::DashLine, Qt::RoundCap, Qt::RoundJoin));
+ float voltPos = (float)ui->slVolt->value() / (ui->slVolt->maximum() - ui->slVolt->minimum());
+ uint16_t yPos = m_pixmap->height() * (5 / volt + (6 - 5 / vDiv) / 6 / 2);
+ m_paint->drawLine(0, yPos + m_pixmap->height() * voltPos, m_pixmap->width(), yPos + m_pixmap->height() * voltPos);
+ //m_paint->setPen(QColor(0, 0, 0, 123));
+ m_paint->setPen(QColor(m_ui_settings->m_currentSettings.gridcolor));
+
+ for (uint8_t i = 0; i < 6; i++) { // horizontal lines
+ m_paint->drawLine(0, height * i / 6, width, height * i / 6);
+ }
+
+ for (uint8_t i = 0; i < 10; i++) { // vertical lines
+ m_paint->drawLine(width * i / 10, 0, width * i / 10, height);
+ }
+
QFont font = m_paint->font();
font.setPixelSize(14);
- font.setBold(true);
+ //font.setBold(true);
m_paint->setFont(font);
- m_paint->setPen(QColor(0, 0, 100, 255));
+ //m_paint->setPen(QColor(0, 0, 100, 255));
+ m_paint->setPen(QColor(m_ui_settings->m_currentSettings.textcolor));
m_paint->drawText(5, height - 5, QString::number(vDiv * 1000) + "mV/d " + QString::number((float)timeLenght / 10 * 1000) + "μs/d Vmax=" + QString::number((float)maxValue / 0xFF * 5, 'f',
3) + " Vmin=" + QString::number((float)minValue / 0xFF * 5, 'f', 3));
QString freq, duty;
- if (rawFreq == 0)
- {
+ if (rawFreq == 0) {
freq = "0";
duty = "0";
- }
- else
- {
+ } else {
freq = QString::number((float)1000000 / (rawFreq * interval), 'f', 0);
duty = QString::number(100 * (float)rawDuty / rawFreq, 'f', 0);
}
m_paint->drawText(5, 20, freq + "Hz " + duty + "%");
- // 0 volts line
- m_paint->setPen(QColor(0, 100, 0, 50));
- float voltPos = (float)ui->slVolt->value() / (ui->slVolt->maximum() - ui->slVolt->minimum()) * 0.50;
- uint16_t yPos = m_pixmap->height();
- yPos = yPos * 5 / volt + m_pixmap->height() * (6 - 5 / vDiv) / 6 / 2;
- m_paint->drawLine(0, yPos + m_pixmap->height() * voltPos, m_pixmap->width(), yPos + m_pixmap->height() * voltPos);
- m_paint->setPen(QColor(0, 0, 0, 123));
-
- for (uint8_t i = 0; i < 6; i++) // horizontal lines
- {
- m_paint->drawLine(0, height * i / 6, width, height * i / 6);
- }
-
- for (uint8_t i = 0; i < 10; i++) // vertical lines
- {
- m_paint->drawLine(width * i / 10, 0, width * i / 10, height);
- }
-
- m_paint->setPen(QColor(0, 0, 0, 255));
}
void MainWindow::resizeEvent(QResizeEvent* event)
@@ -245,71 +294,40 @@ void MainWindow::openSerialPort()
m_serial->setFlowControl(m_ui_settings->m_currentSettings.flowControl);
interval = m_ui_settings->m_currentSettings.interval;
- if (m_serial->open(QIODevice::ReadOnly))
- {
+ if (m_serial->open(QIODevice::ReadOnly)) {
m_statusLabel->setText("Connected (" + m_serial->portName() + " " + QString::number(m_serial->baudRate()) + "bps " + QString::number(interval) + "μs)");
- ui->btOpen->setEnabled(false);
- ui->btClose->setEnabled(true);
- }
- else
- {
+ connectAct->setEnabled(false);
+ disconnectAct->setEnabled(true);
+ } else {
statusBar()->showMessage("Connection error", 3000);
}
}
void MainWindow::closeSerialPort()
{
- if (m_serial->isOpen())
- {
+ if (m_serial->isOpen()) {
m_serial->close();
}
statusBar()->showMessage("Disconnected");
- ui->btOpen->setEnabled(true);
- ui->btClose->setEnabled(false);
+ connectAct->setEnabled(true);
+ disconnectAct->setEnabled(false);
}
void MainWindow::updateTrigger()
{
- QString text = ui->sbTrigger->text();
+ QString text = ui->sbTriggerValue->text();
trigger = text.toFloat();
}
void MainWindow::updateTriggerType()
{
- if (ui->rbNone->isChecked())
- {
- triggerType = none;
- }
- else if (ui->rbRising->isChecked())
- {
- triggerType = rising;
- }
- else if (ui->rbFalling->isChecked())
- {
- triggerType = falling;
- }
+ triggerType = (TriggerType)ui->cbTriggerType->currentIndex();
}
void MainWindow::updateVdiv()
{
- if (ui->rbV20->isChecked())
- {
- vDiv = 2;
- }
- else if (ui->rbV10->isChecked())
- {
- vDiv = 1;
- }
- else if (ui->rbV5->isChecked())
- {
- vDiv = 0.5;
- }
- else if (ui->rbV1->isChecked())
- {
- vDiv = 0.1;
- }
-
+ vDiv = ui->cbVdiv->currentData().toFloat() / 1000;
volt = vDiv * 6;
drawBackground();
ui->lbPic->setPixmap(*m_pixmap);
@@ -317,39 +335,32 @@ void MainWindow::updateVdiv()
void MainWindow::updateHdiv()
{
- if (ui->rbH100->isChecked())
- {
- timeLenght = 100;
- }
- else if (ui->rbH50->isChecked())
- {
- timeLenght = 50;
- }
- else if (ui->rbH10->isChecked())
- {
- timeLenght = 10;
- }
- else if (ui->rbH5->isChecked())
- {
- timeLenght = 5;
- }
- else if (ui->rbH1->isChecked())
- {
- timeLenght = 1;
- }
+ hDiv = ui->cbHdiv->currentData().toFloat() / 1000;
+ timeLenght = hDiv * 10;
drawBackground();
ui->lbPic->setPixmap(*m_pixmap);
}
void MainWindow::settings()
{
+#ifdef Q_OS_ANDROID
+ //ui->menuBar->setDisabled(true);
+ m_ui_settings->showMaximized();
+#else
+ m_ui_settings->move(x() + (width() - m_ui_settings->width()) / 2,
+ y() + (height() - m_ui_settings->height()) / 2);
m_ui_settings->show();
+#endif
+
}
void MainWindow::about()
{
- m_ui_about->show();
+ QMessageBox::about(this, tr("About"),
+ tr("Oscilloscope Serial v0.1
"
+ "
"
+ "DanielGeA, 2021"));
}
void MainWindow::exportData()
@@ -358,30 +369,27 @@ void MainWindow::exportData()
tr("Save signal image"), "",
tr("Bitmap image (*.bmp);;All Files (*)"));
- if (fileName.isEmpty())
- {
+ if (fileName.isEmpty()) {
return;
- }
- else
- {
- if (m_serial->isOpen())
- {
+ } else {
+ if (m_serial->isOpen()) {
pendingExport = true;
- }
- else
- {
- if (!m_pixmap->toImage().save(fileName))
- {
+ } else {
+ if (!m_pixmap->toImage().save(fileName)) {
statusBar()->showMessage("Export error", 3000);
- }
- else
- {
+ } else {
statusBar()->showMessage("Saved", 3000);
}
}
}
}
+void MainWindow::refresh()
+{
+ drawBackground();
+ ui->lbPic->setPixmap(*m_pixmap);
+}
+
void MainWindow::exitApp()
{
QApplication::quit();
diff --git a/src/qt/mainwindow.h b/src/qt/mainwindow.h
index 49ed0e7..590a7ca 100644
--- a/src/qt/mainwindow.h
+++ b/src/qt/mainwindow.h
@@ -1,3 +1,18 @@
+/*
+ * 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 .
+ */
+
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
@@ -8,13 +23,17 @@
#include
#include
#include
+#include
+#include
QT_BEGIN_NAMESPACE
-namespace Ui { class MainWindow; }
+namespace Ui
+{
+class MainWindow;
+}
QT_END_NAMESPACE
class SettingsDialog;
-class AboutDialog;
class MainWindow : public QMainWindow
{
@@ -33,16 +52,16 @@ private:
QPixmap *m_pixmap;
QPainter *m_paint;
SettingsDialog *m_ui_settings = nullptr;
- AboutDialog *m_ui_about = nullptr;
QLabel *m_statusLabel = nullptr;
- float vDiv = 1;
+ float vDiv = 1; // v
float volt = 1 * 6;
- uint16_t timeLenght = 1 * 10;
+ float hDiv = 1; // ms
+ uint16_t timeLenght = hDiv * 10;
float trigger = 1;
enum Edge { min, max };
- enum TriggerTypes { none, rising, falling };
- uint8_t triggerType = none;
+ enum TriggerType { none, rising, falling };
+ TriggerType triggerType = none;
uint8_t maxValue = 0;
uint8_t minValue = 0;
@@ -51,6 +70,9 @@ private:
bool pendingExport = false;
QString fileName;
+ QAction *connectAct;
+ QAction *disconnectAct;
+
void drawBackground();
private slots:
@@ -65,6 +87,7 @@ private slots:
void settings();
void about();
void exportData();
+ void refresh();
};
#endif // MAINWINDOW_H
diff --git a/src/qt/mainwindow.ui b/src/qt/mainwindow.ui
index 3561075..bd16579 100644
--- a/src/qt/mainwindow.ui
+++ b/src/qt/mainwindow.ui
@@ -6,8 +6,8 @@
0
0
- 779
- 346
+ 1009
+ 766
@@ -19,321 +19,155 @@
Oscilloscope
-
+
-
-
-
- QLayout::SetDefaultConstraint
-
-
-
-
-
-
-
-
- selection-background-color: rgb(222, 221, 218);
+
+
-
+
+
+ selection-background-color: rgb(222, 221, 218);
selection-background-color: rgb(192, 191, 188);
-
-
- -6
-
-
- 6
-
-
- 2
-
-
- 0
-
-
- 0
-
-
- Qt::Vertical
-
-
- QSlider::TicksAbove
-
-
- 1
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- TextLabel
-
-
-
- -
-
-
- selection-background-color: rgb(255, 190, 111);
-selection-background-color: rgb(192, 191, 188);
-
-
- -10
-
-
- 10
-
-
- 5
-
-
- 0
-
-
- 0
-
-
- true
-
-
- Qt::Horizontal
-
-
- false
-
-
- false
-
-
- QSlider::TicksAbove
-
-
- 1
-
-
-
-
+
+
+ -6
+
+
+ 6
+
+
+ 2
+
+
+ 0
+
+
+ 0
+
+
+ Qt::Vertical
+
+
+ QSlider::TicksAbove
+
+
+ 1
+
+
- -
-
-
-
-
-
-
-
-
- V/div
-
-
-
-
-
-
- 2V
-
-
-
- -
-
-
- 1V
-
-
-
- -
-
-
- 500mV
-
-
-
- -
-
-
- 100mV
-
-
-
-
-
-
- -
-
-
- H/div
-
-
-
-
-
-
- 10ms
-
-
-
- -
-
-
- 5ms
-
-
-
- -
-
-
- 1ms
-
-
-
- -
-
-
- 500us
-
-
-
- -
-
-
- 100us
-
-
-
-
-
-
- -
-
-
- Trigger
-
-
-
-
-
-
- 1
-
-
- 0.100000000000000
-
-
- 6.000000000000000
-
-
- 0.100000000000000
-
-
-
- -
-
-
- Type
-
-
-
-
-
-
- None
-
-
- true
-
-
-
- -
-
-
- Rising
-
-
-
- -
-
-
- Falling
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
- Connect
-
-
-
- -
-
-
- true
-
-
- Disconnect
-
-
-
- -
-
-
- Export...
-
-
-
-
-
-
+ -
+
+
+ selection-background-color: rgb(255, 190, 111);
+selection-background-color: rgb(192, 191, 188);
+
+
+ -10
+
+
+ 10
+
+
+ 5
+
+
+ 0
+
+
+ 0
+
+
+ true
+
+
+ Qt::Horizontal
+
+
+ false
+
+
+ false
+
+
+ QSlider::TicksAbove
+
+
+ 1
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ TextLabel
+
+
+
+
+
+ -
+
+
-
+
+
+ Vertical
+
+
+
+ -
+
+
+ 1
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ Horizontal
+
+
+
+ -
+
+
+ -
+
+
+ Trigger
+
+
+
+ -
+
+
+ -
+
-
diff --git a/src/qt/oscilloscope.pro b/src/qt/oscilloscope.pro
index 074bc1d..2214080 100644
--- a/src/qt/oscilloscope.pro
+++ b/src/qt/oscilloscope.pro
@@ -9,18 +9,15 @@ CONFIG += c++11 console
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
- aboutdialog.cpp \
main.cpp \
mainwindow.cpp \
settingsdialog.cpp
HEADERS += \
- aboutdialog.h \
mainwindow.h \
settingsdialog.h
FORMS += \
- aboutdialog.ui \
mainwindow.ui \
settingsdialog.ui
@@ -33,4 +30,5 @@ RESOURCES += \
resources.qrc
DISTFILES += \
- ../../README.md
+ ../../README.md \
+ connect.png
diff --git a/src/qt/resources.qrc b/src/qt/resources.qrc
index a56f6aa..a3d6e39 100644
--- a/src/qt/resources.qrc
+++ b/src/qt/resources.qrc
@@ -1,5 +1,7 @@
oscilloscope.bmp
+ connect.png
+ disconnect.png
diff --git a/src/qt/save.png b/src/qt/save.png
new file mode 100644
index 0000000..e65a29d
Binary files /dev/null and b/src/qt/save.png differ
diff --git a/src/qt/settings.png b/src/qt/settings.png
new file mode 100644
index 0000000..3d1042e
Binary files /dev/null and b/src/qt/settings.png differ
diff --git a/src/qt/settingsdialog.cpp b/src/qt/settingsdialog.cpp
index d578475..b852ec6 100644
--- a/src/qt/settingsdialog.cpp
+++ b/src/qt/settingsdialog.cpp
@@ -1,10 +1,21 @@
+/*
+ * 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 .
+ */
+
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
-#include
-#include
-#include
-
static const char blankString[] = QT_TRANSLATE_NOOP("SettingsDialog", "N/A");
SettingsDialog::SettingsDialog(QWidget* parent) :
@@ -20,16 +31,61 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
connect(m_ui->serialPortInfoListBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SettingsDialog::showPortInfo);
connect(m_ui->baudRateBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SettingsDialog::checkCustomBaudRatePolicy);
connect(m_ui->serialPortInfoListBox, QOverload::of(&QComboBox::currentIndexChanged), this, &SettingsDialog::checkCustomDevicePathPolicy);
+ connect(m_ui->btBackground, &QPushButton::clicked, this, [this] {color(Element::background);});
+ connect(m_ui->btGrid, &QPushButton::clicked, this, [this] {color(Element::grid);});
+ connect(m_ui->btSignal, &QPushButton::clicked, this, [this] {color(Element::signal);});
+ connect(m_ui->btText, &QPushButton::clicked, this, [this] {color(Element::text);});
fillPortsParameters();
fillPortsInfo();
+ m_ui->lbBackground->setStyleSheet("QLabel { background-color : #000000;}");
+ m_ui->lbGrid->setStyleSheet("QLabel { background-color : #33d17a;}");
+ m_ui->lbSignal->setStyleSheet("QLabel { background-color : #33d17a;}");
+ m_ui->lbText->setStyleSheet("QLabel { background-color : #c061cb;}");
+ backgroundcolor = "#000000";
+ gridcolor = "#33d17a";
+ signalcolor = "#33d17a";
+ textcolor = "#9141ac";
+
+ if (m_settings->value("serialport").isValid()) {
+ m_ui->serialPortInfoListBox->setCurrentText(m_settings->value("serialport").toString());
+ }
+
+ if (m_settings->value("baudrate").isValid()) {
+ m_ui->baudRateBox->setCurrentText(m_settings->value("baudrate").toString());
+ }
+
+ if (m_settings->value("databits").isValid()) {
+ m_ui->dataBitsBox->setCurrentText(m_settings->value("databits").toString());
+ }
+
+ if (m_settings->value("parity").isValid()) {
+ m_ui->parityBox->setCurrentText(m_settings->value("parity").toString());
+ }
+
+ if (m_settings->value("interval").isValid()) {
+ m_ui->sbInterval->setValue(m_settings->value("interval").toInt());
+ }
+
+ backgroundcolor = m_settings->value("backgroundcolor").toString();
+ gridcolor = m_settings->value("gridcolor").toString();
+ signalcolor = m_settings->value("signalcolor").toString();
+ textcolor = m_settings->value("textcolor").toString();
+ if (m_settings->value("backgroundcolor").isValid()) {
+ m_ui->lbBackground->setStyleSheet("QLabel { background-color : " + backgroundcolor + ";}");
+ }
+
+ if (m_settings->value("gridcolor").isValid()) {
+ m_ui->lbGrid->setStyleSheet("QLabel { background-color : " + gridcolor + ";}");
+ }
+
+ if (m_settings->value("signalcolor").isValid()) {
+ m_ui->lbSignal->setStyleSheet("QLabel { background-color : " + signalcolor + ";}");
+ }
+
+ if (m_settings->value("textcolor").isValid()) {
+ m_ui->lbText->setStyleSheet("QLabel { background-color : " + textcolor + ";}");
+ }
- m_ui->serialPortInfoListBox->setCurrentText(m_settings->value("serialport").toString());
- m_ui->baudRateBox->setCurrentText(m_settings->value("baudrate").toString());
- m_ui->dataBitsBox->setCurrentText(m_settings->value("databits").toString());
- m_ui->parityBox->setCurrentText(m_settings->value("parity").toString());
- m_ui->stopBitsBox->setCurrentText(m_settings->value("stopbits").toString());
- m_ui->flowControlBox->setCurrentText(m_settings->value("flowcontrol").toString());
- m_ui->sbInterval->setValue(m_settings->value("interval").toInt());
updateSettings();
}
@@ -45,24 +101,17 @@ SettingsDialog::Settings SettingsDialog::settings() const
void SettingsDialog::showPortInfo(int idx)
{
- if (idx == -1)
- {
+ if (idx == -1) {
return;
}
const QStringList list = m_ui->serialPortInfoListBox->itemData(idx).toStringList();
- m_ui->descriptionLabel->setText(tr("Description: %1").arg(list.count() > 1 ? list.at(1) : tr(blankString)));
- m_ui->manufacturerLabel->setText(tr("Manufacturer: %1").arg(list.count() > 2 ? list.at(2) : tr(blankString)));
- m_ui->serialNumberLabel->setText(tr("Serial number: %1").arg(list.count() > 3 ? list.at(3) : tr(blankString)));
- m_ui->locationLabel->setText(tr("Location: %1").arg(list.count() > 4 ? list.at(4) : tr(blankString)));
- m_ui->vidLabel->setText(tr("Vendor Identifier: %1").arg(list.count() > 5 ? list.at(5) : tr(blankString)));
- m_ui->pidLabel->setText(tr("Product Identifier: %1").arg(list.count() > 6 ? list.at(6) : tr(blankString)));
}
void SettingsDialog::apply()
{
updateSettings();
- hide();
+ accept();
}
void SettingsDialog::checkCustomBaudRatePolicy(int idx)
@@ -70,8 +119,7 @@ void SettingsDialog::checkCustomBaudRatePolicy(int idx)
const bool isCustomBaudRate = !m_ui->baudRateBox->itemData(idx).isValid();
m_ui->baudRateBox->setEditable(isCustomBaudRate);
- if (isCustomBaudRate)
- {
+ if (isCustomBaudRate) {
m_ui->baudRateBox->clearEditText();
QLineEdit* edit = m_ui->baudRateBox->lineEdit();
edit->setValidator(m_intValidator);
@@ -83,8 +131,7 @@ void SettingsDialog::checkCustomDevicePathPolicy(int idx)
const bool isCustomPath = !m_ui->serialPortInfoListBox->itemData(idx).isValid();
m_ui->serialPortInfoListBox->setEditable(isCustomPath);
- if (isCustomPath)
- {
+ if (isCustomPath) {
m_ui->serialPortInfoListBox->clearEditText();
}
}
@@ -109,15 +156,7 @@ void SettingsDialog::fillPortsParameters()
m_ui->parityBox->addItem(tr("Even"), QSerialPort::EvenParity);
m_ui->parityBox->addItem(tr("Odd"), QSerialPort::OddParity);
m_ui->parityBox->addItem(tr("Mark"), QSerialPort::MarkParity);
- m_ui->parityBox->addItem(tr("Space"), QSerialPort::SpaceParity);
- m_ui->stopBitsBox->addItem(QStringLiteral("1"), QSerialPort::OneStop);
-#ifdef Q_OS_WIN
- m_ui->stopBitsBox->addItem(tr("1.5"), QSerialPort::OneAndHalfStop);
-#endif
- m_ui->stopBitsBox->addItem(QStringLiteral("2"), QSerialPort::TwoStop);
- m_ui->flowControlBox->addItem(tr("None"), QSerialPort::NoFlowControl);
- m_ui->flowControlBox->addItem(tr("RTS/CTS"), QSerialPort::HardwareControl);
- m_ui->flowControlBox->addItem(tr("XON/XOFF"), QSerialPort::SoftwareControl);
+ m_ui->parityBox->addItem(tr("Space"), QSerialPort::SpaceParity);
}
void SettingsDialog::fillPortsInfo()
@@ -128,8 +167,7 @@ void SettingsDialog::fillPortsInfo()
QString serialNumber;
const auto infos = QSerialPortInfo::availablePorts();
- for (const QSerialPortInfo& info : infos)
- {
+ for (const QSerialPortInfo& info : infos) {
QStringList list;
description = info.description();
manufacturer = info.manufacturer();
@@ -152,12 +190,9 @@ void SettingsDialog::updateSettings()
m_currentSettings.name = m_ui->serialPortInfoListBox->currentText();
m_settings->setValue("serialport", m_ui->serialPortInfoListBox->currentText());
- if (m_ui->baudRateBox->currentIndex() == 4)
- {
+ if (m_ui->baudRateBox->currentIndex() == 4) {
m_currentSettings.baudRate = m_ui->baudRateBox->currentText().toInt();
- }
- else
- {
+ } else {
m_currentSettings.baudRate = static_cast(
m_ui->baudRateBox->itemData(m_ui->baudRateBox->currentIndex()).toInt());
}
@@ -172,15 +207,38 @@ void SettingsDialog::updateSettings()
m_ui->parityBox->itemData(m_ui->parityBox->currentIndex()).toInt());
m_currentSettings.stringParity = m_ui->parityBox->currentText();
m_settings->setValue("parity", m_ui->parityBox->currentIndex());
- m_currentSettings.stopBits = static_cast(
- m_ui->stopBitsBox->itemData(m_ui->stopBitsBox->currentIndex()).toInt());
- m_currentSettings.stringStopBits = m_ui->stopBitsBox->currentText();
- m_settings->setValue("stopbits", m_ui->stopBitsBox->currentText().toInt());
- m_currentSettings.flowControl = static_cast(
- m_ui->flowControlBox->itemData(m_ui->flowControlBox->currentIndex()).toInt());
- m_currentSettings.stringFlowControl = m_ui->flowControlBox->currentText();
- m_settings->setValue("flowcontrol", m_ui->flowControlBox->currentText().toInt());
+
m_currentSettings.interval = m_ui->sbInterval->value();
m_settings->setValue("interval", m_ui->sbInterval->value());
+
+ m_currentSettings.backgroundcolor = backgroundcolor;
+ m_settings->setValue("backgroundcolor", backgroundcolor);
+ m_currentSettings.gridcolor = gridcolor;
+ m_settings->setValue("gridcolor", gridcolor);
+ m_currentSettings.signalcolor = signalcolor;
+ m_settings->setValue("signalcolor", signalcolor);
+ m_currentSettings.textcolor = textcolor;
+ m_settings->setValue("textcolor", textcolor);
}
+void SettingsDialog::color(Element element)
+{
+ QColor color = QColorDialog::getColor(Qt::yellow, this);
+
+ qInfo() << color.name();
+ if (color.isValid()) {
+ if (element == Element::background) {
+ backgroundcolor = color.name();
+ m_ui->lbBackground->setStyleSheet("QLabel { background-color : " + backgroundcolor + ";}");
+ } else if (element == Element::grid) {
+ gridcolor = color.name();
+ m_ui->lbGrid->setStyleSheet("QLabel { background-color : " + gridcolor + ";}");
+ } else if (element == Element::signal) {
+ signalcolor = color.name();
+ m_ui->lbSignal->setStyleSheet("QLabel { background-color : " + signalcolor + ";}");
+ } else if (element == Element::text) {
+ textcolor = color.name();
+ m_ui->lbText->setStyleSheet("QLabel { background-color : " + textcolor + ";}");
+ }
+ }
+}
diff --git a/src/qt/settingsdialog.h b/src/qt/settingsdialog.h
index 6c008c8..1765886 100644
--- a/src/qt/settingsdialog.h
+++ b/src/qt/settingsdialog.h
@@ -1,3 +1,17 @@
+/*
+ * 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 .
+ */
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
@@ -6,10 +20,15 @@
#include
#include
#include
+#include
+#include
+#include
+#include
QT_BEGIN_NAMESPACE
-namespace Ui {
+namespace Ui
+{
class SettingsDialog;
}
@@ -35,6 +54,10 @@ public:
QSerialPort::FlowControl flowControl;
QString stringFlowControl;
qint16 interval;
+ QString backgroundcolor;
+ QString gridcolor;
+ QString signalcolor;
+ QString textcolor;
};
Settings m_currentSettings;
@@ -44,12 +67,14 @@ public:
~SettingsDialog();
Settings settings() const;
+ enum Element {background, grid, signal, text};
private slots:
void showPortInfo(int idx);
void apply();
void checkCustomBaudRatePolicy(int idx);
void checkCustomDevicePathPolicy(int idx);
+ void color(Element element);
private:
void fillPortsParameters();
@@ -60,6 +85,11 @@ private:
Ui::SettingsDialog *m_ui = nullptr;
QIntValidator *m_intValidator = nullptr;
+
+ QString backgroundcolor;
+ QString gridcolor;
+ QString signalcolor;
+ QString textcolor;
};
#endif // SETTINGSDIALOG_H
diff --git a/src/qt/settingsdialog.ui b/src/qt/settingsdialog.ui
index 7181405..54c262c 100644
--- a/src/qt/settingsdialog.ui
+++ b/src/qt/settingsdialog.ui
@@ -6,21 +6,53 @@
0
0
- 363
- 356
+ 334
+ 417
+
+
+ 0
+ 0
+
+
Settings
+
+ true
+
- -
+
-
- Select Parameters
+ Serial Port
-
-
+
-
+
+
+ -
+
+
+ Data bits:
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Parity:
+
+
+
+ -
BaudRate:
@@ -28,106 +60,19 @@
-
-
-
- -
-
-
- Data bits:
-
-
-
- -
-
-
- -
-
-
- Parity:
-
-
-
- -
-
-
- -
-
-
- Stop bits:
-
-
-
- -
-
-
- -
-
-
- Flow control:
-
-
-
- -
-
-
-
-
-
- -
-
-
- Select Serial Port
-
-
-
-
- -
-
+
-
+
- Description:
-
-
-
- -
-
-
- Manufacturer:
-
-
-
- -
-
-
- Serial number:
-
-
-
- -
-
-
- Location:
-
-
-
- -
-
-
- Vendor ID:
-
-
-
- -
-
-
- Product ID:
+ Port
- -
+
-
-
@@ -177,6 +122,111 @@
+ -
+
+
+ Colors
+
+
+
-
+
+
+ Grid
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ QFrame::Box
+
+
+
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+
+
+
+
+ -
+
+
+ Background
+
+
+
+ -
+
+
+ Text
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ QFrame::Box
+
+
+
+
+
+ 0
+
+
+
+ -
+
+
+ Signal
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+