From 7c8dd7a81a9ecce711f6a4759bed7b15fed5676d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=E4u=DFge?= Date: Tue, 25 Dec 2012 20:49:10 +0100 Subject: [PATCH] - refactored Javascript - introduced knockout.js for data binding - added gcode file management --- Cura/webui/__init__.py | 149 ++++++++---- Cura/webui/printer.py | 43 +--- Cura/webui/static/js/knockout-2.2.0.js | 85 +++++++ Cura/webui/static/js/printerstate.js | 88 ------- Cura/webui/static/js/temperaturegraph.js | 45 ---- Cura/webui/static/js/terminaloutput.js | 49 ---- Cura/webui/static/js/ui.js | 278 +++++++++++++++++++++++ Cura/webui/templates/index.html | 105 ++++++--- 8 files changed, 543 insertions(+), 299 deletions(-) create mode 100644 Cura/webui/static/js/knockout-2.2.0.js delete mode 100644 Cura/webui/static/js/printerstate.js delete mode 100644 Cura/webui/static/js/temperaturegraph.js delete mode 100644 Cura/webui/static/js/terminaloutput.js create mode 100644 Cura/webui/static/js/ui.js diff --git a/Cura/webui/__init__.py b/Cura/webui/__init__.py index 186e722..2a38251 100644 --- a/Cura/webui/__init__.py +++ b/Cura/webui/__init__.py @@ -6,85 +6,138 @@ from flask import Flask, request, render_template, jsonify from printer import Printer -import tempfile +import os +import fnmatch + +BASEURL='/ajax/' +SUCCESS={} +UPLOAD_FOLDER="uploads" app = Flask("Cura.webui") printer = Printer() -printer.connect() @app.route('/') def index(): return render_template('index.html') -@app.route('/api/printer/connect', methods=['POST']) -def connect(): - printer.connect() - return jsonify(state='Connecting') +#~~ Printer state -@app.route('/api/printer/disconnect', methods=['POST']) -def disconnect(): - printer.disconnect() - return jsonify(state='Offline') - -@app.route('/api/printer', methods=['GET']) +@app.route(BASEURL + 'state', methods=['GET']) def printerState(): temp = printer.currentTemp bedTemp = printer.currentBedTemp jobData = printer.jobData() - if jobData != None: - return jsonify(state=printer.getStateString(), - operational=printer.isOperational(), - closedOrError=printer.isClosedOrError(), - temp=temp, - bedTemp=bedTemp, - job=jobData) - else: - return jsonify(state=printer.getStateString(), - temperature=temp, - bedTemperature=bedTemp) + result = { + 'state': printer.getStateString(), + 'temp': temp, + 'bedTemp': bedTemp, + 'operational': printer.isOperational(), + 'closedOrError': printer.isClosedOrError() + } -@app.route('/api/printer/messages', methods=['GET']) + if (jobData != None): + result['job'] = jobData + + if (request.values.has_key('temperatures')): + result['temperatures'] = printer.temps + + if (request.values.has_key('log')): + result['log'] = printer.log + + if (request.values.has_key('messages')): + result['messages'] = printer.messages + + return jsonify(result) + +@app.route(BASEURL + 'state/messages', methods=['GET']) def printerMessages(): return jsonify(messages=printer.messages) -@app.route('/api/printer/log', methods=['GET']) +@app.route(BASEURL + 'state/log', methods=['GET']) def printerMessages(): return jsonify(log=printer.log) -@app.route('/api/printer/command', methods=['POST']) -def printerCommand(): - command = request.form['command'] - printer.command(command) - return jsonify(state=printer.getStateString()) - -@app.route('/api/printer/temperatures', methods=['GET']) +@app.route(BASEURL + 'state/temperatures', methods=['GET']) def printerTemperatures(): return jsonify(temperatures = printer.temps) -@app.route('/api/printer/gcode', methods=['POST']) +#~~ Printer control + +@app.route(BASEURL + 'control/connect', methods=['POST']) +def connect(): + printer.connect() + return jsonify(state='Connecting') + +@app.route(BASEURL + 'control/disconnect', methods=['POST']) +def disconnect(): + printer.disconnect() + return jsonify(state='Offline') + +@app.route(BASEURL + 'control/command', methods=['POST']) +def printerCommand(): + command = request.form['command'] + printer.command(command) + return jsonify(SUCCESS) + +@app.route(BASEURL + 'control/print', methods=['POST']) +def printGcode(): + printer.startPrint() + return jsonify(SUCCESS) + +@app.route(BASEURL + 'control/pause', methods=['POST']) +def pausePrint(): + printer.togglePausePrint() + return jsonify(SUCCESS) + +@app.route(BASEURL + 'control/cancel', methods=['POST']) +def cancelPrint(): + printer.cancelPrint() + return jsonify(SUCCESS) + +#~~ GCODE file handling + +@app.route(BASEURL + 'gcodefiles', methods=['GET']) +def readGcodeFiles(): + files = [] + for osFile in os.listdir(UPLOAD_FOLDER): + if not fnmatch.fnmatch(osFile, "*.gcode"): + continue + files.append({ + "name": osFile, + "size": sizeof_fmt(os.stat(UPLOAD_FOLDER + os.sep + osFile).st_size) + }) + return jsonify(files=files) + +@app.route(BASEURL + 'gcodefiles/upload', methods=['POST']) def uploadGcodeFile(): file = request.files['gcode_file'] if file != None: - (handle, filename) = tempfile.mkstemp(suffix='.gcode', prefix='tmp_', text=True) + filename = UPLOAD_FOLDER + os.sep + file.filename file.save(filename) - printer.loadGcode(filename) - return jsonify(state=printer.getStateString()) + return readGcodeFiles() -@app.route('/api/printer/print', methods=['POST']) -def printGcode(): - printer.startPrint() - return jsonify(state=printer.getStateString()) +@app.route(BASEURL + 'gcodefiles/load', methods=['POST']) +def loadGcodeFile(): + filename = request.values["filename"] + printer.loadGcode(UPLOAD_FOLDER + os.sep + filename) + return jsonify(SUCCESS) -@app.route('/api/printer/pause', methods=['POST']) -def pausePrint(): - printer.togglePausePrint() - return jsonify(state=printer.getStateString()) +@app.route(BASEURL + 'gcodefiles/delete', methods=['POST']) +def deleteGcodeFile(): + filename = request.values["filename"] + os.remove(UPLOAD_FOLDER + os.sep + filename) + return readGcodeFiles() -@app.route('/api/printer/cancel', methods=['POST']) -def cancelPrint(): - printer.cancelPrint() - return jsonify(state=printer.getStateString()) +def sizeof_fmt(num): + """ + Taken from http://stackoverflow.com/questions/1094841/reusable-library-to-get-human-readable-version-of-file-size + """ + for x in ['bytes','KB','MB','GB']: + if num < 1024.0: + return "%3.1f%s" % (num, x) + num /= 1024.0 + return "%3.1f%s" % (num, 'TB') def run(): app.debug = True diff --git a/Cura/webui/printer.py b/Cura/webui/printer.py index 2efd155..457dd39 100644 --- a/Cura/webui/printer.py +++ b/Cura/webui/printer.py @@ -87,11 +87,11 @@ class Printer(): if self.gcode != None: formattedPrintTime = None if (self.printTime): - "%02d:%02d" % (int(self.printTime / 60), int(self.printTime % 60)) + formattedPrintTime = "%02d:%02d" % (int(self.printTime / 60), int(self.printTime % 60)) formattedPrintTimeLeft = None if (self.printTimeLeft): - "%02d:%02d" % (int(self.printTimeLeft / 60), int(self.printTimeLeft % 60)) + formattedPrintTimeLeft = "%02d:%02d" % (int(self.printTimeLeft / 60), int(self.printTimeLeft % 60)) data = { 'currentZ': self.currentZ, @@ -128,10 +128,6 @@ class Printer(): if self.comm != None and self.comm.isPrinting(): return - # delete old temporary file - if self.filename != None: - os.remove(self.filename) - #Send an initial M110 to reset the line counter to zero. prevLineType = lineType = 'CUSTOM' gcodeList = ["M110"] @@ -153,6 +149,10 @@ class Printer(): self.filename = file self.gcode = gcode self.gcodeList = gcodeList + self.currentZ = None + self.progress = None + self.printTime = None + self.printTimeLeft = None def startPrint(self): if self.comm == None or not self.comm.isOperational(): @@ -175,34 +175,3 @@ class Printer(): self.comm.cancelPrint() self.comm.sendCommand("M84") -class Temperature(): - def __init__(self, actual=None, target=None): - self._actual = actual - self._target = target - - def actual(self): - return self._actual - - def target(self): - return self._target - - def asDict(self): - return {'actual': self._actual, 'target': self._target} - -class Position(): - def __init__(self, x=None, y=None, z=None): - self._x = x - self._y = y - self._z = z - - def update(self, x=None, y=None, z=None): - if x != None: - self._x = x - if y != None: - self._y = y - if z != None: - self._z = z - - def get(self): - return {'x': self._x, 'y': self._y, 'z': self._z} - diff --git a/Cura/webui/static/js/knockout-2.2.0.js b/Cura/webui/static/js/knockout-2.2.0.js new file mode 100644 index 0000000..11f8bd8 --- /dev/null +++ b/Cura/webui/static/js/knockout-2.2.0.js @@ -0,0 +1,85 @@ +// Knockout JavaScript library v2.2.0 +// (c) Steven Sanderson - http://knockoutjs.com/ +// License: MIT (http://www.opensource.org/licenses/mit-license.php) + +(function() {function i(v){throw v;}var l=!0,n=null,q=!1;function t(v){return function(){return v}};var w=window,x=document,fa=navigator,E=window.jQuery,H=void 0; +function K(v){function ga(a,d,c,e,f){var g=[],a=b.j(function(){var a=d(c,f)||[];0",g[0];);m=4b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){for(var a=a||[],d=[],c=0,e=a.length;cm?a.setAttribute("selected",b):a.selected=b},D:function(a){return(a||"").replace(d,"")},Qb:function(a,d){for(var c=[],e=(a||"").split(d),f=0,g=e.length;fa.length?q:a.substring(0,b.length)===b},sb:function(a,b){if(b.compareDocumentPosition)return 16== +(b.compareDocumentPosition(a)&16);for(;a!=n;){if(a==b)return l;a=a.parentNode}return q},X:function(a){return b.a.sb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=m&&k[d];if(!e&&"undefined"!=typeof E){if(a(b,d))var f=c,c=function(a,b){var d=this.checked;b&&(this.checked=b.mb!==l);f.call(this,a);this.checked=d};E(b).bind(d,c)}else!e&&"function"==typeof b.addEventListener?b.addEventListener(d,c,q):"undefined"!=typeof b.attachEvent?b.attachEvent("on"+ +d,function(a){c.call(b,a)}):i(Error("Browser doesn't support addEventListener or attachEvent"))},Aa:function(b,d){(!b||!b.nodeType)&&i(Error("element must be a DOM node when calling triggerEvent"));if("undefined"!=typeof E){var c=[];a(b,d)&&c.push({mb:b.checked});E(b).trigger(d,c)}else"function"==typeof x.createEvent?"function"==typeof b.dispatchEvent?(c=x.createEvent(e[d]||"HTMLEvents"),c.initEvent(d,l,l,w,0,0,0,0,0,q,q,q,q,0,b),b.dispatchEvent(c)):i(Error("The supplied element doesn't support dispatchEvent")): +"undefined"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==l),b.fireEvent("on"+d)):i(Error("Browser doesn't support triggering events"))},d:function(a){return b.$(a)?a():a},ta:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(" ")}},bb:function(a,d){var c=b.a.d(d);if(c===n||c===H)c="";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a); +!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[x.createTextNode(c)]):e.data=c;b.a.vb(a)}},$a:function(a,b){a.name=b;if(7>=m)try{a.mergeAttributes(x.createElement(""),q)}catch(d){}},vb:function(a){9<=m&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},tb:function(a){if(9<=m){var b=a.style.width;a.style.width=0;a.style.width=b}},Kb:function(a,d){for(var a=b.a.d(a),d=b.a.d(d),c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d< +c;d++)b.push(a[d]);return b},Ob:6===m,Pb:7===m,Z:m,Na:function(a,d){for(var c=b.a.L(a.getElementsByTagName("input")).concat(b.a.L(a.getElementsByTagName("textarea"))),e="string"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Hb:function(a){return"string"==typeof a&&(a=b.a.D(a))?w.JSON&&w.JSON.parse?w.JSON.parse(a):(new Function("return "+a))():n},wa:function(a,d,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&& +i(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(b.a.d(a),d,c)},Ib:function(a,d,c){var c=c||{},e=c.params||{},f=c.includeFields||this.Ma,g=a;if("object"==typeof a&&"form"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var j=b.a.Na(a,f[h]),k=j.length-1;0<=k;k--)e[j[k].name]=j[k].value;var d=b.a.d(d),m=x.createElement("form"); +m.style.display="none";m.action=g;m.method="post";for(var v in d)a=x.createElement("input"),a.name=v,a.value=b.a.wa(b.a.d(d[v])),m.appendChild(a);for(v in e)a=x.createElement("input"),a.name=v,a.value=e[v],m.appendChild(a);x.body.appendChild(m);c.submitter?c.submitter(m):m.submit();setTimeout(function(){m.parentNode.removeChild(m)},0)}}};b.b("utils",b.a);b.b("utils.arrayForEach",b.a.o);b.b("utils.arrayFirst",b.a.kb);b.b("utils.arrayFilter",b.a.fa);b.b("utils.arrayGetDistinctValues",b.a.Fa);b.b("utils.arrayIndexOf", +b.a.i);b.b("utils.arrayMap",b.a.V);b.b("utils.arrayPushAll",b.a.P);b.b("utils.arrayRemoveItem",b.a.ga);b.b("utils.extend",b.a.extend);b.b("utils.fieldsIncludedWithJsonPost",b.a.Ma);b.b("utils.getFormFields",b.a.Na);b.b("utils.peekObservable",b.a.ta);b.b("utils.postJson",b.a.Ib);b.b("utils.parseJson",b.a.Hb);b.b("utils.registerEventHandler",b.a.n);b.b("utils.stringifyJson",b.a.wa);b.b("utils.range",b.a.Kb);b.b("utils.toggleDomNodeCssClass",b.a.da);b.b("utils.triggerEvent",b.a.Aa);b.b("utils.unwrapObservable", +b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments),a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d="__ko__"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.getAll(a,q);return c===H?H:c[d]},set:function(a,d,c){c===H&&b.a.f.getAll(a,q)===H||(b.a.f.getAll(a,l)[d]=c)},getAll:function(b,f){var g=b[d];if(!g||!("null"!==g&&c[g])){if(!f)return H; +g=b[d]="ko"+a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=n,l):q}}};b.b("utils.domData",b.a.f);b.b("utils.domData.clear",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===H&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,q);if(e)for(var e=e.slice(0),j=0;j",""]||!c.indexOf("",""]||(!c.indexOf("",""]||[0,"",""];a="ignored
"+c[1]+a+c[2]+"
";for("function"==typeof w.innerShiv?d.appendChild(w.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==n&&d!==H)if("string"!=typeof d&&(d=d.toString()),"undefined"!=typeof E)E(a).html(d);else for(var c= +b.a.sa(d),e=0;e"},gb:function(a,b){var c=Q[a];c===H&&i(Error("Couldn't find any memo with ID "+a+". Perhaps it's already been unmemoized.")); +try{return c.apply(n,b||[]),l}finally{delete Q[a]}},hb:function(a,d){var c=[];ba(a,c);for(var e=0,f=c.length;ec;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.fb(a);return b.a.wa(a,d,c)};b.b("toJS",b.fb);b.b("toJSON",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case "option":return a.__ko__hasDomDataOptionValue__=== +l?b.a.f.get(a,b.c.options.ra):7>=b.a.Z?a.getAttributeNode("value").specified?a.value:a.text:a.value;case "select":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):H;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case "option":switch(typeof d){case "string":b.a.f.set(a,b.c.options.ra,H);"__ko__hasDomDataOptionValue__"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.ra,d),a.__ko__hasDomDataOptionValue__=l,a.value="number"===typeof d? +d:""}break;case "select":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===n||d===H)d="";a.value=d}}};b.b("selectExtensions",b.k);b.b("selectExtensions.readValue",b.k.q);b.b("selectExtensions.writeValue",b.k.T);var ja=/\@ko_token_(\d+)\@/g,ma=["true","false"],na=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];"{"===d.charAt(0)&&(d=d.substring(1,d.length-1));for(var a=[], +c=n,e,f=0;f$/:/^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/,ha=J?/^<\!--\s*\/ko\s*--\>$/: +/^\s*\/ko\s*$/,oa={ul:l,ol:l};b.e={I:{},childNodes:function(a){return A(a)?$(a):a.childNodes},Y:function(a){if(A(a))for(var a=b.e.childNodes(a),d=0,c=a.length;d=b.a.Z&&e in ea?(e=ea[e],g?a.removeAttribute(e): +a[e]=f):g||a.setAttribute(e,f.toString());"name"===e&&b.a.$a(a,g?"":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,"click",function(){var e;if("checkbox"==a.type)e=a.checked;else if("radio"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);"checkbox"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,"checked",e,l)});"radio"==a.type&&!a.name&&b.c.uniqueName.init(a,t(l))},update:function(a,d){var c=b.a.d(d()); +"checkbox"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:"radio"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if("object"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||""),b.a.da(a,a.__ko__cssValue,q),a.__ko__cssValue=c,b.a.da(a,c,l)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute("disabled"):!c&&!a.disabled&&(a.disabled=l)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}}; +b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;"string"==typeof f&&b.a.n(a,f,function(a){var g,m=d()[f];if(m){var p=c();try{var r=b.a.L(arguments);r.unshift(e);g=m.apply(e,r)}finally{g!==l&&(a.preventDefault?a.preventDefault():a.returnValue=q)}p[f+"Bubble"]===q&&(a.cancelBubble=l,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Ra:function(a){return function(){var d=a(),c=b.a.ta(d);if(!c||"number"==typeof c.length)return{foreach:d,templateEngine:b.C.na}; +b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.na}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Ra(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Ra(d),c,e,f)}};b.g.Q.foreach=q;b.e.I.foreach=l;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=l;var f=a.ownerDocument;"activeElement"in +f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,"hasfocus",e,l);a.__ko_hasfocusUpdating=q}var f=e.bind(n,l),g=e.bind(n,q);b.a.n(a,"focus",f);b.a.n(a,"focusin",f);b.a.n(a,"blur",g);b.a.n(a,"focusout",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Aa,n,[a,c?"focusin":"focusout"]))}};b.c.html={init:function(){return{controlsDescendantBindings:l}},update:function(a,d){b.a.ca(a,d())}};var ca="__ko_withIfBindingData";P("if");P("ifnot",q,l);P("with",l,q,function(a, +b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){"select"!==b.a.u(a)&&i(Error("options binding applies only to SELECT elements"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&"option"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0/g;b.ya={ub:function(a, +d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.ya.Fb(a,d)},c)},Fb:function(a,b){return a.replace(pa,function(a,e,f,g,h,j,k){return V(k,e,b)}).replace(qa,function(a,e){return V(e,"<\!-- ko --\>",b)})},jb:function(a){return b.s.qa(function(d,c){d.nextSibling&&b.Ea(d.nextSibling,a,c)})}};b.b("__tr_ambtns",b.ya.jb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a="script"===a?"text":"textarea"===a?"value":"innerHTML";if(0==arguments.length)return this.h[a]; +var d=arguments[0];"innerHTML"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,"templateSourceData_"+a);b.a.f.set(this.h,"templateSourceData_"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,"__ko_anon_template__")||{};a.za===H&&a.ia&&(a.za=a.ia.innerHTML);return a.za}b.a.f.set(this.h,"__ko_anon_template__",{za:arguments[0]})};b.l.h.prototype.nodes= +function(){if(0==arguments.length)return(b.a.f.get(this.h,"__ko_anon_template__")||{}).ia;b.a.f.set(this.h,"__ko_anon_template__",{ia:arguments[0]})};b.b("templateSources",b.l);b.b("templateSources.domElement",b.l.h);b.b("templateSources.anonymousTemplate",b.l.O);var N;b.va=function(a){a!=H&&!(a instanceof b.v)&&i(Error("templateEngine must inherit from ko.templateEngine"));N=a};b.ua=function(a,d,c,e,f){c=c||{};(c.templateEngine||N)==H&&i(Error("Set a template engine before calling renderTemplate")); +f=f||"replaceChildren";if(e){var g=M(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),j="function"==typeof a?a(h.$data,h):a,h=S(e,f,j,h,c);"replaceNode"==f&&(e=h,g=M(e))},n,{Ja:function(){return!g||!b.a.X(g)},W:g&&"replaceNode"==f?g.parentNode:g})}return b.s.qa(function(e){b.ua(a,d,c,e,"replaceNode")})};b.Lb=function(a,d,c,e,f){function g(a,b){T(b,j);c.afterRender&&c.afterRender(b,a)}function h(d,e){j=f.createChildContext(b.a.d(d),c.as);j.$index=e;var g="function"==typeof a? +a(d,j):a;return S(n,"ignoreTargetNode",g,j,c)}var j;return b.j(function(){var a=b.a.d(d)||[];"undefined"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===H||a===n||!b.a.d(a._destroy)});b.r.K(b.a.Za,n,[e,a,h,c,g])},n,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if("string"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Gb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:l}},update:function(a, +d,c,e,f){var d=b.a.d(d()),c={},e=l,g,h=n;"string"!=typeof d&&(c=d,d=c.name,"if"in c&&(e=b.a.d(c["if"])),e&&"ifnot"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));"foreach"in c?h=b.Lb(d||a,e&&c.foreach||[],c,a,f):e?(f="data"in c?f.createChildContext(g,c.as):f,h=b.ua(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,"__ko__templateComputedDomDataKey__"))&&"function"==typeof g.B&&g.B();b.a.f.set(a,"__ko__templateComputedDomDataKey__",f&&f.oa()?f:H)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown|| +b.g.Db(a,"name")?n:"This template engine does not support anonymous templates nested within its templates"};b.e.I.template=l;b.b("setTemplateEngine",b.va);b.b("renderTemplate",b.ua);b.a.Ia=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?R(a,b,"added","deleted",c):R(b,a,"deleted","added",c)};b.b("utils.compareArrays",b.a.Ia);b.a.Za=function(a,d,c,e,f){function g(a,b){s=k[b];v!==b&&(y[a]=s);s.ma(v++);L(s.M);r.push(s);z.push(s)}function h(a,c){if(a)for(var d=0,e=c.length;db.a.Z)&&a.nodes?a.nodes():n;if(d)return b.a.L(d.cloneNode(l).childNodes);a=a.text();return b.a.sa(a)};b.C.na=new b.C;b.va(b.C.na);b.b("nativeTemplateEngine",b.C);b.pa=function(){var a=this.Cb=function(){if("undefined"==typeof E||!E.tmpl)return 0;try{if(0<=E.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&i(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later.")); +var f=b.data("precompiled");f||(f=b.text()||"",f=E.template(n,"{{ko_with $item.koBindingContext}}"+f+"{{/ko_with}}"),b.data("precompiled",f));b=[c.$data];c=E.extend({koBindingContext:c},e.templateOptions);c=E.tmpl(f,b,c);c.appendTo(x.createElement("div"));E.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){x.write(" + + + + + +
@@ -14,34 +25,69 @@
-
-

Printer

- Machine State:
- +
+
+
+ State +
+
+
+ Machine State:
-

Job

- Filament:
- Estimated Print Time:
- Line:
- Height:
- Print Time:
- Print Time Left:
+
+
+
-
-
+ Filament:
+ Estimated Print Time:
+ Line:
+ Height:
+ Print Time:
+ Print Time Left:
+ + + + + +
+
+
+
+
+ Files +
+
+
+ + + + + + + + + + + + + + + +
NameSizeAction
 | 
+ + + Upload + + +
+
+
+
+
- - - - - -
- - -
-
+
  • Temp
  • Jog
    • @@ -51,10 +97,10 @@
    -
    +
    - Temp:
    - Bed Temp:
    + Temp:
    + Bed Temp:
    @@ -112,10 +158,5 @@
- - - - - \ No newline at end of file