From f077fdd48447f1643b7f1929113556cdd1cffe19 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Wed, 18 Dec 2013 16:56:06 +0100 Subject: [PATCH] Fix #45 Overruling printer into tour state --- js_src/Help.js | 8 ++++---- js_src/Printer.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js_src/Help.js b/js_src/Help.js index a8d1717..af0d162 100644 --- a/js_src/Help.js +++ b/js_src/Help.js @@ -56,12 +56,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,8 +363,6 @@ function HelpTours() { self.currActiveTour = undefined; self.tourActive = false; - thermometer.hide(); - progressbar.hide(); message.hide(); printer.checkStatus(); } diff --git a/js_src/Printer.js b/js_src/Printer.js index dcae80c..8e788f3 100644 --- a/js_src/Printer.js +++ b/js_src/Printer.js @@ -19,6 +19,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";