From 51e43944918793711da037bab8eb76d40ee5b42c Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Mon, 14 Oct 2013 18:51:37 +0200 Subject: [PATCH] Slight delay for gcode generation so that display is updated first. Hide stop untill gcode is send completely. --- js/Printer.js | 1 + js/buttonbehaviors.js | 47 ++++++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/js/Printer.js b/js/Printer.js index 497241c..0c15017 100644 --- a/js/Printer.js +++ b/js/Printer.js @@ -151,6 +151,7 @@ function Printer() { if (completed) { console.log("Printer:sendPrintPart:gcode sending completed"); this.gcode = []; + btnStop.css("display","block"); //self.targetTemperature = settings["printer.temperature"]; // slight hack } else { // only if the state hasn't bin changed (by for example pressing stop) we send more gcode diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js index 44e21d3..7edc448 100644 --- a/js/buttonbehaviors.js +++ b/js/buttonbehaviors.js @@ -18,6 +18,9 @@ var state; var prevState; var hasControl; +var gcodeGenerateDelayer; +var gcodeGenerateDelay = 50; + function initButtonBehavior() { console.log("f:initButtonBehavior"); @@ -207,35 +210,41 @@ function nextDoodle(e) { function print(e) { console.log("f:print() >> sendPrintCommands = " + sendPrintCommands); - $(".btnPrint").css("display","none"); + //$(".btnPrint").css("display","none"); - $("#textdump").text(""); + if (_points.length > 2) { - //setState(Printer.BUFFERING_STATE,printer.hasControl); + //setState(Printer.BUFFERING_STATE,printer.hasControl); printer.overruleState(Printer.BUFFERING_STATE); - var gcode = generate_gcode(); - //startPrint(gencode); + + btnStop.css("display","none"); + + // 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(); + //startPrint(gencode); - if (sendPrintCommands) { - printer.print(gcode); - } else { - console.log("sendPrintCommands is false: not sending print command to 3dprinter"); - } + if (sendPrintCommands) { + printer.print(gcode); + } else { + console.log("sendPrintCommands is false: not sending print command to 3dprinter"); + } - //if (debugMode) { - //console.log("f:print() >> debugMode is true, dumping gcode to textarea #textdump"); - $("#textdump").text(gcode.join("\n")); - //} - - // copyToClipboard(gencode); - //*/ + if (debugMode) { + $("#textdump").text(""); + $("#textdump").text(gcode.join("\n")); + } + + }, gcodeGenerateDelay); } else { console.log("f:print >> not enough points!"); } - alert("Je tekening zal nu geprint worden"); - $(".btnPrint").css("display","block"); + //alert("Je tekening zal nu geprint worden"); + //$(".btnPrint").css("display","block"); // $.post("/doodle3d.of", { data:output }, function(data) {