Add a new shape
@@ -155,13 +155,13 @@
diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..8489ed8 Binary files /dev/null and b/.DS_Store differ diff --git a/js/Help.js b/js/Help.js index 19e3df1..bacdc05 100644 --- a/js/Help.js +++ b/js/Help.js @@ -193,7 +193,7 @@ function InfoReminderTour(_name) { } function initHelp() { - //console.log("f:initHelp()"); + console.log("f:initHelp()"); // track number of visits of this user if ($.cookie("Doodle3DVisitCounter") == null) { @@ -203,7 +203,7 @@ function initHelp() { } // load the html file which describes the tour contents - $("#helpContainer").load("helpcontent.html", function() { + $("#helpContainer").load("http://draw.doodle3d.com/helpcontent.html", function() { //console.log("helpContent loaded"); helpTours = new HelpTours(); diff --git a/js/Printer.js b/js/Printer.js index 943020d..5ff2c47 100644 --- a/js/Printer.js +++ b/js/Printer.js @@ -368,6 +368,9 @@ function Printer() { } this.checkStatus = function() { + //disble printer status check RC: 2-1-2018 + return; + //console.log("Printer:checkStatus"); this.stateOverruled = false; //console.log(" stateOverruled: ",this.stateOverruled); diff --git a/js/Progressbar.js b/js/Progressbar.js index 26ff170..8cb4872 100644 --- a/js/Progressbar.js +++ b/js/Progressbar.js @@ -10,9 +10,9 @@ function Progressbar() { this.currProgress = 0; // default val this.progressbarFGImg = new Image(); - this.progressbarFGImgSrc = "img/progress_fg.png"; + this.progressbarFGImgSrc = "http://draw.doodle3d.com/img/progress_fg.png"; this.progressbarBGImg = new Image(); - this.progressbarBGImgSrc = "img/progress_bg.png"; + this.progressbarBGImgSrc = "http://draw.doodle3d.com/img/progress_bg.png"; this.progressWidth= 93; this.progressHeight = 82; diff --git a/js/Thermometer.js b/js/Thermometer.js index e2f312d..8a7f17b 100644 --- a/js/Thermometer.js +++ b/js/Thermometer.js @@ -16,7 +16,7 @@ function Thermometer() { this.targetTemperature = 0; // default val this.thermoOverlayImg = new Image(); - this.thermoOverlayImgSrc = "img/thermometer_fg_overlay.png"; // ../img/thermometer_fg_overlay.png + this.thermoOverlayImgSrc = "http://draw.doodle3d.com/img/thermometer_fg_overlay.png"; // ../img/thermometer_fg_overlay.png this.thermoWidth= 40; this.thermoHeight = 100; diff --git a/js/WordArt.js b/js/WordArt.js index 8cb49ef..1fb7742 100644 --- a/js/WordArt.js +++ b/js/WordArt.js @@ -2,7 +2,7 @@ var wordArtPopup; function initWordArt() { $("body").append('
'); - $("#svgfont").load("img/font.svg?"); + $("#svgfont").load("http://draw.doodle3d.com/img/font.svg?"); wordArtPopup = new Popup($("#popupWordArt"),$("#popupMask")); $("#btnWordArtOk").on("onButtonClick",wordArtPopup.commit); diff --git a/js/api/ConfigAPI.js b/js/api/ConfigAPI.js index c6feb94..64fcf30 100644 --- a/js/api/ConfigAPI.js +++ b/js/api/ConfigAPI.js @@ -17,83 +17,73 @@ function ConfigAPI() { this.init = function(wifiboxURL,wifiboxCGIBinURL) { //console.log("ConfigAPI:init"); - _wifiboxURL = wifiboxURL; _wifiboxCGIBinURL = wifiboxCGIBinURL; } this.loadAll = function(completeHandler,failedHandler) { //console.log("ConfigAPI:loadAll"); - $.ajax({ - url: _wifiboxURL + "/config/all", - type: "GET", - dataType: 'json', - timeout: _timeoutTime, - success: function(response){ - if(response.status == "error" || response.status == "fail") { - if(failedHandler) failedHandler(response); - } else { - completeHandler(response.data); - } - } - }).fail(function() { - if(failedHandler) failedHandler(); - }); + alert('ConfigAPI.loadAll() deprecated'); }; + + this.load = function(targetSettings,completeHandler,failedHandler) { + alert('ConfigAPI.load() deprecated'); //console.log("ConfigAPI:load"); - $.ajax({ - url: _wifiboxURL + "/config/", - type: "GET", - dataType: 'json', - data: targetSettings, - timeout: _timeoutTime, - success: function(response){ - if(response.status == "error" || response.status == "fail") { - if(failedHandler) failedHandler(response); - } else { - completeHandler(response.data); - } - } - }).fail(function() { - if(failedHandler) failedHandler(); - }); + // $.ajax({ + // url: _wifiboxURL + "/config/", + // type: "GET", + // dataType: 'json', + // data: targetSettings, + // timeout: _timeoutTime, + // success: function(response){ + // if(response.status == "error" || response.status == "fail") { + // if(failedHandler) failedHandler(response); + // } else { + // completeHandler(response.data); + // } + // } + // }).fail(function() { + // if(failedHandler) failedHandler(); + // }); }; this.save = function(newSettings,completeHandler,failedHandler) { //console.log("ConfigAPI:save"); - $.ajax({ - url: _wifiboxCGIBinURL + "/config", - type: "POST", - data: newSettings, - dataType: 'json', - timeout: _saveSettingsTimeoutTime, - success: function(response){ - //console.log("ConfigAPI:save response: ",response); - if(response.status == "error" || response.status == "fail") { - if(failedHandler) failedHandler(response); - } else { - completeHandler(response.data); - } - } - }).fail(function() { - if(failedHandler) failedHandler(); - }); + alert('ConfigAPI.save() deprecated'); + // $.ajax({ + // url: _wifiboxCGIBinURL + "/config", + // type: "POST", + // data: newSettings, + // dataType: 'json', + // timeout: _saveSettingsTimeoutTime, + // success: function(response){ + // //console.log("ConfigAPI:save response: ",response); + // if(response.status == "error" || response.status == "fail") { + // if(failedHandler) failedHandler(response); + // } else { + // completeHandler(response.data); + // } + // } + // }).fail(function() { + // if(failedHandler) failedHandler(); + // }); }; this.resetAll = function(completeHandler,failedHandler) { + alert('ConfigAPI.resetAll() deprecated'); //console.log("ConfigAPI:resetAll"); - $.ajax({ - url: _wifiboxCGIBinURL + "/config/resetall", - type: "POST", - dataType: 'json', - timeout: _timeoutTime, - success: function(response){ - if(response.status == "error" || response.status == "fail") { - if(failedHandler) failedHandler(response); - } else { - completeHandler(response.data); - } - } - }).fail(function() { - if(failedHandler) failedHandler(); - }); + // $.ajax({ + // url: _wifiboxCGIBinURL + "/config/resetall", + // type: "POST", + // dataType: 'json', + // timeout: _timeoutTime, + // success: function(response){ + // if(response.status == "error" || response.status == "fail") { + // if(failedHandler) failedHandler(response); + // } else { + // completeHandler(response.data); + // } + // } + // }).fail(function() { + // if(failedHandler) failedHandler(); + // }); }; } \ No newline at end of file diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js index 1d0097c..fb6de81 100644 --- a/js/buttonbehaviors.js +++ b/js/buttonbehaviors.js @@ -202,68 +202,51 @@ function initButtonBehavior() { buttonGroupAdd.fadeOut(); } - // btnSettings.on("onButtonClick", openSettingsWindow); - - // 29-okt-2013 - we're not doing help for smartphones at the moment - // if (clientInfo.isSmartphone) { - // btnInfo.disable(); - // } else { - // btnInfo.on("onButtonClick", function(e) { - // helpTours.startTour(helpTours.WELCOMETOUR); - // }); - // } } function stopPrint() { - console.log("stop"); - // console.log("f:stopPrint() >> sendPrintCommands = " + sendPrintCommands); - // if (sendPrintCommands) printer.stop(); - // //setState(Printer.STOPPING_STATE,printer.hasControl); - // printer.overruleState(Printer.STOPPING_STATE); + // btnStop.disable(); + // $.get("/set?code=M104 S200\nG21\nM107\nG28 X0 Y0 Z0\nM109 S200\nG28 Z0\nG1 Z15 F9000\nG92 E0\nG91\nG1 F200 E20\nG92 E0\nG92 E0\nG1 F9000\nG90\n", function() { + $.get("/set?cmd={P:X}"); + // }); } function print(e) { console.log("print"); - // console.log("f:print() >> sendPrintCommands = " + sendPrintCommands); - // //$(".btnPrint").css("display","none"); + var gcode = generate_gcode(); + if (!gcode || gcode=="") { + console.log("no gcode to print"); + return; + } - // if (_points.length > 2) { + var blob = new Blob([gcode.join('\n')],{type: "application/octet-stream"}); + var fd = new FormData(); + fd.append("blob", blob, "doodle3d.gcode"); - // //setState(Printer.BUFFERING_STATE,printer.hasControl); - // printer.overruleState(Printer.BUFFERING_STATE); + // $.get("/set?code=M104 S200", function() { //heatup + // $.get("/set?code=G28 X0 Y0", function() { //show movement + // $.get("/set?code=M563 S5", function() { //speed up Upload via WiFi + $.ajax({ //start download + type: 'POST', + url: '/upload', + cache: false, + data: fd, + processData: false, + // contentDisposition: 'form-data; name="file"; filename="doodle.gcode', + contentType: false + }).done(function(data) { + console.log(data); - // // we put the gcode generation in a little delay - // // so that for example the print button is disabled right away - // clearTimeout(gcodeGenerateDelayer); - // gcodeGenerateDelayer = setTimeout(function() { - - // var gcode = generate_gcode(); - // if (sendPrintCommands) { - // if(gcode.length > 0) { - // printer.print(gcode); - // } else { - // printer.overruleState(Printer.IDLE_STATE); - // printer.startStatusCheckInterval(); - // } - // } else { - // console.log("sendPrintCommands is false: not sending print command to 3dprinter"); - // } - - // // if (debugMode) { - // // $("#textdump").text(""); - // // $("#textdump").text(gcode.join("\n")); - // // } - - // }, gcodeGenerateDelay); - // } else { - // console.log("f:print >> not enough points!"); - // } - - // $.post("/doodle3d.of", { data:output }, function(data) { - // btnPrint.disabled = false; - // }); + // setTimeout(function() { + // btnStop.enable(); + // $.get("/set?code=M565"); //start printing cache.gc + // },3000) + + }); + // }); + // }); } @@ -421,58 +404,6 @@ function setState(newState,newHasControl) { btnNext.disable() btnSave.disable(); - - // /* save, next and prev buttons */ - // switch(newState) { - // case Printer.WIFIBOX_DISCONNECTED_STATE: - // btnPrevious.disable(); - // btnNext.disable() - // btnSave.disable(); - // break; - // default: - // // updatePrevNextButtonState(); - // updateSketchButtonStates(); - // if (isModified) btnSave.enable(); - // break; - // } - - // if(connectingHintDelay && newState != Printer.CONNECTING_STATE) { - // clearTimeout(connectingHintDelay); - // connectingHintDelay = null; - // } - - // if(newState == Printer.WIFIBOX_DISCONNECTED_STATE) { - // message.set("Lost connection to WiFi box",Message.ERROR); - // } else if(prevState == Printer.WIFIBOX_DISCONNECTED_STATE) { - // message.set("Connected to WiFi box",Message.INFO,true); - // } else if(newState == Printer.DISCONNECTED_STATE) { - // message.set("Printer disconnected",Message.WARNING,true); - // } else if(newState == Printer.CONNECTING_STATE) { - // message.set("Printer connecting...",Message.INFO,false); - // if (prevState != Printer.CONNECTING_STATE) { //enable 'watchdog' if we entered from a different state - // clearTimeout(connectingHintDelay); - // connectingHintDelay = setTimeout(function() { - // message.set("Printer still not connected, did you