From e7f139b048b8b6a365b1eb293780f95d0608f50a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jul 2016 11:07:48 +0200 Subject: [PATCH 01/20] First commit --- .gitignore | 62 ++++ CMakeLists.txt | 11 + LICENSE | 661 ++++++++++++++++++++++++++++++++++++++ MachineSettingsAction.py | 35 ++ MachineSettingsAction.qml | 286 +++++++++++++++++ README.md | 11 + __init__.py | 21 ++ 7 files changed, 1087 insertions(+) create mode 100644 .gitignore create mode 100644 CMakeLists.txt create mode 100644 LICENSE create mode 100644 MachineSettingsAction.py create mode 100644 MachineSettingsAction.qml create mode 100644 README.md create mode 100644 __init__.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..1dbc687de0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,62 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +#Ipython Notebook +.ipynb_checkpoints diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..dc7ede005e --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,11 @@ +project(MachineSettingsAction) +cmake_minimum_required(VERSION 2.8.12) + +install(FILES + __init__.py + MachineSettingsAction.py + MachineSettingsAction.qml + LICENSE + README.md + DESTINATION lib/cura/plugins/MachineSettingsAction +) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..dbbe355815 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py new file mode 100644 index 0000000000..4a29db0b5b --- /dev/null +++ b/MachineSettingsAction.py @@ -0,0 +1,35 @@ +from cura.MachineAction import MachineAction +import cura.Settings.CuraContainerRegistry + +from UM.i18n import i18nCatalog +from UM.Settings.DefinitionContainer import DefinitionContainer +from UM.Application import Application + +from PyQt5.QtCore import pyqtSlot, QObject + + +catalog = i18nCatalog("cura") + +class MachineSettingsAction(MachineAction, QObject, ): + def __init__(self, parent = None): + MachineAction.__init__(self, "MachineSettingsAction", catalog.i18nc("@action", "Machine Settings")) + self._qml_url = "MachineSettingsAction.qml" + + cura.Settings.CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) + + def _execute(self): + pass + + def _reset(self): + pass + + def _onContainerAdded(self, container): + # Add this action as a supported action to all machine definitions + if isinstance(container, DefinitionContainer) and container.getMetaDataEntry("type") == "machine": + Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) + + @pyqtSlot() + def forceUpdate(self): + # Force rebuilding the build volume by reloading the global container stack. + # This is a bit of a hack, but it seems quick enough. + Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml new file mode 100644 index 0000000000..8516b5899d --- /dev/null +++ b/MachineSettingsAction.qml @@ -0,0 +1,286 @@ +// Copyright (c) 2016 Ultimaker B.V. +// Cura is released under the terms of the AGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 1.1 +import QtQuick.Layouts 1.1 +import QtQuick.Window 2.1 + +import UM 1.2 as UM +import Cura 1.0 as Cura + + +Cura.MachineAction +{ + anchors.fill: parent; + Item + { + id: bedLevelMachineAction + anchors.fill: parent; + + UM.I18nCatalog { id: catalog; name: "cura"; } + + Label + { + id: pageTitle + width: parent.width + text: catalog.i18nc("@title", "Machine Settings") + wrapMode: Text.WordWrap + font.pointSize: 18; + } + Label + { + id: pageDescription + anchors.top: pageTitle.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label", "Please enter the correct settings for your printer below:") + } + + Column + { + id: pageCheckboxes + height: childrenRect.height + anchors.left: parent.left + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + width: parent.width - UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").height + + Grid + { + columns: 3 + columnSpacing: UM.Theme.getSize("default_margin").width + + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: buildAreaWidthField + text: machineWidthProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineWidthProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","Y (Depth)") + } + TextField + { + id: buildAreaDepthField + text: machineDepthProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineDepthProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","Z (Height)") + } + TextField + { + id: buildAreaHeightField + text: machineHeightProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineHeightProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Item + { + width: UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("default_margin").height + } + Item + { + width: UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("default_margin").height + } + Item + { + width: UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("default_margin").height + } + + Label + { + text: catalog.i18nc("@label","Nozzle size") + } + TextField + { + id: nozzleSizeField + text: machineNozzleSizeProvider.properties.value + validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } + onEditingFinished: { machineNozzleSizeProvider.setPropertyValue("value", text) } + } + Label + { + text: catalog.i18nc("@label","mm") + } + } + + Column + { + CheckBox + { + id: heatedBedCheckBox + text: catalog.i18nc("@option:check","Heated Bed") + checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false' + onClicked: machineHeatedBedProvider.setPropertyValue("value", checked) + } + CheckBox + { + id: centerIsZeroCheckBox + text: catalog.i18nc("@option:check","Machine Center is Zero") + checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false' + onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked) + } + } + + Row + { + spacing: UM.Theme.getSize("default_margin").width + anchors.left: parent.left + anchors.right: parent.right + Column + { + width: parent.width / 2 + Label + { + text: catalog.i18nc("@label","Start Gcode") + } + TextArea + { + id: machineStartGcodeField + width: parent.width + text: machineStartGcodeProvider.properties.value + onActiveFocusChanged: + { + if(!activeFocus) + { + machineStartGcodeProvider.setPropertyValue("value", machineStartGcodeField.text) + } + } + } + } + Column{ + width: parent.width / 2 + Label + { + text: catalog.i18nc("@label","End Gcode") + } + TextArea + { + id: machineEndGcodeField + width: parent.width + text: machineEndGcodeProvider.properties.value + onActiveFocusChanged: + { + if(!activeFocus) + { + machineEndGcodeProvider.setPropertyValue("value", machineEndGcodeField.text) + } + } + } + } + } + } + } + + UM.SettingPropertyProvider + { + id: machineWidthProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_width" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineDepthProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_depth" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineHeightProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_height" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineNozzleSizeProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_nozzle_size" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineHeatedBedProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_heated_bed" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineCenterIsZeroProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_center_is_zero" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + + UM.SettingPropertyProvider + { + id: machineStartGcodeProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_start_gcode" + watchedProperties: [ "value" ] + storeIndex: 0 + } + + UM.SettingPropertyProvider + { + id: machineEndGcodeProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_end_gcode" + watchedProperties: [ "value" ] + storeIndex: 0 + } + +} \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000000..1c521e9c83 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# MachineSettingsAction +Cura plugin which provides a way to modify printer settings (build volume, nozzle size, start/end gcode) from within Cura. + +Installation +---- +- Make sure your Cura version is 2.2 or newer +- Download or clone the repository into [Cura installation folder]/plugins/MachineSettingsAction + +How to use +---- +After adding a machine, go to "Manage Printers...", make sure your printer is active and select "Machine Settings" \ No newline at end of file diff --git a/__init__.py b/__init__.py new file mode 100644 index 0000000000..d97c44bad9 --- /dev/null +++ b/__init__.py @@ -0,0 +1,21 @@ +# Copyright (c) 2016 Aldo Hoeben / fieldOfView +# Cura is released under the terms of the AGPLv3 or higher. + +from . import MachineSettingsAction + +from UM.i18n import i18nCatalog +catalog = i18nCatalog("cura") + +def getMetaData(): + return { + "plugin": { + "name": catalog.i18nc("@label", "Machine Settings action"), + "author": "fieldOfView", + "version": "1.0", + "description": catalog.i18nc("@info:whatsthis", "Provides a way to change machine settings (such as build volume, nozzle size, etc)"), + "api": 3 + } + } + +def register(app): + return { "machine_action": MachineSettingsAction.MachineSettingsAction() } From 4e62d7d9514449be5afc5a27b15726a254077e89 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jul 2016 12:55:11 +0200 Subject: [PATCH 02/20] Remove dangling argument --- MachineSettingsAction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index 4a29db0b5b..9a265e5c2e 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -10,7 +10,7 @@ from PyQt5.QtCore import pyqtSlot, QObject catalog = i18nCatalog("cura") -class MachineSettingsAction(MachineAction, QObject, ): +class MachineSettingsAction(MachineAction, QObject): def __init__(self, parent = None): MachineAction.__init__(self, "MachineSettingsAction", catalog.i18nc("@action", "Machine Settings")) self._qml_url = "MachineSettingsAction.qml" From 09c95001edda2cb3b32f0cc93317b8cc851878e0 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jul 2016 22:45:58 +0200 Subject: [PATCH 03/20] Store customized settings in variant instead of user profile --- MachineSettingsAction.py | 25 +++++++++++++++++++------ MachineSettingsAction.qml | 16 ++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index 9a265e5c2e..cdfcbf2071 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -2,9 +2,11 @@ from cura.MachineAction import MachineAction import cura.Settings.CuraContainerRegistry from UM.i18n import i18nCatalog -from UM.Settings.DefinitionContainer import DefinitionContainer from UM.Application import Application +import UM.Settings.InstanceContainer +import UM.Settings.DefinitionContainer + from PyQt5.QtCore import pyqtSlot, QObject @@ -17,15 +19,26 @@ class MachineSettingsAction(MachineAction, QObject): cura.Settings.CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) - def _execute(self): - pass - def _reset(self): - pass + global_container_stack = Application.getInstance().getGlobalContainerStack() + if global_container_stack: + variant = global_container_stack.findContainer({"type": "variant"}) + if variant and variant.getId() == "empty_variant": + variant_index = global_container_stack.getContainerIndex(variant) + self._createVariant(global_container_stack, variant_index) + + def _createVariant(self, global_container_stack, variant_index): + new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_machinesettings") + new_variant.addMetaDataEntry("type", "variant") + new_variant.addMetaDataEntry("purpose", "machinesettings") + new_variant.setDefinition(global_container_stack.getBottom()) + UM.Settings.ContainerRegistry.getInstance().addContainer(new_variant) + global_container_stack.replaceContainer(variant_index, new_variant) + def _onContainerAdded(self, container): # Add this action as a supported action to all machine definitions - if isinstance(container, DefinitionContainer) and container.getMetaDataEntry("type") == "machine": + if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine": Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) @pyqtSlot() diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index 8516b5899d..df287e82d5 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -209,7 +209,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_width" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -219,7 +219,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_depth" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -229,7 +229,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_height" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -239,7 +239,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_nozzle_size" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -249,7 +249,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_heated_bed" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -259,7 +259,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_center_is_zero" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } @@ -270,7 +270,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_start_gcode" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } UM.SettingPropertyProvider @@ -280,7 +280,7 @@ Cura.MachineAction containerStackId: Cura.MachineManager.activeMachineId key: "machine_end_gcode" watchedProperties: [ "value" ] - storeIndex: 0 + storeIndex: 3 } } \ No newline at end of file From 3f56685acc402e35676f7bff47ba67d31e7be212 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 13 Jul 2016 23:26:28 +0200 Subject: [PATCH 04/20] Use new-style imports --- MachineSettingsAction.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index cdfcbf2071..cc42bf0819 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -1,26 +1,24 @@ +from PyQt5.QtCore import pyqtSlot + from cura.MachineAction import MachineAction import cura.Settings.CuraContainerRegistry -from UM.i18n import i18nCatalog -from UM.Application import Application - +import UM.Application import UM.Settings.InstanceContainer import UM.Settings.DefinitionContainer -from PyQt5.QtCore import pyqtSlot, QObject +import UM.i18n +catalog = UM.i18n.i18nCatalog("cura") - -catalog = i18nCatalog("cura") - -class MachineSettingsAction(MachineAction, QObject): +class MachineSettingsAction(MachineAction): def __init__(self, parent = None): - MachineAction.__init__(self, "MachineSettingsAction", catalog.i18nc("@action", "Machine Settings")) + super().__init__("MachineSettingsAction", catalog.i18nc("@action", "Machine Settings")) self._qml_url = "MachineSettingsAction.qml" cura.Settings.CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerAdded) def _reset(self): - global_container_stack = Application.getInstance().getGlobalContainerStack() + global_container_stack = UM.Application.getInstance().getGlobalContainerStack() if global_container_stack: variant = global_container_stack.findContainer({"type": "variant"}) if variant and variant.getId() == "empty_variant": @@ -28,6 +26,7 @@ class MachineSettingsAction(MachineAction, QObject): self._createVariant(global_container_stack, variant_index) def _createVariant(self, global_container_stack, variant_index): + # Create and switch to a variant to store the settings in new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_machinesettings") new_variant.addMetaDataEntry("type", "variant") new_variant.addMetaDataEntry("purpose", "machinesettings") @@ -35,14 +34,13 @@ class MachineSettingsAction(MachineAction, QObject): UM.Settings.ContainerRegistry.getInstance().addContainer(new_variant) global_container_stack.replaceContainer(variant_index, new_variant) - def _onContainerAdded(self, container): # Add this action as a supported action to all machine definitions if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine": - Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) + UM.Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) @pyqtSlot() def forceUpdate(self): # Force rebuilding the build volume by reloading the global container stack. # This is a bit of a hack, but it seems quick enough. - Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file + UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file From 2d77fefdb0f581f68c8ab4d8577e527e351546d4 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 14 Jul 2016 08:50:54 +0200 Subject: [PATCH 05/20] Remove action for multiextruder printers and printers that use variants (for now) --- MachineSettingsAction.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index cc42bf0819..626ae8c75b 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -37,6 +37,13 @@ class MachineSettingsAction(MachineAction): def _onContainerAdded(self, container): # Add this action as a supported action to all machine definitions if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine": + if container.getProperty("machine_extruder_count", "value") > 1: + # Multiextruder printers are not currently supported + return + if container.getMetaDataEntry("has_variants", False): + # Machines that use variants are not currently supported + return + UM.Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) @pyqtSlot() From 0f3b8a4aa4e95a1e740724d47290932f0e6e993d Mon Sep 17 00:00:00 2001 From: Aldo Hoeben Date: Thu, 14 Jul 2016 10:33:59 +0200 Subject: [PATCH 06/20] Add a note about adding the action to the first_start_actions of a generic machine definition --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c521e9c83..39f08a2be9 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,25 @@ Installation How to use ---- -After adding a machine, go to "Manage Printers...", make sure your printer is active and select "Machine Settings" \ No newline at end of file +After adding a machine, go to "Manage Printers...", make sure your printer is active and select "Machine Settings" + +Pro-tip: if you add a generic profile to the machine definitions and add ["MachineSettingsAction"] as a first_start_action, you get a nice solution to the "my printer is not listed" problem. + +*resource/definitions/generic_fdm.def.json* +``` +{ + "version": 2, + "name": "Generic FDM printer", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Generic", + "category": "Generic", + "file_formats": "text/x-gcode", + "has_materials": true, + "preferred_material": "*pla*", + "first_start_actions": ["MachineSettingsAction"] + } +} +``` From c7df0863872a3a5d70de6d6b6621a125be91c996 Mon Sep 17 00:00:00 2001 From: Aldo Hoeben Date: Thu, 14 Jul 2016 10:34:29 +0200 Subject: [PATCH 07/20] Update README.md Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39f08a2be9..3150c598f6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ After adding a machine, go to "Manage Printers...", make sure your printer is ac Pro-tip: if you add a generic profile to the machine definitions and add ["MachineSettingsAction"] as a first_start_action, you get a nice solution to the "my printer is not listed" problem. -*resource/definitions/generic_fdm.def.json* +*resources/definitions/generic_fdm.def.json* ``` { "version": 2, From 5868a8bed3cc2bdae63c0fa26e0dbe9b80512579 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 1 Aug 2016 16:58:21 +0200 Subject: [PATCH 08/20] Change variant generation to be in line with how UMOSelectUpgrades handles it --- MachineSettingsAction.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index 626ae8c75b..a954d9f3db 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -27,9 +27,8 @@ class MachineSettingsAction(MachineAction): def _createVariant(self, global_container_stack, variant_index): # Create and switch to a variant to store the settings in - new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_machinesettings") + new_variant = UM.Settings.InstanceContainer(global_container_stack.getName() + "_variant") new_variant.addMetaDataEntry("type", "variant") - new_variant.addMetaDataEntry("purpose", "machinesettings") new_variant.setDefinition(global_container_stack.getBottom()) UM.Settings.ContainerRegistry.getInstance().addContainer(new_variant) global_container_stack.replaceContainer(variant_index, new_variant) From 9a0e78ff4699ff19200a2eff5dfda0b6706a19ae Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 2 Aug 2016 09:53:30 +0200 Subject: [PATCH 09/20] Add (placeholder) head polygon controls and tweak layout --- MachineSettingsAction.qml | 337 ++++++++++++++++++++++++++------------ 1 file changed, 230 insertions(+), 107 deletions(-) diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index df287e82d5..a39c751d91 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -40,115 +40,223 @@ Cura.MachineAction Column { - id: pageCheckboxes - height: childrenRect.height - anchors.left: parent.left - anchors.top: pageDescription.bottom - anchors.topMargin: UM.Theme.getSize("default_margin").height + height: parent.height - y width: parent.width - UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").height - Grid + anchors.left: parent.left + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + + Row { - columns: 3 - columnSpacing: UM.Theme.getSize("default_margin").width + width: parent.width + spacing: UM.Theme.getSize("default_margin").height - Label + Column { - text: catalog.i18nc("@label","X (Width)") - } - TextField - { - id: buildAreaWidthField - text: machineWidthProvider.properties.value - validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { machineWidthProvider.setPropertyValue("value", text); manager.forceUpdate() } - } - Label - { - text: catalog.i18nc("@label","mm") + width: parent.width / 2 + spacing: UM.Theme.getSize("default_margin").height + + Label + { + text: catalog.i18nc("@label", "Printer Settings") + font.bold: true + } + + Grid + { + columns: 3 + columnSpacing: UM.Theme.getSize("default_margin").width + + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: buildAreaWidthField + text: machineWidthProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineWidthProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","Y (Depth)") + } + TextField + { + id: buildAreaDepthField + text: machineDepthProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineDepthProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","Z (Height)") + } + TextField + { + id: buildAreaHeightField + text: machineHeightProvider.properties.value + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { machineHeightProvider.setPropertyValue("value", text); manager.forceUpdate() } + } + Label + { + text: catalog.i18nc("@label","mm") + } + } + + Column + { + CheckBox + { + id: heatedBedCheckBox + text: catalog.i18nc("@option:check","Heated Bed") + checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false' + onClicked: machineHeatedBedProvider.setPropertyValue("value", checked) + } + CheckBox + { + id: centerIsZeroCheckBox + text: catalog.i18nc("@option:check","Machine Center is Zero") + checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false' + onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked) + } + } } - Label + Column { - text: catalog.i18nc("@label","Y (Depth)") - } - TextField - { - id: buildAreaDepthField - text: machineDepthProvider.properties.value - validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { machineDepthProvider.setPropertyValue("value", text); manager.forceUpdate() } - } - Label - { - text: catalog.i18nc("@label","mm") - } + width: parent.width / 2 + spacing: UM.Theme.getSize("default_margin").height - Label - { - text: catalog.i18nc("@label","Z (Height)") - } - TextField - { - id: buildAreaHeightField - text: machineHeightProvider.properties.value - validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { machineHeightProvider.setPropertyValue("value", text); manager.forceUpdate() } - } - Label - { - text: catalog.i18nc("@label","mm") - } + Label + { + text: catalog.i18nc("@label", "Printhead Settings") + font.bold: true + } - Item - { - width: UM.Theme.getSize("default_margin").width - height: UM.Theme.getSize("default_margin").height - } - Item - { - width: UM.Theme.getSize("default_margin").width - height: UM.Theme.getSize("default_margin").height - } - Item - { - width: UM.Theme.getSize("default_margin").width - height: UM.Theme.getSize("default_margin").height - } + Grid + { + columns: 3 + columnSpacing: UM.Theme.getSize("default_margin").width - Label - { - text: catalog.i18nc("@label","Nozzle size") - } - TextField - { - id: nozzleSizeField - text: machineNozzleSizeProvider.properties.value - validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } - onEditingFinished: { machineNozzleSizeProvider.setPropertyValue("value", text) } - } - Label - { - text: catalog.i18nc("@label","mm") - } - } + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: printheadXMinField + text: "" + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { } + } + Label + { + text: catalog.i18nc("@label","mm") + } - Column - { - CheckBox - { - id: heatedBedCheckBox - text: catalog.i18nc("@option:check","Heated Bed") - checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false' - onClicked: machineHeatedBedProvider.setPropertyValue("value", checked) - } - CheckBox - { - id: centerIsZeroCheckBox - text: catalog.i18nc("@option:check","Machine Center is Zero") - checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false' - onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked) + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: printheadYMinField + text: "" + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: printheadXMaxField + text: "" + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Label + { + text: catalog.i18nc("@label","X (Width)") + } + TextField + { + id: printheadYMaxField + text: "" + validator: RegExpValidator { regExp: /[0-9]{0,6}/ } + onEditingFinished: { } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + + Label + { + text: catalog.i18nc("@label","Gantry height") + } + TextField + { + id: gantryHeightField + text: gantryHeightProvider.properties.value + validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } + onEditingFinished: { gantryHeightProvider.setPropertyValue("value", text) } + } + Label + { + text: catalog.i18nc("@label","mm") + } + + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } + + Label + { + text: catalog.i18nc("@label","Nozzle size") + } + TextField + { + id: nozzleSizeField + text: machineNozzleSizeProvider.properties.value + validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } + onEditingFinished: { machineNozzleSizeProvider.setPropertyValue("value", text) } + } + Label + { + text: catalog.i18nc("@label","mm") + } + } } } @@ -157,8 +265,10 @@ Cura.MachineAction spacing: UM.Theme.getSize("default_margin").width anchors.left: parent.left anchors.right: parent.right + height: parent.height - y Column { + height: parent.height width: parent.width / 2 Label { @@ -168,6 +278,7 @@ Cura.MachineAction { id: machineStartGcodeField width: parent.width + height: parent.height - y text: machineStartGcodeProvider.properties.value onActiveFocusChanged: { @@ -178,7 +289,8 @@ Cura.MachineAction } } } - Column{ + Column { + height: parent.height width: parent.width / 2 Label { @@ -188,6 +300,7 @@ Cura.MachineAction { id: machineEndGcodeField width: parent.width + height: parent.height - y text: machineEndGcodeProvider.properties.value onActiveFocusChanged: { @@ -232,16 +345,6 @@ Cura.MachineAction storeIndex: 3 } - UM.SettingPropertyProvider - { - id: machineNozzleSizeProvider - - containerStackId: Cura.MachineManager.activeMachineId - key: "machine_nozzle_size" - watchedProperties: [ "value" ] - storeIndex: 3 - } - UM.SettingPropertyProvider { id: machineHeatedBedProvider @@ -262,6 +365,26 @@ Cura.MachineAction storeIndex: 3 } + UM.SettingPropertyProvider + { + id: machineNozzleSizeProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_nozzle_size" + watchedProperties: [ "value" ] + storeIndex: 3 + } + + UM.SettingPropertyProvider + { + id: gantryHeightProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "gantry_height" + watchedProperties: [ "value" ] + storeIndex: 3 + } + UM.SettingPropertyProvider { From 6a8aa15678521a38d944ab4a49d0494fafa23d8d Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 3 Aug 2016 18:50:07 +0200 Subject: [PATCH 10/20] Allow editing head polygon --- MachineSettingsAction.qml | 59 +++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index a39c751d91..8f12cc0d65 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -155,14 +155,14 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X (Width)") + text: catalog.i18nc("@label","X min") } TextField { id: printheadXMinField - text: "" + text: getHeadPolygonCoord("x", "min") validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { } + onEditingFinished: setHeadPolygon() } Label { @@ -171,14 +171,14 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X (Width)") + text: catalog.i18nc("@label","Y min") } TextField { id: printheadYMinField - text: "" + text: getHeadPolygonCoord("y", "min") validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { } + onEditingFinished: setHeadPolygon() } Label { @@ -187,14 +187,14 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X (Width)") + text: catalog.i18nc("@label","X max") } TextField { id: printheadXMaxField - text: "" + text: getHeadPolygonCoord("x", "max") validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { } + onEditingFinished: setHeadPolygon() } Label { @@ -203,14 +203,14 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X (Width)") + text: catalog.i18nc("@label","Y max") } TextField { id: printheadYMaxField - text: "" + text: getHeadPolygonCoord("y", "max") validator: RegExpValidator { regExp: /[0-9]{0,6}/ } - onEditingFinished: { } + onEditingFinished: setHeadPolygon() } Label { @@ -315,6 +315,31 @@ Cura.MachineAction } } + function getHeadPolygonCoord(axis, minMax) + { + var polygon = JSON.parse(machineHeadPolygonProvider.properties.value); + var item = (axis == "x") ? 0 : 1 + var result = polygon[0][item]; + for(var i = 1; i < polygon.length; i++) { + if (minMax == "min") { + result = Math.min(result, polygon[i][item]); + } else { + result = Math.max(result, polygon[i][item]); + } + } + return Math.abs(result); + } + + function setHeadPolygon() + { + var polygon = []; + polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]); + polygon.push([-parseFloat(printheadXMinField.text), parseFloat(printheadYMaxField.text)]); + polygon.push([ parseFloat(printheadXMaxField.text), parseFloat(printheadYMaxField.text)]); + polygon.push([ parseFloat(printheadXMaxField.text),-parseFloat(printheadYMinField.text)]); + machineHeadPolygonProvider.setPropertyValue("value", JSON.stringify(polygon)); + } + UM.SettingPropertyProvider { id: machineWidthProvider @@ -385,6 +410,16 @@ Cura.MachineAction storeIndex: 3 } + UM.SettingPropertyProvider + { + id: machineHeadPolygonProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_head_with_fans_polygon" + watchedProperties: [ "value" ] + storeIndex: 3 + } + UM.SettingPropertyProvider { From 6f9a8ea6916f4802ed4ab3d2756acdd17f267ad9 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 3 Aug 2016 20:50:47 +0200 Subject: [PATCH 11/20] Add GCode Flavor switch --- MachineSettingsAction.qml | 71 +++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 22 deletions(-) diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index 8f12cc0d65..4a8f85f57f 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -71,7 +71,7 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X (Width)") + text: catalog.i18nc("@label", "X (Width)") } TextField { @@ -82,12 +82,12 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Label { - text: catalog.i18nc("@label","Y (Depth)") + text: catalog.i18nc("@label", "Y (Depth)") } TextField { @@ -98,12 +98,12 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Label { - text: catalog.i18nc("@label","Z (Height)") + text: catalog.i18nc("@label", "Z (Height)") } TextField { @@ -114,7 +114,7 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } } @@ -123,18 +123,35 @@ Cura.MachineAction CheckBox { id: heatedBedCheckBox - text: catalog.i18nc("@option:check","Heated Bed") + text: catalog.i18nc("@option:check", "Heated Bed") checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false' onClicked: machineHeatedBedProvider.setPropertyValue("value", checked) } CheckBox { id: centerIsZeroCheckBox - text: catalog.i18nc("@option:check","Machine Center is Zero") + text: catalog.i18nc("@option:check", "Machine Center is Zero") checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false' onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked) } } + + Row + { + spacing: UM.Theme.getSize("default_margin").width + + Label + { + text: catalog.i18nc("@label", "GCode Flavor") + } + + ComboBox + { + model: ["RepRap (Marlin/Sprinter)", "UltiGCode"] + currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1 + onActivated: machineGCodeFlavorProvider.setPropertyValue("value", model[index]) + } + } } Column @@ -155,7 +172,7 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","X min") + text: catalog.i18nc("@label", "X min") } TextField { @@ -166,12 +183,12 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Label { - text: catalog.i18nc("@label","Y min") + text: catalog.i18nc("@label", "Y min") } TextField { @@ -182,12 +199,12 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Label { - text: catalog.i18nc("@label","X max") + text: catalog.i18nc("@label", "X max") } TextField { @@ -198,12 +215,12 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Label { - text: catalog.i18nc("@label","Y max") + text: catalog.i18nc("@label", "Y max") } TextField { @@ -214,7 +231,7 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } @@ -223,7 +240,7 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","Gantry height") + text: catalog.i18nc("@label", "Gantry height") } TextField { @@ -234,7 +251,7 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } @@ -243,7 +260,7 @@ Cura.MachineAction Label { - text: catalog.i18nc("@label","Nozzle size") + text: catalog.i18nc("@label", "Nozzle size") } TextField { @@ -254,7 +271,7 @@ Cura.MachineAction } Label { - text: catalog.i18nc("@label","mm") + text: catalog.i18nc("@label", "mm") } } } @@ -272,7 +289,7 @@ Cura.MachineAction width: parent.width / 2 Label { - text: catalog.i18nc("@label","Start Gcode") + text: catalog.i18nc("@label", "Start Gcode") } TextArea { @@ -294,7 +311,7 @@ Cura.MachineAction width: parent.width / 2 Label { - text: catalog.i18nc("@label","End Gcode") + text: catalog.i18nc("@label", "End Gcode") } TextArea { @@ -390,6 +407,16 @@ Cura.MachineAction storeIndex: 3 } + UM.SettingPropertyProvider + { + id: machineGCodeFlavorProvider + + containerStackId: Cura.MachineManager.activeMachineId + key: "machine_gcode_flavor" + watchedProperties: [ "value" ] + storeIndex: 3 + } + UM.SettingPropertyProvider { id: machineNozzleSizeProvider From 5fd476a2f73fabc403142146cf85f88572120094 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 8 Aug 2016 18:06:39 +0200 Subject: [PATCH 12/20] Update the has_materials metadata entry when changing gcode flavor --- MachineSettingsAction.py | 24 +++++++++++++++++++++++- MachineSettingsAction.qml | 6 +++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index a954d9f3db..130ce642c9 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -49,4 +49,26 @@ class MachineSettingsAction(MachineAction): def forceUpdate(self): # Force rebuilding the build volume by reloading the global container stack. # This is a bit of a hack, but it seems quick enough. - UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file + UM.Application.getInstance().globalContainerStackChanged.emit() + + @pyqtSlot() + def updateHasMaterialsMetadata(self): + # Updates the has_materials metadata flag after switching gcode flavor + global_container_stack = UM.Application.getInstance().getGlobalContainerStack() + if global_container_stack: + definition = global_container_stack.getBottom() + if definition.getProperty("machine_gcode_flavor", "value") == "UltiGCode" and not definition.getMetaDataEntry("has_materials", False): + has_materials = global_container_stack.getProperty("machine_gcode_flavor", "value") != "UltiGCode" + + # NB: this metadata entry is stored in an ini, and ini files are parsed as strings only. + # because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. + if has_materials: + if "has_materials" in global_container_stack.getMetaData(): + global_container_stack.setMetaDataEntry("has_materials", True) + else: + global_container_stack.addMetaDataEntry("has_materials", True) + else: + if "has_materials" in global_container_stack.getMetaData(): + global_container_stack.removeMetaDataEntry("has_materials") + + UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file diff --git a/MachineSettingsAction.qml b/MachineSettingsAction.qml index 4a8f85f57f..de831870a0 100644 --- a/MachineSettingsAction.qml +++ b/MachineSettingsAction.qml @@ -149,7 +149,11 @@ Cura.MachineAction { model: ["RepRap (Marlin/Sprinter)", "UltiGCode"] currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1 - onActivated: machineGCodeFlavorProvider.setPropertyValue("value", model[index]) + onActivated: + { + machineGCodeFlavorProvider.setPropertyValue("value", model[index]); + manager.updateHasMaterialsMetadata(); + } } } } From 7471b00eff6537266bfebba2a217e53fd141728b Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 8 Aug 2016 18:16:22 +0200 Subject: [PATCH 13/20] Set the material container to a sane default --- MachineSettingsAction.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/MachineSettingsAction.py b/MachineSettingsAction.py index 130ce642c9..68dbbb9b62 100644 --- a/MachineSettingsAction.py +++ b/MachineSettingsAction.py @@ -60,15 +60,28 @@ class MachineSettingsAction(MachineAction): if definition.getProperty("machine_gcode_flavor", "value") == "UltiGCode" and not definition.getMetaDataEntry("has_materials", False): has_materials = global_container_stack.getProperty("machine_gcode_flavor", "value") != "UltiGCode" - # NB: this metadata entry is stored in an ini, and ini files are parsed as strings only. - # because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. + material_container = global_container_stack.findContainer({"type": "material"}) + material_index = global_container_stack.getContainerIndex(material_container) + if has_materials: if "has_materials" in global_container_stack.getMetaData(): global_container_stack.setMetaDataEntry("has_materials", True) else: global_container_stack.addMetaDataEntry("has_materials", True) + + # Set the material container to a sane default + if material_container.getId() == "empty_material": + search_criteria = { "type": "material", "definition": "fdmprinter", "id": "*pla*" } + containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**search_criteria) + if containers: + global_container_stack.replaceContainer(material_index, containers[0]) else: + # The metadata entry is stored in an ini, and ini files are parsed as strings only. + # Because any non-empty string evaluates to a boolean True, we have to remove the entry to make it False. if "has_materials" in global_container_stack.getMetaData(): global_container_stack.removeMetaDataEntry("has_materials") + empty_material = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = "empty_material")[0] + global_container_stack.replaceContainer(material_index, empty_material) + UM.Application.getInstance().globalContainerStackChanged.emit() \ No newline at end of file From 9e7e469df8ba78c7126f530701342a1dd5a7de63 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 15 Aug 2016 16:06:34 +0200 Subject: [PATCH 14/20] Move plugin files into main repo location --- .gitignore | 62 -- CMakeLists.txt | 11 - LICENSE | 661 ------------------ README.md | 32 - .../MachineSettingsAction.py | 0 .../MachineSettingsAction.qml | 0 .../MachineSettingsAction/__init__.py | 0 7 files changed, 766 deletions(-) delete mode 100644 .gitignore delete mode 100644 CMakeLists.txt delete mode 100644 LICENSE delete mode 100644 README.md rename MachineSettingsAction.py => plugins/MachineSettingsAction/MachineSettingsAction.py (100%) rename MachineSettingsAction.qml => plugins/MachineSettingsAction/MachineSettingsAction.qml (100%) rename __init__.py => plugins/MachineSettingsAction/__init__.py (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1dbc687de0..0000000000 --- a/.gitignore +++ /dev/null @@ -1,62 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*,cover -.hypothesis/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -#Ipython Notebook -.ipynb_checkpoints diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index dc7ede005e..0000000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -project(MachineSettingsAction) -cmake_minimum_required(VERSION 2.8.12) - -install(FILES - __init__.py - MachineSettingsAction.py - MachineSettingsAction.qml - LICENSE - README.md - DESTINATION lib/cura/plugins/MachineSettingsAction -) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index dbbe355815..0000000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 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 Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/README.md b/README.md deleted file mode 100644 index 3150c598f6..0000000000 --- a/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# MachineSettingsAction -Cura plugin which provides a way to modify printer settings (build volume, nozzle size, start/end gcode) from within Cura. - -Installation ----- -- Make sure your Cura version is 2.2 or newer -- Download or clone the repository into [Cura installation folder]/plugins/MachineSettingsAction - -How to use ----- -After adding a machine, go to "Manage Printers...", make sure your printer is active and select "Machine Settings" - -Pro-tip: if you add a generic profile to the machine definitions and add ["MachineSettingsAction"] as a first_start_action, you get a nice solution to the "my printer is not listed" problem. - -*resources/definitions/generic_fdm.def.json* -``` -{ - "version": 2, - "name": "Generic FDM printer", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ultimaker", - "manufacturer": "Generic", - "category": "Generic", - "file_formats": "text/x-gcode", - "has_materials": true, - "preferred_material": "*pla*", - "first_start_actions": ["MachineSettingsAction"] - } -} -``` diff --git a/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py similarity index 100% rename from MachineSettingsAction.py rename to plugins/MachineSettingsAction/MachineSettingsAction.py diff --git a/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml similarity index 100% rename from MachineSettingsAction.qml rename to plugins/MachineSettingsAction/MachineSettingsAction.qml diff --git a/__init__.py b/plugins/MachineSettingsAction/__init__.py similarity index 100% rename from __init__.py rename to plugins/MachineSettingsAction/__init__.py From 6220976f03f52290236afebdeb809815f241b7a3 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 15 Aug 2016 16:15:31 +0200 Subject: [PATCH 15/20] Add a custom machine definition CURA-580 --- resources/definitions/custom.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/definitions/custom.def.json diff --git a/resources/definitions/custom.def.json b/resources/definitions/custom.def.json new file mode 100644 index 0000000000..0ccd2d9890 --- /dev/null +++ b/resources/definitions/custom.def.json @@ -0,0 +1,16 @@ +{ + "id": "custom", + "version": 2, + "name": "Custom FDM printer", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Custom", + "category": "Custom", + "file_formats": "text/x-gcode", + "has_materials": true, + "preferred_material": "*pla*", + "first_start_actions": ["MachineSettingsAction"] + } +} From 9b048efe22c10cdad579bba7ba535206e56f4253 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 16 Aug 2016 18:19:25 +0200 Subject: [PATCH 16/20] Fixed copyrights --- plugins/MachineSettingsAction/MachineSettingsAction.py | 3 +++ plugins/MachineSettingsAction/__init__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index 68dbbb9b62..92a66d911d 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -1,3 +1,6 @@ +# Copyright (c) 2016 Ultimaker B.V. +# Cura is released under the terms of the AGPLv3 or higher. + from PyQt5.QtCore import pyqtSlot from cura.MachineAction import MachineAction diff --git a/plugins/MachineSettingsAction/__init__.py b/plugins/MachineSettingsAction/__init__.py index d97c44bad9..7d8b253d33 100644 --- a/plugins/MachineSettingsAction/__init__.py +++ b/plugins/MachineSettingsAction/__init__.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Aldo Hoeben / fieldOfView +# Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. from . import MachineSettingsAction From 50cef30346f01bb3c9882cff922834251b22e9c7 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 16 Aug 2016 18:46:32 +0200 Subject: [PATCH 17/20] Don't increase BuildVolume above machine_height for one_at_a_time --- cura/BuildVolume.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index a74a405044..58aa57c10e 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -240,9 +240,11 @@ class BuildVolume(SceneNode): self._active_container_stack.propertyChanged.connect(self._onSettingPropertyChanged) self._width = self._active_container_stack.getProperty("machine_width", "value") + machine_height = self._active_container_stack.getProperty("machine_height", "value") if self._active_container_stack.getProperty("print_sequence", "value") == "one_at_a_time": - self._height = self._active_container_stack.getProperty("gantry_height", "value") - self._buildVolumeMessage() + self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height) + if(self._height < machine_height): + self._buildVolumeMessage() else: self._height = self._active_container_stack.getProperty("machine_height", "value") self._depth = self._active_container_stack.getProperty("machine_depth", "value") @@ -258,9 +260,11 @@ class BuildVolume(SceneNode): rebuild_me = False if setting_key == "print_sequence": + machine_height = self._active_container_stack.getProperty("machine_height", "value") if Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time": - self._height = self._active_container_stack.getProperty("gantry_height", "value") - self._buildVolumeMessage() + self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height) + if(self._height < machine_height): + self._buildVolumeMessage() else: self._height = self._active_container_stack.getProperty("machine_height", "value") rebuild_me = True From 42549df1f16c828d27ddc0408b7518df31eaaccc Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 16 Aug 2016 21:02:30 +0200 Subject: [PATCH 18/20] Fix setting the printhead polygon --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index de831870a0..fd7bb58e97 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -354,11 +354,12 @@ Cura.MachineAction function setHeadPolygon() { var polygon = []; - polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]); polygon.push([-parseFloat(printheadXMinField.text), parseFloat(printheadYMaxField.text)]); + polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]); polygon.push([ parseFloat(printheadXMaxField.text), parseFloat(printheadYMaxField.text)]); polygon.push([ parseFloat(printheadXMaxField.text),-parseFloat(printheadYMinField.text)]); machineHeadPolygonProvider.setPropertyValue("value", JSON.stringify(polygon)); + manager.forceUpdate(); } UM.SettingPropertyProvider From 8b0587e75a2673817bc10230a9d8150529c9bd3b Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 16 Aug 2016 21:10:58 +0200 Subject: [PATCH 19/20] Add logging with reason why printers don't have MachineSettings action --- plugins/MachineSettingsAction/MachineSettingsAction.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index 92a66d911d..a37aa9c5cb 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -9,6 +9,7 @@ import cura.Settings.CuraContainerRegistry import UM.Application import UM.Settings.InstanceContainer import UM.Settings.DefinitionContainer +import UM.Logger import UM.i18n catalog = UM.i18n.i18nCatalog("cura") @@ -41,9 +42,11 @@ class MachineSettingsAction(MachineAction): if isinstance(container, UM.Settings.DefinitionContainer) and container.getMetaDataEntry("type") == "machine": if container.getProperty("machine_extruder_count", "value") > 1: # Multiextruder printers are not currently supported + UM.Logger.log("d", "Not attaching MachineSettingsAction to %s; Multi-extrusion printers are not supported", container.getId()) return if container.getMetaDataEntry("has_variants", False): # Machines that use variants are not currently supported + UM.Logger.log("d", "Not attaching MachineSettingsAction to %s; Machines that use variants are not supported", container.getId()) return UM.Application.getInstance().getMachineActionManager().addSupportedAction(container.getId(), self.getKey()) From 7528b2d97026057deb3d9fbeea9fb25add3b33c3 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 17 Aug 2016 10:04:09 +0200 Subject: [PATCH 20/20] code style --- cura/BuildVolume.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index b3294dc137..86c9933573 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -243,7 +243,7 @@ class BuildVolume(SceneNode): machine_height = self._active_container_stack.getProperty("machine_height", "value") if self._active_container_stack.getProperty("print_sequence", "value") == "one_at_a_time": self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height) - if(self._height < machine_height): + if self._height < machine_height: self._buildVolumeMessage() else: self._height = self._active_container_stack.getProperty("machine_height", "value") @@ -263,7 +263,7 @@ class BuildVolume(SceneNode): machine_height = self._active_container_stack.getProperty("machine_height", "value") if Application.getInstance().getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time": self._height = min(self._active_container_stack.getProperty("gantry_height", "value"), machine_height) - if(self._height < machine_height): + if self._height < machine_height: self._buildVolumeMessage() else: self._height = self._active_container_stack.getProperty("machine_height", "value")