diff --git a/Gruntfile.js b/Gruntfile.js index ea14fac..5deef80 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -49,7 +49,7 @@ module.exports = function(grunt) { beautify: false, compress: {}, // report: 'min', - preserveComments: 'false' + preserveComments: 'some' }, js: { files: { diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/Makefile b/Makefile index f4ed59f..10f9761 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME := doodle3d-client -PKG_VERSION := 0.9.2 +PKG_VERSION := 0.9.3 PKG_RELEASE := 1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..885d7d2 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,9 @@ +Doodle3D uses the following external projects: + +Garden font - Copyright (c) 2012 So-ghislaine - "Garden is a free font for commercial and personal use." +jQuery - Copyright (c) 2005, 2012 jQuery Foundation, Inc. and other contributors - MIT License +jQuery-cookie - Copyright (c) 2011, Klaus Hartl - MIT or GPLv2 +jQuery-coolfieldset - Copyright (c) 2010 Lucky - GPL +jQuery-joyride - Copyright (c) 2013, ZURB - MIT +FileSaver - Copyright (c) 2013 Ely Grey - X11/MIT + diff --git a/js_src/Help.js b/js_src/Help.js index a8d1717..2731482 100644 --- a/js_src/Help.js +++ b/js_src/Help.js @@ -1,3 +1,10 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ var grandTour; function GrandTour(_name) { @@ -56,12 +63,14 @@ function GrandTour(_name) { $(this).joyride('set_li', false); } } - + + // Overrule printer to tour mode, pausing status updates + printer.overruleState(Printer.TOUR_STATE); + // bring up thermometer and progressbar to explain them thermometer.show(); progressbar.show(); message.hide(); - }; this.preStepCallback = function(index, tip) { // console.log("GrandTour >> f:preStepCallback() >> index: " + index); @@ -361,9 +370,7 @@ function HelpTours() { self.currActiveTour = undefined; self.tourActive = false; - thermometer.hide(); - progressbar.hide(); message.hide(); printer.checkStatus(); } -} \ No newline at end of file +} diff --git a/js_src/Keyboard.js b/js_src/Keyboard.js index cef211c..fc11aed 100644 --- a/js_src/Keyboard.js +++ b/js_src/Keyboard.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var keyboardShortcutsEnabled = true; function initKeyboard() { @@ -31,4 +39,4 @@ function initKeyboard() { } }) -} \ No newline at end of file +} diff --git a/js_src/Message.js b/js_src/Message.js index 54c347e..cf061db 100644 --- a/js_src/Message.js +++ b/js_src/Message.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function Message() { Message.ERROR = "error"; @@ -14,29 +22,29 @@ function Message() { var autohideTimeout; this.init = function($element) { - console.log("Message:init"); - this.$element = $element; - console.log("$element: ",$element); } - - this.set = function(text,mode,autoHide) { - console.log("Message:set: ",text,mode,autoHide); - self.hide(function() { - self.show(); - self.clear(); - - self.$element.text(text); - self.$element.addClass(mode); - self.show(); - - self.mode = mode; - - clearTimeout(autohideTimeout); - if(autoHide) { - autohideTimeout = setTimeout(function(){ self.hide()},autoHideDelay); - } - }); + this.set = function(text,mode,autoHide,disableEffect) { + console.log("Message:set: ",text,mode,autoHide,disableEffect); + if(disableEffect) { + self.fill(text,mode,autoHide) + } else{ + self.hide(function() { + self.show(); + self.fill(text,mode,autoHide) + }); + } + } + this.fill = function(text,mode,autoHide) { + //console.log("Message:fill: ",text,mode,autoHide); + self.clear(); + self.$element.text(text); + self.$element.addClass(mode); + self.mode = mode; + clearTimeout(autohideTimeout); + if(autoHide) { + autohideTimeout = setTimeout(function(){ self.hide()},autoHideDelay); + } } this.clear = function($element) { this.$element.text(""); @@ -49,4 +57,4 @@ function Message() { this.hide = function(complete) { this.$element.fadeOut(200,complete); } -} \ No newline at end of file +} diff --git a/js_src/Printer.js b/js_src/Printer.js index dcae80c..75e8362 100644 --- a/js_src/Printer.js +++ b/js_src/Printer.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + /* not using this now var $printProgressContainer = $("#printProgressContainer"); var $progressbar = $("#progressbar"); @@ -19,6 +27,7 @@ function Printer() { Printer.BUFFERING_STATE = "buffering"; // printer is buffering (recieving) data, but not yet printing Printer.PRINTING_STATE = "printing"; Printer.STOPPING_STATE = "stopping"; // when you stop (abort) a print it prints the endcode + Printer.TOUR_STATE = "tour"; // when in joyride mode Printer.ON_BEFORE_UNLOAD_MESSAGE = "You're doodle is still being send to the printer, leaving will result in a incomplete 3D print"; @@ -86,7 +95,7 @@ function Printer() { timeout: this.timeoutTime, success: function(data){ console.log("Printer:preheat response: ",data); - if(data.status == "error") { + if(data.status != "success") { clearTimeout(self.retryPreheatDelay); self.retryPreheatDelay = setTimeout(function() { self.preheat() },self.retryDelay); // retry after delay } @@ -143,6 +152,10 @@ function Printer() { this.sendPrintPart = function(sendIndex,sendLength) { console.log("Printer:sendPrintPart sendIndex: " + sendIndex + "/" + this.gcode.length + ", sendLength: " + sendLength); + + var sendPercentage = Math.round(sendIndex/this.gcode.length*100); + message.set("Sending doodle to printer: "+sendPercentage+"%",Message.NOTICE,false,true); + var firstOne = (sendIndex == 0)? true : false; var start = firstOne; // start printing right away diff --git a/js_src/PrinterPanel.js b/js_src/PrinterPanel.js index 00663cc..8c95ded 100644 --- a/js_src/PrinterPanel.js +++ b/js_src/PrinterPanel.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function PrinterPanel() { this.wifiboxURL; this.element; @@ -73,4 +81,4 @@ function PrinterPanel() { console.log("PrinterPanel:loadPrinterSettings: failed"); }); } -} \ No newline at end of file +} diff --git a/js_src/Progressbar.js b/js_src/Progressbar.js index 0a91a3e..12a03cb 100644 --- a/js_src/Progressbar.js +++ b/js_src/Progressbar.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function Progressbar() { this.currProgress = 0; // default val diff --git a/js_src/SettingsWindow.js b/js_src/SettingsWindow.js index f38c8b4..34f5ea8 100644 --- a/js_src/SettingsWindow.js +++ b/js_src/SettingsWindow.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + //these settings are defined in the firmware (conf_defaults.lua) and will be initialized in loadSettings() var settings = { } @@ -13,6 +21,7 @@ function SettingsWindow() { this.btnOK; this.form; this.timeoutTime = 3000; + this.saveSettingsTimeoutTime = 8000; this.retryDelay = 2000; // retry setTimout delay this.retryRetrieveNetworkStatusDelayTime = 1000;// retry setTimout delay @@ -229,11 +238,11 @@ function SettingsWindow() { settings = newSettings; // store new settings in global settings if (communicateWithWifibox) { $.ajax({ - url: this.wifiboxURL + "/config", + url: self.wifiboxCGIBinURL + "/config", type: "POST", data: newSettings, dataType: 'json', - timeout: this.timeoutTime, + timeout: self.saveSettingsTimeoutTime, success: function(response){ console.log("Settings:saveSettings response: ",response); if(response.status == "error") { @@ -271,7 +280,7 @@ function SettingsWindow() { if (communicateWithWifibox) { $.ajax({ - url: self.wifiboxURL + "/config/resetall", + url: self.wifiboxCGIBinURL + "/config/resetall", type: "POST", dataType: 'json', timeout: this.timeoutTime, @@ -313,7 +322,8 @@ function SettingsWindow() { var selects = self.form.find("select"); selects.each( function(index,element) { var element = $(element); - if(element.attr('name') != "network.client.network") { + var fieldName = element.attr('name'); + if(element.attr('name') != "") { settings[element.attr('name')] = element.val(); } }); @@ -321,14 +331,16 @@ function SettingsWindow() { var inputs = self.form.find("input"); inputs.each( function(index,element) { var element = $(element); - switch(element.attr("type")) { - case "text": - case "number": - settings[element.attr('name')] = element.val(); - break; - case "checkbox": - settings[element.attr('name')] = element.prop('checked') - break; + if(element.attr('name') != "") { + switch(element.attr("type")) { + case "text": + case "number": + settings[element.attr('name')] = element.val(); + break; + case "checkbox": + settings[element.attr('name')] = element.prop('checked') + break; + } } }); diff --git a/js_src/Shape.js b/js_src/Shape.js index 4d3ac17..5734a07 100644 --- a/js_src/Shape.js +++ b/js_src/Shape.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function drawCircle(x0,y0,r,res) { if (res==undefined) res = 50; //circle resolution beginShape(); @@ -31,4 +39,4 @@ function shapeLineTo(x,y) { function endShape() { renderToImageDataPreview(); -} \ No newline at end of file +} diff --git a/js_src/Svg.js b/js_src/Svg.js index 6451624..87e065b 100644 --- a/js_src/Svg.js +++ b/js_src/Svg.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + //SVG validator: http://validator.w3.org/ //SVG viewer: http://svg-edit.googlecode.com/svn/branches/2.6/editor/svg-editor.html function saveToSvg() { @@ -129,4 +137,4 @@ function loadFromSvg(svgData) { renderToImageDataPreview(); return true; -} \ No newline at end of file +} diff --git a/js_src/Thermometer.js b/js_src/Thermometer.js index fc7d63b..96ac983 100644 --- a/js_src/Thermometer.js +++ b/js_src/Thermometer.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + // TODO assess if this var is still necessary var $displayThermometer = $("#thermometerContainer"); diff --git a/js_src/UpdatePanel.js b/js_src/UpdatePanel.js index 54611ef..39a5978 100644 --- a/js_src/UpdatePanel.js +++ b/js_src/UpdatePanel.js @@ -1,10 +1,18 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function UpdatePanel() { this.wifiboxURL; this.element; this.statusCheckInterval = 1000; this.statusCheckDelayer; // setTimout instance - this.installedDelay = 60*1000; // Since we can't retrieve status during installation we show the installed text after a fixed delay + this.installedDelay = 90*1000; // Since we can't retrieve status during installation we show the installed text after a fixed delay this.installedDelayer; // setTimout instance this.retryDelay = 1000; this.retryDelayer; // setTimout instance @@ -37,15 +45,21 @@ function UpdatePanel() { this.wifiboxURL = wifiboxURL; this.element = updatePanelElement; + this.noRetainCheckbox = this.element.find("#noRetain"); this.btnUpdate = this.element.find("#update"); this.statusDisplay = this.element.find("#updateState"); this.infoDisplay = this.element.find("#updateInfo"); + this.noRetainCheckbox.change(this.noRetainChanged); this.btnUpdate.click(this.update); this.checkStatus(false); } - + this.noRetainChanged = function(e) { + console.log("UpdatePanel:noRetainChanged"); + + self.setState(self.state,true); + } this.update = function() { console.log("UpdatePanel:update"); self.downloadUpdate(); @@ -67,10 +81,15 @@ function UpdatePanel() { } this.installUpdate = function() { console.log("UpdatePanel:installUpdate"); + + var noRetain = self.noRetainCheckbox.prop('checked'); + self.stopCheckingStatus(); + postData = {no_retain:noRetain} $.ajax({ url: self.wifiboxURL + "/update/install", type: "POST", + data: postData, dataType: 'json', success: function(response){ console.log("UpdatePanel:installUpdate response: ",response); @@ -150,20 +169,27 @@ function UpdatePanel() { break; } } - this.setState = function(newState) { - if(this.state == newState) return; - console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (networkMode: ",self.networkMode,") (newestVersion: ",self.newestVersion,")"); + this.setState = function(newState,refresh) { + console.log("UpdatePanel:setState"); + if(!refresh && this.state == newState) return; + console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (networkMode: ",self.networkMode,") (newestVersion: ",self.newestVersion,") (refresh: ",refresh,")"); this.state = newState; + var noRetain = self.noRetainCheckbox.prop('checked'); + console.log(" noRetain", noRetain); + // download button // if there isn't newestVersion data something went wrong, - // probably accessing the internet + // probably accessing the internet + console.log(" self.newestVersion: ",self.newestVersion); if(self.newestVersion != undefined) { + console.log(" this.state: ",this.state); switch(this.state){ case UpdatePanel.NONE: case UpdatePanel.DOWNLOAD_FAILED: case UpdatePanel.INSTALL_FAILED: - if(self.canUpdate) { + console.log(" self.canUpdate: ",self.canUpdate); + if(self.canUpdate || noRetain) { self.btnUpdate.removeAttr("disabled"); } else { self.btnUpdate.attr("disabled", true); @@ -219,13 +245,15 @@ function UpdatePanel() { this.statusDisplay.html(text); } this.updateInfoDisplay = function() { - var text = "Current version: "+self.currentVersion+". "; + var html = 'Current version: ' + self.currentVersion + + ' (release notes). '; if(self.canUpdate) { - text += "Latest version: "+self.newestVersion+"."; + html += 'Latest version: ' + self.newestVersion + + ' (release notes).'; } - self.infoDisplay.text(text); + self.infoDisplay.html(html); } this.setNetworkMode = function(networkMode) { self.networkMode = networkMode; } -} \ No newline at end of file +} diff --git a/js_src/buttonbehaviors.js b/js_src/buttonbehaviors.js index f365206..cf901b6 100644 --- a/js_src/buttonbehaviors.js +++ b/js_src/buttonbehaviors.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var btnMoveUpInterval; var btnMoveDownInterval; diff --git a/js_src/canvasDrawing.js b/js_src/canvasDrawing.js index 582eee2..b9fa09c 100644 --- a/js_src/canvasDrawing.js +++ b/js_src/canvasDrawing.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + /* * * * * * * * * * * * VARS diff --git a/js_src/d3dServerInterfacing.js b/js_src/d3dServerInterfacing.js index 5bed3b0..51dda2f 100644 --- a/js_src/d3dServerInterfacing.js +++ b/js_src/d3dServerInterfacing.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + function setTemperature(callback) { if (callback != undefined) callback(); @@ -7,4 +15,4 @@ function setTemperature(callback) { if (callback != undefined) callback(); -} \ No newline at end of file +} diff --git a/js_src/gcodeGenerating.js b/js_src/gcodeGenerating.js index 321c217..b0684d2 100644 --- a/js_src/gcodeGenerating.js +++ b/js_src/gcodeGenerating.js @@ -1,3 +1,10 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ var MAX_POINTS_TO_PRINT = 200000 var gcode = []; @@ -200,6 +207,7 @@ function subsituteVariables(gcode) { var preheatTemperature = settings["printer.heatup.temperature"]; var preheatBedTemperature = settings["printer.heatup.bed.temperature"]; var printerType = settings["printer.type"]; + var heatedbed = settings["printer.heatedbed"]; switch (printerType) { case "makerbot_replicator2": printerType = "r2"; break; @@ -207,13 +215,15 @@ function subsituteVariables(gcode) { case "makerbot_thingomatic": printerType = "t6"; break; case "makerbot_generic": printerType = "r2"; break; } + var heatedBedReplacement = (heatedbed)? "" : ";"; gcode = gcode.replace(/{printingTemp}/gi ,temperature); gcode = gcode.replace(/{printingBedTemp}/gi ,bedTemperature); gcode = gcode.replace(/{preheatTemp}/gi ,preheatTemperature); gcode = gcode.replace(/{preheatBedTemp}/gi ,preheatBedTemperature); gcode = gcode.replace(/{printerType}/gi ,printerType); - + gcode = gcode.replace(/{if heatedBed}/gi ,heatedBedReplacement); + return gcode; } diff --git a/js_src/init_layout.js b/js_src/init_layout.js index 34be0e0..15a1475 100644 --- a/js_src/init_layout.js +++ b/js_src/init_layout.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + // TODO refactor this stuff, there's much to wipe var drawAreaContainerMinHeight = 300; var drawAreaContainerMaxHeight = 450; diff --git a/js_src/main.js b/js_src/main.js index a4672a9..01a0264 100644 --- a/js_src/main.js +++ b/js_src/main.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var debugMode = false; // debug mode var sendPrintCommands = true; // if Doodle3d should send print commands to the 3d printer var communicateWithWifibox = true; // if Doodle3d should try interfacing with the wifibox (in case one is not connected) @@ -61,7 +69,6 @@ $(function() { initButtonBehavior(); initKeyboard(); initVerticalShapes(); - if (!clientInfo.isSmartphone) initHelp(); thermometer.init($("#thermometerCanvas"), $("#thermometerContainer")); progressbar.init($("#progressbarCanvas"), $("#progressbarCanvasContainer")); @@ -142,12 +149,18 @@ function showOrHideThermo() { function settingsLoaded() { console.log("settingsLoaded"); console.log("autoHeatup: ",settings["printer.heatup.enabled"]); - if(settings["printer.heatup.enabled"]) { - if(firstTimeSettingsLoaded) { + if(firstTimeSettingsLoaded) { + if(settings["printer.heatup.enabled"]) { printer.preheat(); - firstTimeSettingsLoaded = false; } + console.log("doodle3d.tour.enabled: ",settings["doodle3d.tour.enabled"]); + if(settings["doodle3d.tour.enabled"] && !clientInfo.isSmartphone) { + console.log("show tour"); + initHelp(); + } + firstTimeSettingsLoaded = false; } + } function setDebugText(text) { diff --git a/js_src/previewRendering.js b/js_src/previewRendering.js index c28314b..462bc72 100644 --- a/js_src/previewRendering.js +++ b/js_src/previewRendering.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + //* var $preview; var preview; @@ -83,7 +91,10 @@ var debug_redrawSimplification = 6; function redrawPreview(redrawLess) { if (redrawLess == undefined) redrawLess = false; - if (_points.length < 2) return; + if (_points.length < 2) { + previewCtx.clearRect(0, 0, preview.width, preview.height); + return; + } if (!redrawLess) { //debug_redrawSimplification = Math.round(_points.length / 65); @@ -345,4 +356,4 @@ function updatePreview(_x, _y, redrawLess) { updatePrevY = _y; } -//*/ \ No newline at end of file +//*/ diff --git a/js_src/sidebar.js b/js_src/sidebar.js index aeefeed..747f272 100644 --- a/js_src/sidebar.js +++ b/js_src/sidebar.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var sidebarLeft; var sidebarRight; diff --git a/js_src/sketches.js b/js_src/sketches.js index aecc9c5..fba97b9 100644 --- a/js_src/sketches.js +++ b/js_src/sketches.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var currentSketchId = 0; var numSavedSketches = 0; @@ -54,7 +62,7 @@ function setCurrentSketchId(sId) { } function updatePrevNextButtonStateOnClear() { - enableButton(btnPrevious, prevDoodle); + if (numSavedSketches > 0) enableButton(btnPrevious, prevDoodle); disableButton(btnNext); currentSketchId = numSavedSketches+1; //after the end of the list disableButton(btnSave); diff --git a/js_src/utils.js b/js_src/utils.js index 3a88529..ea45588 100644 --- a/js_src/utils.js +++ b/js_src/utils.js @@ -1,3 +1,10 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ // http://stackoverflow.com/questions/1403888/get-url-parameter-with-jquery function getURLParameter(name) { diff --git a/js_src/verticalShapes.js b/js_src/verticalShapes.js index 47f54b2..d90ae40 100644 --- a/js_src/verticalShapes.js +++ b/js_src/verticalShapes.js @@ -1,3 +1,11 @@ +/* + * This file is part of the Doodle3D project (http://doodle3d.com). + * + * Copyright (c) 2013, Doodle3D + * This software is licensed under the terms of the GNU GPL v2 or later. + * See file LICENSE.txt or visit http://www.gnu.org/licenses/gpl.html for full license details. + */ + var VERTICALSHAPE; var verticalShapes = { "NONE": 'none', @@ -38,4 +46,4 @@ function initVerticalShapes() { function resetVerticalShapes() { VERTICALSHAPE = verticalShapes.NONE; -} \ No newline at end of file +} diff --git a/license-spec.lua b/license-spec.lua new file mode 100644 index 0000000..ab8ac3c --- /dev/null +++ b/license-spec.lua @@ -0,0 +1,9 @@ +local M = { + BASE_PATH = 'js_src', + EXCLUDE_FILES = {}, + PROCESS_FILES = { + ['js_src/[^/]*%.js'] = 'cstyle' + }, + IGNORE_GIT_CHANGED = false +} +return M diff --git a/www/settings.html b/www/settings.html index 79d2b5f..679f755 100644 --- a/www/settings.html +++ b/www/settings.html @@ -52,14 +52,14 @@ -->
- + x:mm
y:mm
z:mm
- +
GCODE settings
@@ -79,6 +79,8 @@
{preheatTemp}
Preheat temperature
{preheatBedTemp}
Preheat bed temperature
{printerType}
Printer type
+
{if heatedBed}
Enable line if printer has heated bed
+
@@ -115,6 +117,7 @@ px

+
@@ -147,7 +150,7 @@ The text %%MAC_ADDR_TAIL%% will be replaced by the last 6 digits of your Doodle3D Wi-Fi box's MAC address.
- +

@@ -159,6 +162,8 @@
Update + +