Resolve merge conflict

config/ImportFilters/Example.js

@@ -0,0 +1,3 @@
+print(pluginContext.text);
+print("A plugin has run\n");
+pluginContext.cq.trigger();

config/ImportFilters/Ikawa.js

@@ -0,0 +1,21 @@
+pluginContext.table.setHeaderData(0, "Time");
+pluginContext.table.setHeaderData(1, "Temperature");
+pluginContext.table.setHeaderData(2, "Set");
+pluginContext.table.setHeaderData(3, "Fan");
+pluginContext.table.setHeaderData(4, "Heater");
+pluginContext.table.setHeaderData(5, "Note");
+var lines = pluginContext.data.split('\n');
+for(var i = 0; i < lines.length; i++) {
+	var fields = lines[i].split(',');
+	if(fields[5] == "roasting") {
+		var time = new QTime;
+		time = time.addSecs(Number(fields[0]));
+		pluginContext.newMeasurement(new Measurement(Units.convertTemperature(fields[4], Units.Celsius, Units.Fahrenheit), time), 1);
+		pluginContext.newMeasurement(new Measurement(Units.convertTemperature(fields[2], Units.Celsius, Units.Fahrenheit), time), 2);
+		pluginContext.newMeasurement(new Measurement(fields[1], time, Units.Unitless), 3);
+		pluginContext.newMeasurement(new Measurement(fields[6], time, Units.Unitless), 4);
+	}
+}
+for(var i = 1; i < 5; i++) {
+	pluginContext.table.newAnnotation("End", i, 5);
+}

config/Reports/itemtransactions.xml

@@ -222,7 +222,7 @@
                     }, 0));
                     output.writeEndElement();
                     output.writeEndElement();
-                    query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))), customer, reason FROM item_history(:item) WHERE time >= :sd AND time < :ed ::date + interval '1 day'");
+                    query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))), customer, reason, (SELECT person FROM transactions WHERE time = item_history.time AND item = item_history.item) FROM item_history(:item) WHERE time >= :sd AND time < :ed ::date + interval '1 day'");
                     query.bind(":sd", startDate);
                     query.bind(":ed", endDate);
                     switch(unitBox.currentIndex)
@@ -245,6 +245,7 @@
                     output.writeTextElement("th", TTR("item_transactions", "Quantity"));
                     output.writeTextElement("th", TTR("item_transactions", "Balance"));
                     output.writeTextElement("th", TTR("item_transactions", "Record"));
+					output.writeTextElement("th", TTR("item_transactions", "Person"));
                     output.writeEndElement(); // tr
                     var prev_balance = "0";
                     var prev_prec = 0;
@@ -297,6 +298,7 @@
                         } else {
                             output.writeTextElement("td", "");
                         }
+						output.writeTextElement("td", query.value(10));
                         output.writeEndElement(); // tr
                     }
                     output.writeEndElement(); // table

config/Scripts/batchtag.css

@@ -0,0 +1,38 @@
+body, h1, h2, h3, h4, h5, h6,
+p, blockquote, pre, hr,
+dl, dd, ol, ul, figure {
+  margin: 0;
+  padding: 0;
+}
+*,
+*::before,
+*::after {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+body {
+  width: 58mm;
+}
+
+h1 {
+  padding-top: 10mm;
+  font-weight: 400;
+  font-size: 5mm;
+  text-align: center;
+}
+
+span {
+  display: block;
+  font-size: 4mm;
+  margin-left: 1mm;
+  margin-right: 1mm;
+}
+
+#container {
+	width: 190px;
+	margin-left: auto;
+	margin-right: auto;
+}
+

config/Scripts/qrcode.js

@@ -0,0 +1,346 @@
+/**
+ * @fileoverview
+ * - modified davidshimjs/qrcodejs library for use in node.js
+ * - Using the 'QRCode for Javascript library'
+ * - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
+ * - this library has no dependencies.
+ *
+ * @version 0.9.1 (2016-02-12)
+ * @author davidshimjs, papnkukn
+ * @see <a href="http://www.d-project.com/" target="_blank">http://www.d-project.com/</a>
+ * @see <a href="http://jeromeetienne.github.com/jquery-qrcode/" target="_blank">http://jeromeetienne.github.com/jquery-qrcode/</a>
+ * @see <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">https://github.com/davidshimjs/qrcodejs</a>
+ */
+
+//---------------------------------------------------------------------
+// QRCode for JavaScript
+//
+// Copyright (c) 2009 Kazuhiko Arase
+//
+// URL: http://www.d-project.com/
+//
+// Licensed under the MIT license:
+//   http://www.opensource.org/licenses/mit-license.php
+//
+// The word "QR Code" is registered trademark of 
+// DENSO WAVE INCORPORATED
+//   http://www.denso-wave.com/qrcode/faqpatent-e.html
+//
+// Modified by Neal Wilson to replace the width and height attributes
+// of the generated svg with a viewbox for easier scaling.
+//
+//---------------------------------------------------------------------
+function QR8bitByte(data) {
+  this.mode = QRMode.MODE_8BIT_BYTE;
+  this.data = data;
+  this.parsedData = [];
+
+  // Added to support UTF-8 Characters
+  for (var i = 0, l = this.data.length; i < l; i++) {
+    var byteArray = [];
+    var code = this.data.charCodeAt(i);
+
+    if (code > 0x10000) {
+      byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+      byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+      byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+      byteArray[3] = 0x80 | (code & 0x3F);
+    } else if (code > 0x800) {
+      byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+      byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+      byteArray[2] = 0x80 | (code & 0x3F);
+    } else if (code > 0x80) {
+      byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+      byteArray[1] = 0x80 | (code & 0x3F);
+    } else {
+      byteArray[0] = code;
+    }
+
+    this.parsedData.push(byteArray);
+  }
+
+  this.parsedData = Array.prototype.concat.apply([], this.parsedData);
+
+  if (this.parsedData.length != this.data.length) {
+    this.parsedData.unshift(191);
+    this.parsedData.unshift(187);
+    this.parsedData.unshift(239);
+  }
+}
+
+QR8bitByte.prototype = {
+  getLength: function (buffer) {
+    return this.parsedData.length;
+  },
+  write: function (buffer) {
+    for (var i = 0, l = this.parsedData.length; i < l; i++) {
+      buffer.put(this.parsedData[i], 8);
+    }
+  }
+};
+
+function QRCodeModel(typeNumber, errorCorrectLevel) {
+  this.typeNumber = typeNumber;
+  this.errorCorrectLevel = errorCorrectLevel;
+  this.modules = null;
+  this.moduleCount = 0;
+  this.dataCache = null;
+  this.dataList = [];
+}
+
+QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
+return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row<this.moduleCount;row++){this.modules[row]=new Array(this.moduleCount);for(var col=0;col<this.moduleCount;col++){this.modules[row][col]=null;}}
+this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(test,maskPattern);if(this.typeNumber>=7){this.setupTypeNumber(test);}
+if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
+this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
+return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row<this.modules.length;row++){var y=row*cs;for(var col=0;col<this.modules[row].length;col++){var x=col*cs;var dark=this.modules[row][col];if(dark){qr_mc.beginFill(0,100);qr_mc.moveTo(x,y);qr_mc.lineTo(x+cs,y);qr_mc.lineTo(x+cs,y+cs);qr_mc.lineTo(x,y+cs);qr_mc.endFill();}}}
+return qr_mc;},setupTimingPattern:function(){for(var r=8;r<this.moduleCount-8;r++){if(this.modules[r][6]!=null){continue;}
+this.modules[r][6]=(r%2==0);}
+for(var c=8;c<this.moduleCount-8;c++){if(this.modules[6][c]!=null){continue;}
+this.modules[6][c]=(c%2==0);}},setupPositionAdjustPattern:function(){var pos=QRUtil.getPatternPosition(this.typeNumber);for(var i=0;i<pos.length;i++){for(var j=0;j<pos.length;j++){var row=pos[i];var col=pos[j];if(this.modules[row][col]!=null){continue;}
+for(var r=-2;r<=2;r++){for(var c=-2;c<=2;c++){if(r==-2||r==2||c==-2||c==2||(r==0&&c==0)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}}}},setupTypeNumber:function(test){var bits=QRUtil.getBCHTypeNumber(this.typeNumber);for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
+for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
+for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
+this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex<data.length){dark=(((data[byteIndex]>>>bitIndex)&1)==1);}
+var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
+this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
+row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;i<dataList.length;i++){var data=dataList[i];buffer.put(data.mode,4);buffer.put(data.getLength(),QRUtil.getLengthInBits(data.mode,typeNumber));data.write(buffer);}
+var totalDataCount=0;for(var i=0;i<rsBlocks.length;i++){totalDataCount+=rsBlocks[i].dataCount;}
+if(buffer.getLengthInBits()>totalDataCount*8){throw new Error("code length overflow. ("
++buffer.getLengthInBits()
++">"
++totalDataCount*8
++")");}
+if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
+while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
+while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+buffer.put(QRCodeModel.PAD1,8);}
+return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r<rsBlocks.length;r++){var dcCount=rsBlocks[r].dataCount;var ecCount=rsBlocks[r].totalCount-dcCount;maxDcCount=Math.max(maxDcCount,dcCount);maxEcCount=Math.max(maxEcCount,ecCount);dcdata[r]=new Array(dcCount);for(var i=0;i<dcdata[r].length;i++){dcdata[r][i]=0xff&buffer.buffer[i+offset];}
+offset+=dcCount;var rsPoly=QRUtil.getErrorCorrectPolynomial(ecCount);var rawPoly=new QRPolynomial(dcdata[r],rsPoly.getLength()-1);var modPoly=rawPoly.mod(rsPoly);ecdata[r]=new Array(rsPoly.getLength()-1);for(var i=0;i<ecdata[r].length;i++){var modIndex=i+modPoly.getLength()-ecdata[r].length;ecdata[r][i]=(modIndex>=0)?modPoly.get(modIndex):0;}}
+var totalCodeCount=0;for(var i=0;i<rsBlocks.length;i++){totalCodeCount+=rsBlocks[i].totalCount;}
+var data=new Array(totalCodeCount);var index=0;for(var i=0;i<maxDcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<dcdata[r].length){data[index++]=dcdata[r][i];}}}
+for(var i=0;i<maxEcCount;i++){for(var r=0;r<rsBlocks.length;r++){if(i<ecdata[r].length){data[index++]=ecdata[r][i];}}}
+return data;};var QRMode={MODE_NUMBER:1<<0,MODE_ALPHA_NUM:1<<1,MODE_8BIT_BYTE:1<<2,MODE_KANJI:1<<3};var QRErrorCorrectLevel={L:1,M:0,Q:3,H:2};var QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7};var QRUtil={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:(1<<10)|(1<<8)|(1<<5)|(1<<4)|(1<<2)|(1<<1)|(1<<0),G18:(1<<12)|(1<<11)|(1<<10)|(1<<9)|(1<<8)|(1<<5)|(1<<2)|(1<<0),G15_MASK:(1<<14)|(1<<12)|(1<<10)|(1<<4)|(1<<1),getBCHTypeInfo:function(data){var d=data<<10;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)>=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
+return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
+return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
+return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i<errorCorrectLength;i++){a=a.multiply(new QRPolynomial([1,QRMath.gexp(i)],0));}
+return a;},getLengthInBits:function(mode,type){if(1<=type&&type<10){switch(mode){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:return 8;case QRMode.MODE_KANJI:return 8;default:throw new Error("mode:"+mode);}}else if(type<27){switch(mode){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw new Error("mode:"+mode);}}else if(type<41){switch(mode){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw new Error("mode:"+mode);}}else{throw new Error("type:"+type);}},getLostPoint:function(qrCode){var moduleCount=qrCode.getModuleCount();var lostPoint=0;for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount;col++){var sameCount=0;var dark=qrCode.isDark(row,col);for(var r=-1;r<=1;r++){if(row+r<0||moduleCount<=row+r){continue;}
+for(var c=-1;c<=1;c++){if(col+c<0||moduleCount<=col+c){continue;}
+if(r==0&&c==0){continue;}
+if(dark==qrCode.isDark(row+r,col+c)){sameCount++;}}}
+if(sameCount>5){lostPoint+=(3+sameCount-5);}}}
+for(var row=0;row<moduleCount-1;row++){for(var col=0;col<moduleCount-1;col++){var count=0;if(qrCode.isDark(row,col))count++;if(qrCode.isDark(row+1,col))count++;if(qrCode.isDark(row,col+1))count++;if(qrCode.isDark(row+1,col+1))count++;if(count==0||count==4){lostPoint+=3;}}}
+for(var row=0;row<moduleCount;row++){for(var col=0;col<moduleCount-6;col++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row,col+1)&&qrCode.isDark(row,col+2)&&qrCode.isDark(row,col+3)&&qrCode.isDark(row,col+4)&&!qrCode.isDark(row,col+5)&&qrCode.isDark(row,col+6)){lostPoint+=40;}}}
+for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount-6;row++){if(qrCode.isDark(row,col)&&!qrCode.isDark(row+1,col)&&qrCode.isDark(row+2,col)&&qrCode.isDark(row+3,col)&&qrCode.isDark(row+4,col)&&!qrCode.isDark(row+5,col)&&qrCode.isDark(row+6,col)){lostPoint+=40;}}}
+var darkCount=0;for(var col=0;col<moduleCount;col++){for(var row=0;row<moduleCount;row++){if(qrCode.isDark(row,col)){darkCount++;}}}
+var ratio=Math.abs(100*darkCount/moduleCount/moduleCount-50)/5;lostPoint+=ratio*10;return lostPoint;}};var QRMath={glog:function(n){if(n<1){throw new Error("glog("+n+")");}
+return QRMath.LOG_TABLE[n];},gexp:function(n){while(n<0){n+=255;}
+while(n>=256){n-=255;}
+return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<<i;}
+for(var i=8;i<256;i++){QRMath.EXP_TABLE[i]=QRMath.EXP_TABLE[i-4]^QRMath.EXP_TABLE[i-5]^QRMath.EXP_TABLE[i-6]^QRMath.EXP_TABLE[i-8];}
+for(var i=0;i<255;i++){QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]]=i;}
+function QRPolynomial(num,shift){if(num.length==undefined){throw new Error(num.length+"/"+shift);}
+var offset=0;while(offset<num.length&&num[offset]==0){offset++;}
+this.num=new Array(num.length-offset+shift);for(var i=0;i<num.length-offset;i++){this.num[i]=num[i+offset];}}
+QRPolynomial.prototype={get:function(index){return this.num[index];},getLength:function(){return this.num.length;},multiply:function(e){var num=new Array(this.getLength()+e.getLength()-1);for(var i=0;i<this.getLength();i++){for(var j=0;j<e.getLength();j++){num[i+j]^=QRMath.gexp(QRMath.glog(this.get(i))+QRMath.glog(e.get(j)));}}
+return new QRPolynomial(num,0);},mod:function(e){if(this.getLength()-e.getLength()<0){return this;}
+var ratio=QRMath.glog(this.get(0))-QRMath.glog(e.get(0));var num=new Array(this.getLength());for(var i=0;i<this.getLength();i++){num[i]=this.get(i);}
+for(var i=0;i<e.getLength();i++){num[i]^=QRMath.gexp(QRMath.glog(e.get(i))+ratio);}
+return new QRPolynomial(num,0).mod(e);}};function QRRSBlock(totalCount,dataCount){this.totalCount=totalCount;this.dataCount=dataCount;}
+QRRSBlock.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];QRRSBlock.getRSBlocks=function(typeNumber,errorCorrectLevel){var rsBlock=QRRSBlock.getRsBlockTable(typeNumber,errorCorrectLevel);if(rsBlock==undefined){throw new Error("bad rs block @ typeNumber:"+typeNumber+"/errorCorrectLevel:"+errorCorrectLevel);}
+var length=rsBlock.length/3;var list=[];for(var i=0;i<length;i++){var count=rsBlock[i*3+0];var totalCount=rsBlock[i*3+1];var dataCount=rsBlock[i*3+2];for(var j=0;j<count;j++){list.push(new QRRSBlock(totalCount,dataCount));}}
+return list;};QRRSBlock.getRsBlockTable=function(typeNumber,errorCorrectLevel){switch(errorCorrectLevel){case QRErrorCorrectLevel.L:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+0];case QRErrorCorrectLevel.M:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+1];case QRErrorCorrectLevel.Q:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+2];case QRErrorCorrectLevel.H:return QRRSBlock.RS_BLOCK_TABLE[(typeNumber-1)*4+3];default:return undefined;}};function QRBitBuffer(){this.buffer=[];this.length=0;}
+QRBitBuffer.prototype={get:function(index){var bufIndex=Math.floor(index/8);return((this.buffer[bufIndex]>>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i<length;i++){this.putBit(((num>>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
+if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
+this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
+
+
+/** Constructor */
+function QRCode(options) {
+  var instance = this;
+  
+  //Default options
+  this.options = {
+    padding: 4,
+    width: 256, 
+    height: 256,
+    typeNumber: 4,
+    color: "#000000",
+    background: "#ffffff",
+    ecl: "M"
+  };
+  
+  //In case the options is string
+  if (typeof options === 'string') {
+    options = {
+      content: options
+    };
+  }
+  
+  //Merge options
+  if (options) {
+    for (var i in options) {
+      this.options[i] = options[i];
+    }
+  }
+  
+  if (typeof this.options.content !== 'string') {
+    throw new Error("Expected 'content' as string!");
+  }
+  
+  if (this.options.content.length === 0 /* || this.options.content.length > 7089 */) {
+    throw new Error("Expected 'content' to be non-empty!");
+  }
+  
+  if (!(this.options.padding >= 0)) {
+    throw new Error("Expected 'padding' value to be non-negative!");
+  }
+  
+  if (!(this.options.width > 0) || !(this.options.height > 0)) {
+    throw new Error("Expected 'width' or 'height' value to be higher than zero!");
+  }
+  
+  //Gets the error correction level
+  function _getErrorCorrectLevel(ecl) {
+    switch (ecl) {
+        case "L":
+          return QRErrorCorrectLevel.L;
+          
+        case "M":
+          return QRErrorCorrectLevel.M;
+          
+        case "Q":
+          return QRErrorCorrectLevel.Q;
+          
+        case "H":
+          return QRErrorCorrectLevel.H;
+          
+        default:
+          throw new Error("Unknwon error correction level: " + ecl);
+      }
+  }
+  
+  //Get type number
+  function _getTypeNumber(content, ecl) {      
+    var length = _getUTF8Length(content);
+    
+    var type = 1;
+    var limit = 0;
+    for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+      var table = QRCodeLimitLength[i];
+      if (!table) {
+        throw new Error("Content too long: expected " + limit + " but got " + length);
+      }
+      
+      switch (ecl) {
+        case "L":
+          limit = table[0];
+          break;
+          
+        case "M":
+          limit = table[1];
+          break;
+          
+        case "Q":
+          limit = table[2];
+          break;
+          
+        case "H":
+          limit = table[3];
+          break;
+          
+        default:
+          throw new Error("Unknwon error correction level: " + ecl);
+      }
+      
+      if (length <= limit) {
+        break;
+      }
+      
+      type++;
+    }
+    
+    if (type > QRCodeLimitLength.length) {
+      throw new Error("Content too long");
+    }
+    
+    return type;
+  }
+
+  //Gets text length
+  function _getUTF8Length(content) {
+    var result = encodeURI(content).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+    return result.length + (result.length != content ? 3 : 0);
+  }
+  
+  //Generate QR Code matrix
+  var content = this.options.content;
+  var type = _getTypeNumber(content, this.options.ecl);
+  var ecl = _getErrorCorrectLevel(this.options.ecl);
+  this.qrcode = new QRCodeModel(type, ecl);
+  this.qrcode.addData(content);
+  this.qrcode.make();
+}
+
+/** Generates QR Code as SVG image */
+QRCode.prototype.svg = function(opt) {
+  if (typeof opt == "undefined") {
+    opt = { container: "svg" };
+  }
+  
+  var options = this.options;
+  var modules = this.qrcode.modules;
+  
+  var EOL = '\r\n';
+  var width = options.width;
+  var height = options.height;
+  var length = modules.length;
+  var xsize = width / (length + 2 * options.padding);
+  var ysize = height / (length + 2 * options.padding);
+  
+  var rect = '<rect x="0" y="0" width="' + width + '" height="' + height + '" style="fill:' + options.background + ';shape-rendering:crispEdges;"/>' + EOL;
+
+  for (var y = 0; y < length; y++) {
+    for (var x = 0; x < length; x++) {
+      var module = modules[x][y];
+      if (module) {
+        var px = (x * xsize + options.padding * xsize).toString();
+        var py = (y * ysize + options.padding * ysize).toString();
+        rect += '<rect x="' + px + '" y="' + py + '" width="' + xsize + '" height="' + ysize + '" style="fill:' + options.color + ';shape-rendering:crispEdges;"/>' + EOL;
+      }
+    }
+  }
+
+  var svg = "";
+  switch (opt.container) {
+    case "svg":
+      svg += '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 ' + width + ' ' + height + '">' + EOL;
+      svg += rect;
+      svg += '</svg>';
+      break;
+      
+    case "g":
+      svg += '<g width="' + width + '" height="' + height + '">' + EOL;
+      svg += rect;
+      svg += '</g>';
+      break;
+      
+    default:
+      svg += rect;
+      break;
+  }
+  
+  return svg;
+};
+
+/** Writes QR Code image to a file */
+QRCode.prototype.save = function(file, callback) {
+  var data = this.svg();
+  var fs = require('fs');
+  fs.writeFile(file, data, callback);
+};
+
+if (typeof module != "undefined") {
+  module.exports = QRCode;
+}

config/Windows/manuallogentry.xml

@@ -0,0 +1,434 @@
+<window id="manualLogEntry">
+	<menu name="File">
+		<plugins id="pluginMenu" title="Import" src="ImportFilters" preRun="pluginContext.preRun();" postRun="pluginContext.postRun();"/>
+		<separator />
+		<item id="quitItem" shortcut="ctrl+Q">Quit</item>
+	</menu>
+	<menu name="Log">
+        <item id="clear" shortcut="Ctrl+L">Clear Log</item>
+        <separator />
+        <item id="ms">Millisecond View</item>
+        <item id="1s">1 Second View</item>
+        <item id="5s">5 Second View</item>
+        <item id="10s">10 Second View</item>
+        <item id="15s">15 Second View</item>
+        <item id="30s">30 Second View</item>
+        <item id="1m">1 Minute View</item>
+    </menu>
+	<layout type="vertical">
+		<tabbar id="tabs"/>
+		<layout type="stack" id="pages">
+			<page>
+				<layout type="vertical">
+					<layout type="horizontal">
+						<label>Batch Type:</label>
+						<sqldrop id="batchType" />
+						<label>Machine:</label>
+						<sqldrop id="machineSelector" />
+						<stretch />
+					</layout>
+					<label>Green Coffee:</label>
+					<layout type="stack" id="greenInfoLayout">
+						<page id="sampleGreen">
+							<layout type="vertical">
+								<layout type="grid">
+									<row>
+										<column><label>Name:</label></column>
+										<column><line id="sampleGreenName" /></column>
+									</row>
+									<row>
+										<column><label>Weight:</label></column>
+										<column><line id="sampleGreenWeight" validator="numeric">0.0</line></column>
+										<column><sqldrop id="sampleGreenUnit" /></column>
+									</row>
+									<row>
+										<column><label>Vendor:</label></column>
+										<column><line id="sampleGreenVendor" /></column>
+									</row>
+									<row>
+										<column><label>Arrival Date:</label></column>
+										<column><calendar id="sampleGreenArrivalDate" /></column>
+									</row>
+								</layout>
+								<label>Additional Details:</label>
+								<sqltablearray columns="2" id="attributes">
+									<column name="Attribute" />
+									<column name="Value" />
+								</sqltablearray>
+							</layout>
+						</page>
+						<page id="productionGreen">
+							<layout type="vertical">
+								<layout type="horizontal">
+									<label>Unit:</label>
+									<sqldrop id="productionGreenUnit" />
+									<stretch />
+								</layout>
+								<sqltablearray columns="2" id="productionGreenTable">
+									<column name="Coffee" delegate="sql" showdata="true" null="true" nulltext="Delete" nulldata="delete" data="0" display="1">
+										<![CDATA[SELECT id, name FROM coffees WHERE quantity <> 0 ORDER BY name]]>
+									</column>
+									<column name="Weight" delegate="numeric" />
+								</sqltablearray>
+							</layout>
+						</page>
+					</layout>
+					<label>Roasting Details:</label>
+					<layout type="grid">
+						<row>
+							<column><label>Item:</label></column>
+							<column>
+								<sqldrop data="0" display="1" showdata="true" id="roastedItem">
+									<null />
+									<query>SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id IN (SELECT item FROM current_items) ORDER BY name</query>
+								</sqldrop>
+							</column>
+						</row>
+						<row>
+							<column><label>Weight:</label></column>
+							<column><line id="roastedWeight" validator="numeric">0.0</line></column>
+						</row>
+						<row>
+							<column><label>Time:</label></column>
+							<column><calendar id="roastTime" time="true"/></column>
+						</row>
+						<row>
+							<column><label>Duration:</label></column>
+							<column><timeedit id="roastDuration" /></column>
+						</row>
+						<row>
+							<column><label>Notes:</label></column>
+							<column><textarea id="notes" /></column>
+						</row>
+					</layout>
+				</layout>
+			</page>
+			<page>
+				<layout type="vertical">
+					<layout type="horizontal">
+						<label>Time Increment (s):</label>
+						<line id="timeincrement" validator="numeric">30</line>
+						<stretch />
+						<label>Time:</label>
+						<timeedit id="currenttime" />
+						<stretch />
+						<label>Temperature:</label>
+						<line id="currenttemperature" validator="numeric" />
+						<label>Note:</label>
+						<line id="currentnote" />
+						<button name="Add Measurement" id="addmeasurement" type="push" />
+					</layout>
+					<splitter type="horizontal" id="roastdatasplit">
+						<measurementtable id="log" />
+						<graph id="graph" />
+					</splitter>
+				</layout>
+			</page>
+		</layout>
+		<layout type="horizontal">
+			<stretch />
+			<button name="Submit" id="submit" type="push" />
+		</layout>
+	</layout>
+	<program>
+	<![CDATA[
+		var window = this;
+		this.windowTitle = "Typica - Manual Log Entry";
+		window.windowReady.connect(function() {
+			if(machineModel.rowCount() == 0) {
+				displayError(TTR("manualLogEntry", "Configuration Required"),
+				TTR("manualLogEntry", "Please configure a roaster."));
+				window.close();
+			}
+		});
+		quitItem = findChildObject(this, 'quitItem');
+		quitItem.triggered.connect(function() {
+			Application.quit();
+		});
+		pluginContext = {};
+		pluginContext.table = findChildObject(this, 'log');
+		pluginContext.table.setHeaderData(1, "Temp");
+		pluginContext.table.setHeaderData(2, "Note");
+		pluginContext.graph = findChildObject(this, 'graph');
+		pluginContext.preRun = function() {
+			var filename = QFileDialog.getOpenFileName(window, TTR("manualLogEntry", "Import"), QSettings.value('script/lastDir', '') + '/');
+			var file = new QFile(filename);
+			if(file.open(1)) {
+				pluginContext.data = file.readToString();
+				file.close();
+				pluginContext.table.clear();
+				pluginContext.graph.clear();
+				QSettings.setValue("script/lastDir", dir(filename));
+			} else {
+				throw new Error("Failed to open file, aborting import.");
+			}
+		};
+		pluginContext.postRun = function() {
+			
+		};
+		pluginContext.newMeasurement = function(m, c) {
+			pluginContext.table.newMeasurement(m, c);
+			pluginContext.graph.newMeasurement(m, c);
+		}
+		pluginMenu = findChildObject(this, 'pluginMenu');
+		pluginMenu.setProperty("activationObject", pluginContext);
+		tabs = findChildObject(this, 'tabs');
+		tabs.addTab("Batch Data");
+		tabs.addTab("Roast Data");
+		pages = findChildObject(this, 'pages');
+		tabs.currentChanged.connect(function(index) {
+			pages.setCurrentIndex(index);
+		});
+		greenInfoLayout = findChildObject(this, 'greenInfoLayout');
+		roastedItem = findChildObject(this, 'roastedItem');
+		batchType = findChildObject(this, 'batchType');
+		batchType.addItem("Sample");
+		batchType.addItem("Production");
+		batchType['currentIndexChanged(int)'].connect(function(batchTypeIndex) {
+			QSettings.setValue("script/manual_batchType", batchTypeIndex);
+			greenInfoLayout.setCurrentIndex(batchTypeIndex);
+			roastedItem.enabled = (batchTypeIndex == 1);
+		});
+		batchType.setCurrentIndex(QSettings.value("script/manual_batchType", 1));
+		var machineSelector = findChildObject(this, 'machineSelector');
+        var machineModel = new DeviceTreeModel;
+        machineSelector.setModel(machineModel);
+        machineSelector.currentIndex = QSettings.value("script/manualMachineSelection", 0);
+        machineSelector['currentIndexChanged(int)'].connect(function(index) {
+            QSettings.setValue("script/manualMachineSelection", index);
+        });
+		sampleGreenUnit = findChildObject(this, 'sampleGreenUnit');
+		sampleGreenUnit.addItem("g");
+		sampleGreenUnit.addItem("Kg");
+		sampleGreenUnit.addItem("oz");
+		sampleGreenUnit.addItem("lb");
+		sampleGreenUnit.currentIndex = (QSettings.value("script/manual_unit", sampleGreenUnit.findText("lb")));
+		productionGreenUnit = findChildObject(this, 'productionGreenUnit');
+		productionGreenUnit.addItem("g");
+		productionGreenUnit.addItem("Kg");
+		productionGreenUnit.addItem("oz");
+		productionGreenUnit.addItem("lb");
+		productionGreenUnit.currentIndex = (QSettings.value("script/manual_unit", productionGreenUnit.findText("lb")));
+		sampleGreenUnit['currentIndexChanged(int)'].connect(function(greenUnitIndex) {
+			QSettings.setValue("script/manual_unit", greenUnitIndex);
+			productionGreenUnit.setCurrentIndex(greenUnitIndex);
+		});
+		productionGreenUnit['currentIndexChanged(int)'].connect(function(greenUnitIndex) {
+			QSettings.setValue("script/manual_unit", greenUnitIndex);
+			sampleGreenUnit.setCurrentIndex(greenUnitIndex);
+		});
+		timeincrement = findChildObject(this, 'timeincrement');
+		currenttime = findChildObject(this, 'currenttime');
+		currenttemperature = findChildObject(this, 'currenttemperature');
+		currentnote = findChildObject(this, 'currentnote');
+		addmeasurement = findChildObject(this, 'addmeasurement');
+		addmeasurement.clicked.connect(function() {
+			pluginContext.newMeasurement(new Measurement(Number(currenttemperature.text), currenttime.time), 1);
+			if(currentnote.text.length > 0) {
+				pluginContext.table.newAnnotation(currentnote.text, 1, 2);
+			}
+			currentnote.text = "";
+			var t = QTime();
+			t = t.fromString(currenttime.time, "hh:mm:ss");
+			t = t.addSecs(30);
+			currenttime.time = t;
+			currenttemperature.text = "";
+		});
+		currenttemperature.returnPressed.connect(addmeasurement.clicked);
+		currentnote.returnPressed.connect(addmeasurement.clicked);
+		var v1 = findChildObject(this, 'ms');
+        v1.triggered.connect(pluginContext.table.LOD_ms);
+        var v2 = findChildObject(this, '1s');
+        v2.triggered.connect(pluginContext.table.LOD_1s);
+        var v3 = findChildObject(this, '5s');
+        v3.triggered.connect(pluginContext.table.LOD_5s);
+        var v4 = findChildObject(this, '10s');
+        v4.triggered.connect(pluginContext.table.LOD_10s);
+        var v5 = findChildObject(this, '15s');
+        v5.triggered.connect(pluginContext.table.LOD_15s);
+        var v6 = findChildObject(this, '30s');
+        v6.triggered.connect(pluginContext.table.LOD_30s);
+        var v7 = findChildObject(this, '1m');
+        v7.triggered.connect(pluginContext.table.LOD_1m);
+		var clear = findChildObject(this, 'clear');
+        clear.triggered.connect(pluginContext.table.clear);
+        clear.triggered.connect(pluginContext.graph.clear);
+		clear.triggered.connect(function() {
+			currenttime.time = QTime(0, 0, 0, 0);
+			currenttemperature.text = "";
+			currentnote.text = "";
+		});
+		var sampleGreenName = findChildObject(this, 'sampleGreenName');
+		var sampleGreenWeight = findChildObject(this, 'sampleGreenWeight');
+		var productionGreenTable = findChildObject(this, 'productionGreenTable');
+		var greenModel = productionGreenTable.model();
+		var greenTotal = 0.0;
+		var updateGreenTable = function() {
+			var deleteRow = -1;
+			while((deleteRow = productionGreenTable.findData("delete", 0)) > -1) {
+				if(productionGreenTable.data(deleteRow, 0, 0) == "Delete") {
+					productionGreenTable.removeRow(productionGreenTable.findData("delete", 0));
+				} else {
+					break;
+				}
+			}
+			greenTotal = productionGreenTable.columnSum(1, 0);
+			productionGreenTable.resizeColumnToContents(0);
+		};
+		greenModel.dataChanged.connect(updateGreenTable);
+		var validateInputs = function() {
+			if(batchType.currentIndex == 0) {
+				/* Sample batch */
+				if(sampleGreenName.text.length == 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Please enter a green coffee name."));
+					return false;
+				}
+				if(Number(sampleGreenWeight.text) <= 0 || isNaN(sampleGreenWeight.text)) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Green coffee weight must be a number greater than 0."));
+					return false;
+				}
+			} else {
+				/* Production batch */
+				var itemArray = productionGreenTable.columnArray(0, 32).split("\\s*,\\s*");
+				var weightArray = productionGreenTable.columnArray(1, 0).split("\\s*,\\s*");
+				if((itemArray.length != weightArray.length) || (itemArray.length == 0)) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Please check that at least one green coffee has been selected and each green coffee has a valid weight"));
+					return false;
+				}
+				if(Number(greenTotal) <= 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "DataEntryError"),
+					TTR("manualLogEntry", "Total green coffee weight must be a number greater than 0."));
+					return false;
+				}
+				if(roastedItem.currentIndex == 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "DataEntryError"),
+					TTR("manualLogEntry", "Please select a roasted coffee item."));
+					return false;
+				}
+			}
+			return true;
+		};
+		var roastDataExists = function() {
+			return (pluginContext.table.rowCount() > 0);
+		}
+		var roastTime = findChildObject(this, 'roastTime');
+		var attributes = findChildObject(this, 'attributes');
+		var sampleGreenArrivalDate = findChildObject(this, 'sampleGreenArrivalDate');
+		var convertToPounds = function(w, u) {
+			switch(u) {
+				case "g":
+					return w * 0.0022;
+				case "oz":
+					return w * 0.0625;
+				case "Kg":
+					return w * 2.2;
+			}
+			return w;
+		};
+		var roastedWeight = findChildObject(this, 'roastedWeight');
+		var notes = findChildObject(this, 'notes');
+		var roastDuration = findChildObject(this, 'roastDuration');
+		var doSubmit = function() {
+			var fileID = -1;
+			var query = new QSqlQuery();
+			if(roastDataExists()) {
+				var buffer = new QBuffer;
+				buffer.open(3);
+				pluginContext.table.saveXML(buffer);
+				var q = "INSERT INTO files (id, name, type, note, file) VALUES (default, :name, 'profile', NULL, :data) RETURNING id";
+				query.prepare(q);
+				query.bind(":name", roastTime.text + " Manual Entry");
+				query.bindDeviceData(":data", buffer);
+				query.exec();
+				query.next();
+				fileID = Number(query.value(0));
+			}
+			var rootIndex = machineModel.index(machineSelector.currentIndex, 0);
+			var selectedRoasterName = machineModel.data(rootIndex, 0);
+			var machineReference = machineModel.referenceElement(machineModel.data(rootIndex, 32));
+			var selectedRoasterID = machineReference.databaseid;
+			query.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
+			if(!query.next()) {
+				query.prepare("INSERT INTO machine (id, name) VALUES (:id, :name)");
+				query.bind(":id", selectedRoasterID);
+				query.bind(":name", selectedRoasterName);
+				query.exec();
+			}
+			if(batchType.currentIndex == 0) {
+				/* Sample roast */
+				var attnames = sqlToArray(attributes.columnArray(0, 0));
+				for(var i = 0; i < attnames.length; i++) {
+					var attname = attnames[i];
+					if(attname[0] == '{') {
+						attname = attname.substr(1);
+					}
+					if(attname[0] == ' ') {
+						attname = attname.substr(1);
+					}
+					if(attname[attname.length - 1] == '}') {
+						attname = attname.substr(0, attname.length - 1);
+					}
+					if(attname.length == 0) {
+						break;
+					}
+					query.prepare("SELECT id FROM item_attributes WHERE name = :name");
+					query.bind(":name", attname);
+					query.exec();
+					if(query.next()) {
+						attributes.setData(i, 0, query.value(0), 32);
+					} else {
+						query.prepare("INSERT INTO item_attributes(id, name) VALUES (DEFAULT, :name) RETURNING id");
+						query.bind(":name", attname);
+						query.exec();
+						query.next();
+						attributes.setData(i, 0, query.value(0), 32);
+					}
+				}
+				query.prepare("INSERT INTO coffee_sample_items(id, name, reference, unit, quantity, category, arrival, vendor, attribute_ids, attribute_values) VALUES (DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Green Sample', :arrival, :vendor, :attrids, :attrvals) RETURNING id");
+				query.bind(":name", sampleGreenName.text);
+				query.bind(":arrival", sampleGreenArrival.date);
+				query.bind(":attrids", attributes.bindableColumnArray(0, 32));
+				query.bind(":attrvals", attributes.bindableQuotedColumnArray(1, 0));
+				query.exec();
+				query.next();
+				var greenId = query.value(0);
+				query.prepare("INSERT INTO items (id, name, reference, unit, quantity, category) VALUES (DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Roasted Sample') RETURNING id");
+				query.bind(":name", sampleGreenName.text + " Roasted Sample");
+				query.exec();
+				query.next();
+				var roastedId = query.value(0);
+				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES (:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
+				query.bind(":time", roastTime.text);
+				query.bind(":unroastedids", "{" + greenId + "}");
+				query.bind(":greens", "{" + convertToPounds(parseFloat(sampleGreenWeight.text), sampleGreenUnit.currentText) + "}");
+				query.bind(":green", convertToPounds(parseFloat(sampleGreenWeight.text), sampleGreenUnit.currentText));
+				query.bind("roastedid", Number(roastedId));
+				query.bind("roasted", convertToPounds(parseFloat(roastedWeight.text), sampleGreenUnit.currentText));
+				query.bind(":note", notes.plainText);
+				query.bind(":machine", Number(selectedRoasterID));
+				query.bind(":duration", roastDuration.text);
+				query.bind(":files", "{" + fileID + "}");
+				query.exec();
+			} else {
+				/* Production roast */
+			}
+			query = query.invalidate();
+			window.close();
+		}
+		var submit = findChildObject(this, 'submit');
+		submit.clicked.connect(function() {
+			if(validateInputs()) {
+				doSubmit();
+			}
+		});
+	]]>
+	</program>
+</window>

config/Windows/navigation.xml

@@ -13,6 +13,11 @@
                 <button name="Roast Coffee" id="roast" type="push" />
             </column>
         </row>
+		<row>
+			<column>
+				<button name="Manual Roasting Log Entry" id="manual" type="push" />
+			</column>
+		</row>
         <row>
             <column>
                 <button name="Purchase Green Coffee" id="green" type="push" />
@@ -87,6 +92,10 @@
             QSettings.setValue("database/user", "");
             QSettings.setValue("database/password", "");
         });
+		var manual = findChildObject(this, 'manual');
+		manual.clicked.connect(function() {
+			createWindow("manualLogEntry");
+		});
         var profilehistory = findChildObject(this, 'profilehistory');
         profilehistory.clicked.connect(function() {
                 createWindow("profilehistory");

config/Windows/newbatch.xml

@@ -1,4 +1,7 @@
 <window id="batchWindow">
+	<menu name="File">
+		<item id="print" shortcut="Ctrl+P">Print...</item>
+	</menu>
     <menu name="Batch">
         <item id="new" shortcut="Ctrl+N">New Batch...</item>
     </menu>
@@ -81,6 +84,13 @@
             </layout>
             <stretch />
         </layout>
+		<layout type="vertical">
+			<webview id="batchTag" />
+			<layout type="horizontal">
+				<printerselector id="printerlist" />
+				<button name="Print" id="printbutton" type="push" />
+			</layout>
+		</layout>
     </layout>
     <program>
         <![CDATA[
@@ -111,6 +121,7 @@
             roastwt.maximumWidth = 80;
             var scalesLayout = findChildObject(this, 'scales');
             scalesLayout.spacing = 10;
+			var batchTag = findChildObject(this, 'batchTag');
             if(navigationwindow.loggingWindow.scales.length > 0) {
                 for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
                     var scale = navigationwindow.loggingWindow.scales[i];
@@ -382,8 +393,8 @@
                     lossspec.text = "";
                     specnotes.plainText = "";
                 }
-                roastestimate.text = "";
                 query = query.invalidate();
+				drawTag();
             });
             var validateCapacity = function() {
                 if(checkCapacity == "true") {
@@ -559,6 +570,7 @@
                 filenofield.text = query.value(0);
                 var file = new QFile(batch.tempData);
                 file.remove();
+				drawTag();
             }
             var doSubmit = function() {
                 checkQuery = new QSqlQuery();
@@ -619,6 +631,72 @@
                 batch.windowModified = false;
                 batch.close();
             }
+			function drawTag() {
+				var buffer = new QBuffer;
+                buffer.open(3);
+                var output = new XmlWriter(buffer);
+                output.writeStartDocument("1.0");
+                output.writeDTD('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg.dtd">');
+                output.writeStartElement("html");
+                output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
+				output.writeStartElement("head");
+				var styleFile = new QFile(QSettings.value("config") + "/Scripts/batchtag.css");
+				styleFile.open(1);
+				output.writeTextElement("style", styleFile.readToString());
+				styleFile.close();
+				output.writeStartElement("script");
+				scriptFile = new QFile(QSettings.value("config") + "/Scripts/qrcode.js");
+				scriptFile.open(1);
+				output.writeCDATA(scriptFile.readToString());
+				scriptFile.close();
+				output.writeEndElement();
+				output.writeEndElement();
+                output.writeStartElement("body");
+				output.writeStartElement("h1");
+				output.writeCharacters(roasted.currentText);
+				output.writeEndElement();
+				output.writeTextElement("span", "Roasted at: " + timefield.text);
+				output.writeTextElement("span", "On machine: " + machine.text);
+				output.writeTextElement("span", "Batch file: " + filenofield.text);
+				output.writeStartElement("div");
+				output.writeAttribute("id", "container");
+				output.writeEndElement();
+				output.writeStartElement("script");
+				var tag = {g: "Typica", m: Number(selectedRoasterID), v: 1};
+				if(timefield.text.length > 0) {
+					tag.t = timefield.text;
+				}
+				if(filenofield.text.length > 0) {
+					tag.f = Number(filenofield.text);
+				}
+				var scriptData = 'var width = document.getElementById("container").offsetWidth;';
+				scriptData += 'var qrcode = new QRCode({content: \'';
+				scriptData += JSON.stringify(tag);
+				scriptData += '\', width: width, height: width});';
+				scriptData += 'var svg = qrcode.svg();';
+				scriptData += 'document.getElementById("container").innerHTML = svg;';
+				output.writeCDATA(scriptData);
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndDocument();
+                batchTag.setContent(buffer);
+                buffer.close();
+			};
+			drawTag();
+			var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                batchTag.print();
+            });
+			var printers = findChildObject(this, 'printerlist');
+			printers.currentIndex = printers.findText(QSettings.value("script/batchtagprinter"));
+			printers['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/batchtagprinter", printers.currentText);
+            });
+			var printbutton = findChildObject(this, 'printbutton');
+			printbutton.clicked.connect(function() {
+				batchTag.print(printers.currentText);
+			});
         ]]>
     </program>
 </window>

config/Windows/newsamplebatch.xml

@@ -132,7 +132,7 @@
 			newMenu.triggered.connect(function() {
 				createWindow("sampleRoastingBatch");
 			});
-                        this.endBatch = function() {};
+            this.endBatch = function() {};
 			var batch = this;
 			batch.submitButton = submit;
 			var name = findChildObject(this, 'name');
@@ -180,27 +180,27 @@
 			stop.clicked.connect(function() {
 				submit.setEnabled(true);
 			});
-                        var validateCapacity = function() {
-                            if(checkCapacity == "true") {
-                                if(convertToPounds(parseFloat(green.text), GunitBox.currentText) > poundsCapacity) {
-                                    return false;
-                                }
-                            }
-                            return true;
-                        }
-                        roastButton.clicked.connect(function() {
-                            var proceed = false;
-                            if(validateCapacity()) {
-                                proceed = true;
-                            } else {
-                                proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
+            var validateCapacity = function() {
+                if(checkCapacity == "true") {
+                    if(convertToPounds(parseFloat(green.text), GunitBox.currentText) > poundsCapacity) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            roastButton.clicked.connect(function() {
+                var proceed = false;
+                if(validateCapacity()) {
+                    proceed = true;
+                } else {
+                    proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
                                 TTR("sampleRoastingBatch", "Entered green coffee weight exceeds maximum batch size. Continue?"));
-                            }
-                            if(proceed) {
-                                doRoast();
-                            }
-                        });
-                        var doRoast = function() {
+                }
+                if(proceed) {
+                    doRoast();
+                }
+                });
+                var doRoast = function() {
 				var lc = 1;
 				currentBatchInfo = batch;
 				query = new QSqlQuery();
@@ -271,19 +271,19 @@
 			var vendor = findChildObject(this, 'vendor');
 			var attributes = findChildObject(this, 'attributes');
 			var target = findChildObject(this, 'target');
-                        submit.clicked.connect(function() {
-                            var proceed = false;
-                            if(validateCapacity()) {
-                                proceed = true;
-                            } else {
-                                proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
+            submit.clicked.connect(function() {
+                var proceed = false;
+                if(validateCapacity()) {
+                    proceed = true;
+                } else {
+                    proceed = displayWarning(TTR("sampleRoastingBatch", "Suspicious Input"),
                                 TTR("sampleRoastingBatch", "Entered green coffee weight exceeds maximum batch size. Continue?"));
-                            }
-                            if(proceed) {
-                                doSubmit();
-                            }
-                        });
-                        var doSubmit = function() {
+                }
+                if(proceed) {
+                    doSubmit();
+                }
+            });
+            var doSubmit = function() {
 				query = new QSqlQuery();
 				query.prepare("INSERT INTO files (id, name, type, note, file) VALUES(DEFAULT, :name, 'profile', NULL, :data) RETURNING id");
 				query.bind(":name", timefield.text + " " + name.text + " " + profileName.currentText);

config/config.xml

@@ -33,6 +33,7 @@
     <include src="Windows/newsamplebatch.xml" />
     <include src="Windows/editreminder.xml" />
     <include src="Windows/roastspec.xml" />
+	<include src="Windows/manuallogentry.xml" />
     <program>
         <![CDATA[
             Windows = new Object();

src/Typica.pro

@@ -26,7 +26,8 @@ HEADERS += moc_typica.cpp \
     scale.h \
     draglabel.h \
     daterangeselector.h \
-    licensewindow.h
+    licensewindow.h \
+    printerselector.h
 SOURCES += typica.cpp \
     helpmenu.cpp \
     abouttypica.cpp \
@@ -36,7 +37,8 @@ SOURCES += typica.cpp \
     scale.cpp \
     draglabel.cpp \
     daterangeselector.cpp \
-    licensewindow.cpp
+    licensewindow.cpp \
+    printerselector.cpp
 
 RESOURCES += \
     resources.qrc

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*275:*/
+/*287:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*276:*/
+/*288:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 6595 "./typica.w"
+#line 6769 "./typica.w"
 
-/*:276*/
+/*:288*/
 #line 36 "./abouttypica.w"
 
 
-/*:275*/
+/*:287*/

src/abouttypica.h

@@ -1,4 +1,4 @@
-/*274:*/
+/*286:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
 
 #endif
 
-/*:274*/
+/*:286*/

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*666:*/
+/*694:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*668:*/
+/*696:*/
 #line 117 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:668*//*669:*/
+/*:696*//*697:*/
 #line 165 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:669*//*670:*/
+/*:697*//*698:*/
 #line 174 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:670*//*671:*/
+/*:698*//*699:*/
 #line 191 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:671*/
+/*:699*/
 #line 81 "./daterangeselector.w"
 
-/*672:*/
+/*700:*/
 #line 209 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*673:*/
+/*701:*/
 #line 238 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:673*/
+/*:701*/
 #line 219 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:672*//*674:*/
+/*:700*//*702:*/
 #line 321 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:674*//*675:*/
+/*:702*//*703:*/
 #line 338 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:675*//*676:*/
+/*:703*//*704:*/
 #line 349 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:676*//*677:*/
+/*:704*//*705:*/
 #line 364 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:677*//*678:*/
+/*:705*//*706:*/
 #line 406 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:678*//*679:*/
+/*:706*//*707:*/
 #line 414 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:679*//*680:*/
+/*:707*//*708:*/
 #line 434 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:680*//*681:*/
+/*:708*//*709:*/
 #line 444 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,7 +317,7 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:681*/
+/*:709*/
 #line 82 "./daterangeselector.w"
 
 
@@ -327,4 +327,4 @@ quickSelector->removeItem(index);
 #endif
 #endif
 
-/*:666*/
+/*:694*/

src/daterangeselector.h

@@ -1,4 +1,4 @@
-/*665:*/
+/*693:*/
 #line 30 "./daterangeselector.w"
 
 
@@ -9,7 +9,7 @@
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*667:*/
+/*695:*/
 #line 93 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
 QPushButton*applyButton;
 };
 
-/*:667*/
+/*:695*/
 #line 39 "./daterangeselector.w"
 
 
@@ -62,4 +62,4 @@ int lastIndex;
 
 #endif
 
-/*:665*/
+/*:693*/

src/draglabel.cpp

@@ -1,4 +1,4 @@
-/*1014:*/
+/*1039:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
 }
 }
 
-/*:1014*/
+/*:1039*/

src/draglabel.h

@@ -1,4 +1,4 @@
-/*1013:*/
+/*1038:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
 
 #endif
 
-/*:1013*/
+/*:1038*/

src/graphsettings.w

@@ -62,6 +62,10 @@ class GraphSettingsRelativeTab : public QWidget@/
 @ The constructor sets up the interface and restores any previous values from
 settings.
 
+The default grid line position has been updated since version 1.8 to match the
+number of grid lines present when viewing the graph in Fahrenheit and to
+present a slightly wider range where most measurements are expected.
+
 @<GraphSettingsWidget implementation@>=
 GraphSettingsRelativeTab::GraphSettingsRelativeTab() : QWidget(NULL),
 	colorEdit(new QLineEdit)
@@ -101,7 +105,7 @@ GraphSettingsRelativeTab::GraphSettingsRelativeTab() : QWidget(NULL),
 	QHBoxLayout *axisLayout = new QHBoxLayout;
 	QLabel *axisLabel = new QLabel(tr("Grid line positions (comma separated):"));
 	QLineEdit *axisEdit = new QLineEdit;
-	axisEdit->setText(settings.value("settings/graph/relative/grid", "-300, -100, -10, 0, 10, 30, 50").toString());
+	axisEdit->setText(settings.value("settings/graph/relative/grid", "-300, -100, 0, 30, 65, 100").toString());
 	updateAxisSetting(axisEdit->text());
 	connect(axisEdit, SIGNAL(textChanged(QString)), this, SLOT(updateAxisSetting(QString)));
 	axisLayout->addWidget(axisLabel);

src/helpmenu.cpp

@@ -1,11 +1,11 @@
-/*204:*/
+/*207:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*205:*/
+/*208:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
 #endif
 }
 
-/*:205*//*206:*/
+/*:208*//*209:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-/*:206*//*207:*/
+/*:209*//*210:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4775 "./typica.w"
+#line 4826 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:207*/
+/*:210*/
 #line 41 "./helpmenu.w"
 
 
-/*:204*/
+/*:207*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*203:*/
+/*206:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -18,4 +18,4 @@ void displayLicenseWindow();
 
 #endif
 
-/*:203*/
+/*:206*/

src/licensewindow.cpp

@@ -1,7 +1,7 @@
-/*209:*/
+/*212:*/
 #line 36 "./licensewindow.w"
 
-/*213:*/
+/*216:*/
 #line 97 "./licensewindow.w"
 
 #include "licensewindow.h"
@@ -11,12 +11,12 @@
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4777 "./typica.w"
+#line 4828 "./typica.w"
 
-/*:213*/
+/*:216*/
 #line 37 "./licensewindow.w"
 
-/*210:*/
+/*213:*/
 #line 43 "./licensewindow.w"
 
 LicenseWindow::LicenseWindow()
@@ -25,7 +25,7 @@ LicenseWindow::LicenseWindow()
 QSplitter*split= new QSplitter;
 QListWidget*projects= new QListWidget;
 
-/*212:*/
+/*215:*/
 #line 79 "./licensewindow.w"
 
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
@@ -43,7 +43,7 @@ item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextseria
 item= new QListWidgetItem("Qt",projects);
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
 
-/*:212*/
+/*:215*/
 #line 50 "./licensewindow.w"
 
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -54,7 +54,7 @@ split->addWidget(view);
 setCentralWidget(split);
 }
 
-/*:210*//*211:*/
+/*:213*//*214:*/
 #line 64 "./licensewindow.w"
 
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
@@ -62,8 +62,8 @@ void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
 view->load(current->data(Qt::UserRole).toUrl());
 }
 
-/*:211*/
+/*:214*/
 #line 38 "./licensewindow.w"
 
 
-/*:209*/
+/*:212*/

src/licensewindow.h

@@ -1,4 +1,4 @@
-/*208:*/
+/*211:*/
 #line 13 "./licensewindow.w"
 
 #include <QMainWindow> 
@@ -21,4 +21,4 @@ QWebView*view;
 
 #endif
 
-/*:208*/
+/*:211*/

src/moc_typica.cpp

@@ -3096,6 +3096,80 @@ int ReportTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     }
     return _id;
 }
+static const uint qt_meta_data_PluginAction[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      14,   13,   13,   13, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_PluginAction[] = {
+    "PluginAction\0\0runScript()\0"
+};
+
+void PluginAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        PluginAction *_t = static_cast<PluginAction *>(_o);
+        switch (_id) {
+        case 0: _t->runScript(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData PluginAction::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject PluginAction::staticMetaObject = {
+    { &QAction::staticMetaObject, qt_meta_stringdata_PluginAction,
+      qt_meta_data_PluginAction, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &PluginAction::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *PluginAction::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *PluginAction::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_PluginAction))
+        return static_cast<void*>(const_cast< PluginAction*>(this));
+    return QAction::qt_metacast(_clname);
+}
+
+int PluginAction::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QAction::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 1)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 1;
+    }
+    return _id;
+}
 static const uint qt_meta_data_FormArray[] = {
 
  // content:
@@ -6283,7 +6357,7 @@ static const uint qt_meta_data_ModbusNG[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       7,   14, // methods
+       9,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -6294,22 +6368,24 @@ static const uint qt_meta_data_ModbusNG[] = {
       10,    9,    9,    9, 0x08,
       28,    9,    9,    9, 0x08,
       38,    9,    9,    9, 0x08,
+      54,    9,    9,    9, 0x08,
 
  // methods: signature, parameters, type, tag, flags
-      58,    9,   54,    9, 0x02,
-      81,    9,   73,    9, 0x02,
-     104,    9,   73,    9, 0x02,
-     135,    9,  130,    9, 0x02,
+      77,    9,   73,    9, 0x02,
+     100,    9,   92,    9, 0x02,
+     123,    9,   92,    9, 0x02,
+     154,    9,  149,    9, 0x02,
+     175,    9,   92,    9, 0x02,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_ModbusNG[] = {
     "ModbusNG\0\0sendNextMessage()\0timeout()\0"
-    "dataAvailable()\0int\0channelCount()\0"
-    "QString\0channelColumnName(int)\0"
-    "channelIndicatorText(int)\0bool\0"
-    "isChannelHidden(int)\0"
+    "dataAvailable()\0rateLimitTimeout()\0"
+    "int\0channelCount()\0QString\0"
+    "channelColumnName(int)\0channelIndicatorText(int)\0"
+    "bool\0isChannelHidden(int)\0channelType(int)\0"
 };
 
 void ModbusNG::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -6321,14 +6397,17 @@ void ModbusNG::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         case 0: _t->sendNextMessage(); break;
         case 1: _t->timeout(); break;
         case 2: _t->dataAvailable(); break;
-        case 3: { int _r = _t->channelCount();
+        case 3: _t->rateLimitTimeout(); break;
+        case 4: { int _r = _t->channelCount();
             if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
-        case 4: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
+        case 5: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
-        case 5: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
+        case 6: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
-        case 6: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
+        case 7: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
+        case 8: { QString _r = _t->channelType((*reinterpret_cast< int(*)>(_a[1])));
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
         default: ;
         }
     }
@@ -6366,9 +6445,9 @@ int ModbusNG::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 7)
+        if (_id < 9)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 7;
+        _id -= 9;
     }
     return _id;
 }
@@ -7350,19 +7429,20 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       2,   14, // methods
+       3,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   24, // constructors
+       1,   29, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       30,   23,   22,   22, 0x08,
       60,   22,   22,   22, 0x08,
+      80,   22,   22,   22, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-      92,   80,   22,   22, 0x0e,
+     106,   94,   22,   22, 0x0e,
 
        0        // eod
 };
@@ -7370,7 +7450,8 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
 static const char qt_meta_stringdata_TranslationConfWidget[] = {
     "TranslationConfWidget\0\0column\0"
     "updateMatchingColumn(QString)\0"
-    "updateTemperature()\0model,index\0"
+    "updateTemperature()\0updateDelay()\0"
+    "model,index\0"
     "TranslationConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
@@ -7387,6 +7468,7 @@ void TranslationConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c
         switch (_id) {
         case 0: _t->updateMatchingColumn((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         case 1: _t->updateTemperature(); break;
+        case 2: _t->updateDelay(); break;
         default: ;
         }
     }
@@ -7424,9 +7506,9 @@ int TranslationConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 2)
+        if (_id < 3)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 2;
+        _id -= 3;
     }
     return _id;
 }

src/plugins.w

@@ -0,0 +1,162 @@
+@** Simple Plugins.
+
+\noindent The original motivation for this feature is to provide a simple way
+to allow importing data from other data logging applications. The problem is
+that there are huge differences in the data formats exported by different
+applications, sometimes there are differences that depend on how the other
+application was configured which cannot be reliably determined in an automated
+fashion, and if a substantial number of import plugins were created, any given
+person using Typica would be unlikely to ever use most of them.
+
+Based on these concerns, I wanted something that would make it easy to create
+new import plugins without the need to create a new build of Typica every time,
+I wanted it to be relatively easy for people to modify example import plugins
+to suit the data they wanted to import, and I wanted it to be easy for people
+to hide plugins that they were not required.
+
+This is handled in a way similar to reports. A new directory is provided with
+the \pn{} configuration which contains files with script code. A menu item is
+available that will examine the files in that folder to populate its sub-menu.
+
+@<Process plugin item@>=
+QMenu *pluginMenu = new QMenu(menu);
+if(itemElement.hasAttribute("id"))
+{
+	pluginMenu->setObjectName(itemElement.attribute("id"));
+}
+if(itemElement.hasAttribute("title"))
+{
+	pluginMenu->setTitle(itemElement.attribute("title"));
+}
+if(itemElement.hasAttribute("src"))
+{
+	QSettings settings;
+	QString pluginDirectory = QString("%1/%2").
+		arg(settings.value("config").toString()).
+		arg(itemElement.attribute("src"));
+	QDir directory(pluginDirectory);
+	directory.setFilter(QDir::Files);
+	directory.setSorting(QDir::Name);
+	QStringList nameFilter;
+	nameFilter << "*.js";
+	directory.setNameFilters(nameFilter);
+	QFileInfoList pluginFiles = directory.entryInfoList();
+	for(int k = 0; k < pluginFiles.size(); k++)
+	{
+		PluginAction *pa = new PluginAction(pluginFiles.at(k), pluginMenu);
+		if(itemElement.hasAttribute("preRun"))
+		{
+			pa->setPreRun(itemElement.attribute("preRun"));
+		}
+		if(itemElement.hasAttribute("postRun"))
+		{
+			pa->setPostRun(itemElement.attribute("postRun"));
+		}
+		pluginMenu->addAction(pa);
+	}
+}
+menu->addMenu(pluginMenu);
+
+@ The sub-menu items are a subclass of |QAction| which holds all of the
+information needed to respond to its activation.
+
+@<Class declarations@>=
+class PluginAction : public QAction
+{
+	Q_OBJECT
+	Q_PROPERTY(QString preRun READ preRun WRITE setPreRun);
+	Q_PROPERTY(QString postRun READ postRun WRITE setPostRun);
+	public:
+		PluginAction(const QFileInfo &info, QObject *parent);
+		QString preRun();
+		QString postRun();
+	public slots:
+		void setPreRun(const QString &script);
+		void setPostRun(const QString &script);
+	private slots:
+		void runScript();
+	private:
+		QString pluginFile;
+		QString preRunScript;
+		QString postRunScript;
+};
+
+@ The constructor takes a |QFileInfo| and uses that to extract the path of the
+file used to respond to the action activation as well as the text that should
+be used in the menu text. It also takes a |QObject*| parent which should be the
+|QMenu| the |PluginAction| will be placed in.
+
+Everything interesting happens in |runScript()| which is called when the action
+is triggered.
+
+@<PluginAction implementation@>=
+PluginAction::PluginAction(const QFileInfo &info, QObject *parent) :
+	QAction(parent), preRunScript(""), postRunScript("")
+{
+	pluginFile = info.absoluteFilePath();
+	setText(info.baseName());
+	connect(this, SIGNAL(triggered()), this, SLOT(runScript()));
+}
+
+void PluginAction::runScript()
+{
+	QFile file(pluginFile);
+	if(file.open(QIODevice::ReadOnly))
+	{
+		QScriptEngine *engine = AppInstance->engine;
+		QScriptContext *context = engine->pushContext();
+		if(parent()->dynamicPropertyNames().contains("activationObject"))
+		{
+			QScriptValue activationObject =
+				parent()->property("activationObject").value<QScriptValue>();
+			context->setActivationObject(activationObject);
+		}
+		QString script(file.readAll());
+		QScriptValue retval = engine->evaluate(preRunScript + script + postRunScript, pluginFile);
+		if(engine->hasUncaughtException())
+		{
+			qDebug() << "Uncaught exception: " <<
+				engine->uncaughtException().toString() <<
+				" in " << pluginFile << " line: " <<
+				engine->uncaughtExceptionLineNumber();
+		}
+		engine->popContext();
+		file.close();
+	}
+}
+
+@ Pre-run and post-run scripts can be set to handle boilerplate that would
+otherwise need to be included in all plugins.
+
+@<PluginAction implementation@>=
+QString PluginAction::preRun()
+{
+	return preRunScript;
+}
+
+QString PluginAction::postRun()
+{
+	return postRunScript;
+}
+
+void PluginAction::setPreRun(const QString &script)
+{
+	preRunScript = script;
+}
+
+void PluginAction::setPostRun(const QString &script)
+{
+	postRunScript = script;
+}
+
+@ In order to get the activation object in this way, we need to allow a
+|QScriptValue| to be stored in a |QVariant|.
+
+@<Class declarations@>=
+Q_DECLARE_METATYPE(QScriptValue)
+
+@ This is added to the list of class implementations.
+
+@<Class implementations@>=
+@<PluginAction implementation@>
+

src/printerselector.cpp

@@ -0,0 +1,22 @@
+/*590:*/
+#line 45 "./printerselector.w"
+
+#include "printerselector.h"
+
+/*591:*/
+#line 53 "./printerselector.w"
+
+PrinterSelector::PrinterSelector():QComboBox(NULL)
+{
+QList<QPrinterInfo> printers= QPrinterInfo::availablePrinters();
+foreach(QPrinterInfo info,printers)
+{
+addItem(info.printerName());
+}
+}
+
+/*:591*/
+#line 48 "./printerselector.w"
+
+
+/*:590*/

src/printerselector.h

@@ -0,0 +1,19 @@
+/*588:*/
+#line 22 "./printerselector.w"
+
+#include <QPrinterInfo> 
+#include <QComboBox> 
+
+#ifndef TypicaPrinterSelectorHeader
+#define TypicaPrinterSelectorHeader
+
+class PrinterSelector:public QComboBox
+{
+Q_OBJECT
+public:
+PrinterSelector();
+};
+
+#endif
+
+/*:588*/

src/printerselector.w

@@ -0,0 +1,116 @@
+@* Saved Printers.
+
+\noindent In most cases it's best to handle printing in a way that is common
+across many applications. Put a Print menu option in a File menu, bring up the
+platform's standard print dialog, and allow people to take full advantage of
+the flexibility this provides.
+
+In more specialized use cases, however, it may make more sense to provide
+faster access to a printer that might not be the default printer for that
+computer. The first use in Typica where this makes sense is in printing tags
+that can follow the coffee and uniquely identify that batch. Using a full sheet
+of paper for this might be excessive and time consuming. Instead, it might make
+sense to get a small, inexpensive thermal receipt printer to keep at the
+roaster. If this were not the default printer, it would quickly become tedious
+to bring up the print dialog and change the selected printer after every batch.
+
+In cases like this, it would be better to provide a combo box in the window
+where a printer can be selected and remembered as the default printer just for
+that particular use, and allowing people to print directly to that printer
+without going through extra steps.
+
+@(printerselector.h@>=
+#include <QPrinterInfo>
+#include <QComboBox>
+
+#ifndef TypicaPrinterSelectorHeader
+#define TypicaPrinterSelectorHeader
+
+class PrinterSelector : public QComboBox@/
+{
+	@[Q_OBJECT@]@;
+	public:
+		PrinterSelector();
+};
+
+#endif
+
+@ The main file also requires this header.
+
+@<Header files to include@>=
+#include "printerselector.h"
+
+@ Implementation of this class is in a separate file.
+
+@(printerselector.cpp@>=
+#include "printerselector.h"
+
+@<PrinterSelector implementation@>@;
+
+@ The constructor looks at the list of available printers and populates itself
+with these.
+
+@<PrinterSelector implementation@>=
+PrinterSelector::PrinterSelector() : QComboBox(NULL)
+{
+	QList<QPrinterInfo> printers = QPrinterInfo::availablePrinters();
+	foreach(QPrinterInfo info, printers)
+	{
+		addItem(info.printerName());
+	}
+}
+
+@ The host environment is informed of this class in the usual way starting with
+a constructor function prototype. Another prototype is also needed for adding
+this to a layout from XML.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructPrinterSelector(QScriptContext *context,
+                                      QScriptEngine *engine);
+void addPrinterSelectorToLayout(QDomElement element,
+                                QStack<QWidget *> *widgetStack,
+                                QStack<QLayout *> *layoutStack);
+
+@ The engine is informed of this function.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructPrinterSelector);
+engine->globalObject().setProperty("PrinterSelector", constructor);
+
+@ There is nothing special about the constructor. If there were additional
+properties needed beyond those supplied by |setQComboBoxProperties()| it would
+make sense to add another function to the chain for setting script value
+properties.
+
+@<Functions for scripting@>=
+QScriptValue constructPrinterSelector(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new PrinterSelector);
+	setQComboBoxProperties(object, engine);
+	return object;
+}
+
+@ It should also be possible to add this to a layout from the XML portion of
+the configuration document.
+
+@<Functions for scripting@>=
+void addPrinterSelectorToLayout(QDomElement element, QStack<QWidget *> *,
+                                QStack<QLayout *> *layoutStack)
+{
+	PrinterSelector *selector = new PrinterSelector;
+	if(element.hasAttribute("id"))
+	{
+		selector->setObjectName(element.attribute("id"));
+	}
+	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+	layout->addWidget(selector);
+}
+
+@ This is added in the usual way.
+
+@<Additional box layout elements@>=
+else if(currentElement.tagName() == "printerselector")
+{
+	addPrinterSelectorToLayout(currentElement, widgetStack, layoutStack);
+}
+

src/scale.cpp

@@ -1,4 +1,4 @@
-/*1020:*/
+/*1045:*/
 #line 135 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:1020*//*1021:*/
+/*:1045*//*1046:*/
 #line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*1022:*/
+/*1047:*/
 #line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1022*/
+/*:1047*/
 #line 165 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:1021*//*1023:*/
+/*:1046*//*1048:*/
 #line 224 "./scales.w"
 
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
 }
 }
 
-/*:1023*/
+/*:1048*/

src/scale.h

@@ -1,4 +1,4 @@
-/*1019:*/
+/*1044:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -29,4 +29,4 @@ QByteArray commandTerminator;
 
 #endif
 
-/*:1019*/
+/*:1044*/

src/typica.w

@@ -810,15 +810,25 @@ The first of these is |QObject|.
 
 @<Function prototypes for scripting@>=
 void setQObjectProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue QObject_setProperty(QScriptContext *context, QScriptEngine *engine);
 
-@ As there are no properties that need to be set for this class and as this
-class does not inherit any other class, nothing needs to be done in this method.
-It will, however, be called by subclasses in case this changes in the future.
+@ Attaching properties to a |QScriptValue| that wraps a |QObject| does not
+create a dynamic property on the underlying |QObject| by default. This can
+cause issues with certain interactions between script and native code. Rather
+than change every wrapper, we can instead expose a |setProperty()| method.
 
 @<Functions for scripting@>=
-void setQObjectProperties(QScriptValue, QScriptEngine *)
+void setQObjectProperties(QScriptValue value, QScriptEngine *engine)
 {
-    /* Nothing needs to be done here. */
+    value.setProperty("setProperty", engine->newFunction(QObject_setProperty));
+}
+
+QScriptValue QObject_setProperty(QScriptContext *context, QScriptEngine *)
+{
+	QObject *self = getself<QObject *>(context);
+	self->setProperty(argument<QString>(0, context).toUtf8().constData(),
+	                  argument<QVariant>(1, context));
+    return QScriptValue();
 }
 
 @ The same can be done for |QPaintDevice| and |QLayoutItem|.
@@ -1029,6 +1039,15 @@ considered depreciated.
 Version 1.6 adds a new property for handling the |windowModified| property
 such that an appropriate prompt is provided to confirm or cancel close events.
 
+Version 1.8 adds a new |setupFinished()| slot which is called after the
+initial |show()| at the end of window creation. This emits a |windowReady()|
+signal. Scripts can connect to this signal to perform tasks that must happen
+after the window has fully finished opening. The initial use for this is
+validating that all required configuration has been performed for a given
+window to be useful and, if not, immediately closing that. Without this, a
+call to |close()| in the script is reversed when the function creating the
+window calls |show()|.
+
 @<Class declarations@>=
 class ScriptQMainWindow : public QMainWindow@/
 {@t\1@>@/
@@ -1042,12 +1061,14 @@ class ScriptQMainWindow : public QMainWindow@/
         void saveSizeAndPosition(const QString &key);
         void restoreSizeAndPosition(const QString &key);
         void displayStatus(const QString &message = QString());
-        void setClosePrompt(QString prompt);@/
+        void setClosePrompt(QString prompt);
+        void setupFinished();@/
+    signals:@/
+        void aboutToClose(void);
+        void windowReady(void);@/
     protected:@/
         void closeEvent(QCloseEvent *event);
         void showEvent(QShowEvent *event);@/
-    signals:@/
-        void aboutToClose(void);@/
     private:@/
         QString cprompt;@t\2@>@/
 }@t\kern-3pt@>;
@@ -1108,6 +1129,11 @@ void ScriptQMainWindow::show()
     QMainWindow::show();
 }
 
+void ScriptQMainWindow::setupFinished()
+{
+	emit windowReady();
+}
+
 @ When a close event occurs, we check the |windowModified| property to
 determine if closing the window could result in loss of data. If this is
 true, we allow the event to be cancelled. Otherwise, a signal is emitted which
@@ -4367,6 +4393,9 @@ Starting with version 1.4, we check for a command line option with the path to
 the configuration file and load that instead of prompting for the information
 if possible.
 
+Starting with version 1.8, if there is not a -c argument, Typica will first
+search a small number of locations relative to the executable.
+
 @<Load the application configuration@>=
 QStringList arguments = QCoreApplication::arguments();
 int position = arguments.indexOf("-c");
@@ -4377,6 +4406,16 @@ if(position != -1)
     {
         filename = arguments.at(position + 1);
     }
+} else {
+	QDir checkPath(QCoreApplication::applicationDirPath() + "/../config/");
+	if(checkPath.exists("config.xml")) {
+		filename = checkPath.filePath("config.xml");
+	} else {
+		checkPath = QDir(QCoreApplication::applicationDirPath() + "/config/");
+		if(checkPath.exists("config.xml")) {
+			filename  = checkPath.filePath("config.xml");
+		}
+	}
 }
 if(filename.isEmpty())
 {
@@ -4401,6 +4440,8 @@ if(!filename.isEmpty())
     {
         app.configuration()->setContent(&file, true);
     }
+} else {
+	return 1;
 }
 @<Substitute included fragments@>@;
 
@@ -4571,6 +4612,8 @@ void addCalendarToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
                          QStack<QLayout *> *layoutStack);
 void addSpinBoxToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
                         QStack<QLayout *> *layoutStack);
+void addTimeEditToLayout(QDomElement element, QStack<QWidget *> *widgetStack,
+                         QStack<QLayout *> *layoutStack);
 
 @ The functions for creating windows must be made available to the scripting
 engine.
@@ -4679,6 +4722,7 @@ if(element.hasChildNodes())
 }
 @<Insert help menu@>@;
 window->show();
+window->setupFinished();
 
 @ Three element types make sense as top level children of a {\tt <window>}
 element. An element representing a layout element can be used to apply that
@@ -4802,6 +4846,10 @@ while(j < menuItems.count())
         {
             menu->addSeparator();
         }
+        else if(itemElement.tagName() == "plugins")
+        {
+	        @<Process plugin item@>@;
+        }
     }
     j++;
 }
@@ -4915,6 +4963,80 @@ void populateStackedLayout(QDomElement element, QStack<QWidget *> *widgetStack,
     }
 }
 
+@ A common use of stacked layouts is in the creation of tabbed interfaces, but
+there are also many uses in \pn{} where the tabs are not required. Therefore,
+tab bar creation requires a separate XML element.
+
+@<Additional box layout elements@>=
+else if(currentElement.tagName() == "tabbar")
+{
+	addTabBarToLayout(currentElement, widgetStack, layoutStack);
+}
+
+@ The function used to create this follows the usual pattern.
+
+@<Functions for scripting@>=
+void addTabBarToLayout(QDomElement element, QStack<QWidget*> *, QStack<QLayout*> *layoutStack)
+{
+	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+	QTabBar *widget = new QTabBar;
+	layout->addWidget(widget);
+	if(!element.attribute("id").isEmpty())
+	{
+		widget->setObjectName(element.attribute("id"));
+	}
+}
+
+@ Rather than define the tab set in XML, this is left to the host environment.
+This means that some additional scripting support is required.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructQTabBar);
+value = engine->newQMetaObject(&QTabBar::staticMetaObject, constructor);
+engine->globalObject().setProperty("QTabBar", value);
+
+@ The constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructQTabBar(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new QTabBar);
+	setQTabBarProperties(object, engine);
+	return object;
+}
+
+@ There are many functions that I might want to some day add support for, but
+the immediate need is just creating the tabs in the first place.
+
+@<Functions for scripting@>=
+void setQTabBarProperties(QScriptValue value, QScriptEngine *engine)
+{
+	setQWidgetProperties(value, engine);
+	value.setProperty("addTab", engine->newFunction(QTabBar_addTab));
+}
+
+QScriptValue QTabBar_addTab(QScriptContext *context, QScriptEngine *)
+{
+	QTabBar *self = getself<QTabBar *>(context);
+	if(context->argumentCount() > 0)
+	{
+		self->addTab(argument<QString>(0, context));
+	}
+	else
+	{
+		context->throwError("Incorrect number of arguments passed to "@|
+		                    "QTabBar::addTab().");
+	}
+	return QScriptValue();
+}
+
+@ Function prototypes are needed.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructQTabBar(QScriptContext *context, QScriptEngine *engine);
+void setQTabBarProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue QTabBar_addTab(QScriptContext *context, QScriptEngine *engine);
+
 @ Using a grid layout is a bit different from using a box layout. Child elements
 with various attributes are required to take full advantage of this layout type.
 All direct children of a grid layout element should be {\tt <row>} elements
@@ -5050,6 +5172,10 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack,
             {
                 addCalendarToLayout(currentElement, widgetStack, layoutStack);
             }
+            else if(currentElement.tagName() == "timeedit")
+            {
+	            addTimeEditToLayout(currentElement, widgetStack, layoutStack);
+            }
             else if(currentElement.tagName() == "decoration")
             {
                 addDecorationToLayout(currentElement, widgetStack,
@@ -6203,6 +6329,43 @@ QScriptValue QDateTimeEdit_month(QScriptContext *context,
 QScriptValue QDateTimeEdit_year(QScriptContext *context, QScriptEngine *engine);
 QScriptValue QDateTimeEdit_setToCurrentTime(QScriptContext *context, QScriptEngine *engine);
 
+@ Sometimes it can be useful to allow editing a time or duration value without
+a date field. For this, a |QTimeEdit| can be used.
+
+@<Functions for scripting@>=
+void addTimeEditToLayout(QDomElement element, QStack<QWidget *> *,@|
+                         QStack<QLayout *> *layoutStack)
+{
+	QTimeEdit *edit = new QTimeEdit;
+	if(element.hasAttribute("displayFormat"))
+	{
+		edit->setDisplayFormat(element.attribute("displayFormat"));
+	}
+	else
+	{
+		edit->setDisplayFormat("mm:ss.zzz");
+	}
+	if(element.hasAttribute("id"))
+	{
+		edit->setObjectName(element.attribute("id"));
+	}
+	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+	layout->addWidget(edit);
+}
+
+@ Additional properties are added as a |QTimeEdit| is a |QDateTimeEdit|.
+
+@<Functions for scripting@>=
+void setQTimeEditProperties(QScriptValue value, QScriptEngine *engine)
+{
+	setQDateTimeEditProperties(value, engine);
+}
+
+@ A function prototype is needed.
+
+@<Function prototypes for scripting@>=
+void setQTimeEditProperties(QScriptValue value, QScriptEngine *engine);
+
 @ In order to get to objects created from the XML description, it is necessary
 to provide a function that can be called to retrieve children of a given widget.
 When providing such an object to the script, it is necessary to determine the
@@ -6342,6 +6505,14 @@ else if(className == "QSvgWidget")
 {
     setQSvgWidgetProperties(value, engine);
 }
+else if(className == "QTabBar")
+{
+	setQTabBarProperties(value, engine);
+}
+else if(className == "PrinterSelector")
+{
+	setQComboBoxProperties(value, engine);
+}
 
 @ In the list of classes, the SaltTable entry is for a class which does not
 strictly exist on its own. It is, however, useful to provide some custom
@@ -9004,6 +9175,9 @@ space, but it is very fast and simple to code.
 Starting in version 1.4, column sizes are persisted automatically using the
 same method as described in the section on |SqlQueryView|.
 
+Starting in version 1.8, |rowCount()| is |Q_INVOKABLE|. This allows the manual
+log entry interface to easily determine if any roasting data exists to save.
+
 @<Class declarations@>=
 class MeasurementModel;@/
 class ZoomLog : public QTableView@/
@@ -9018,7 +9192,7 @@ class ZoomLog : public QTableView@/
     public:@/
         ZoomLog();
         QVariant data(int row, int column) const;
-        int rowCount();
+        @[Q_INVOKABLE@,@, int rowCount();
         bool saveXML(QIODevice *device);
         bool saveCSV(QIODevice *device);
         QString lastTime(int series);
@@ -9150,11 +9324,11 @@ annotation associated with it. The solution in this case is to synthesize
 measurements so that the |ZoomLog| thinks it gets at least one measurement
 every second.
 
-The current approach simply replicates the last measurement every second until
-the time for the most recent measurement is reached, however it would likely be
-better to interpolate values between the two most recent real measurements as
-this would match the graphic representation rather than altering it when later
-reviewing the batch.
+Prior to version 1.8 this simply replicated the last measurement every second
+until the time for the most recent measurement was reached, however this yields
+problematic results when loading saved data or attempting to use this view for
+manual data entry. The current behavior performs a linear interpolation which
+will match the graph.
 
 @<Synthesize measurements for slow hardware@>=
 if(lastMeasurement.contains(tempcolumn))
@@ -9162,14 +9336,23 @@ if(lastMeasurement.contains(tempcolumn))
     if(lastMeasurement[tempcolumn].time() < measure.time())
     {
         QList<QTime> timelist;
+        QList<double> templist;
+        QTime z = QTime(0, 0, 0, 0);
+        double ptime = (double)(z.secsTo(lastMeasurement[tempcolumn].time()));
+        double ptemp = lastMeasurement[tempcolumn].temperature();
+        double ctime = (double)(z.secsTo(measure.time()));
+        double ctemp = measure.temperature();
         for(QTime i = lastMeasurement.value(tempcolumn).time().addSecs(1); i < measure.time(); i = i.addSecs(1))
         {
             timelist.append(i);
+            double v = ((ptemp * (ctime - z.secsTo(i))) + (ctemp * (z.secsTo(i) - ptime))) / (ctime - ptime);
+            templist.append(v);
         }
         for(int i = 0; i < timelist.size(); i++)
         {
             Measurement synthesized = measure;
             synthesized.setTime(timelist[i]);
+            synthesized.setTemperature(templist[i]);
             newMeasurement(synthesized, tempcolumn);
         }
     }
@@ -12617,6 +12800,8 @@ void CSVOutput::setDevice(QIODevice *device)
 
 @i webview.w
 
+@i printerselector.w
+
 @* The Application class.
 
 The |Application| class represents the \pn{} program. It is responsible for
@@ -14346,6 +14531,8 @@ void setQTextEditProperties(QScriptValue value, QScriptEngine *engine)
     value.setProperty("print", engine->newFunction(QTextEdit_print));
 }
 
+@i plugins.w
+
 @i daterangeselector.w
 
 @** An area for repeated user interface elements.
@@ -15378,7 +15565,7 @@ class DeviceTreeModel : public QAbstractItemModel@/
         QModelIndex index(int row, int column,
                           const QModelIndex &parent = QModelIndex()) const;
         QModelIndex parent(const QModelIndex &child) const;
-        int rowCount(const QModelIndex &parent = QModelIndex()) const;
+        Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
         int columnCount(const QModelIndex &parent = QModelIndex()) const;
         bool setData(const QModelIndex &index, const QVariant &value,
                      int role);

src/units.cpp

@@ -1,10 +1,10 @@
-/*279:*/
+/*291:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:279*//*280:*/
+/*:291*//*292:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:280*//*281:*/
+/*:292*//*293:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
 return 0;
 }
 
-/*:281*//*282:*/
+/*:293*//*294:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
 return 0;
 }
 
-/*:282*//*283:*/
+/*:294*//*295:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:283*/
+/*:295*/

src/units.h

@@ -1,4 +1,4 @@
-/*278:*/
+/*290:*/
 #line 8 "./units.w"
 
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
 
 #endif
 
-/*:278*/
+/*:290*/

src/webelement.cpp

@@ -1,18 +1,18 @@
-/*573:*/
-#line 368 "./webview.w"
+/*586:*/
+#line 383 "./webview.w"
 
 #include "webelement.h"
 
-/*571:*/
-#line 311 "./webview.w"
+/*584:*/
+#line 326 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 {
 
 }
 
-/*:571*//*572:*/
-#line 320 "./webview.w"
+/*:584*//*585:*/
+#line 335 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 {
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:572*/
-#line 371 "./webview.w"
+/*:585*/
+#line 386 "./webview.w"
 
 
-/*:573*/
+/*:586*/

src/webelement.h

@@ -1,5 +1,5 @@
-/*566:*/
-#line 248 "./webview.w"
+/*579:*/
+#line 263 "./webview.w"
 
 #include <QWebElement> 
 #include <QObject> 
@@ -27,4 +27,4 @@ QWebElement e;
 
 #endif
 
-/*:566*/
+/*:579*/

src/webview.cpp

@@ -1,9 +1,9 @@
-/*551:*/
+/*563:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*552:*/
+/*564:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:552*//*553:*/
+/*:564*//*565:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*554:*/
+/*566:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:554*/
+/*:566*/
 #line 79 "./webview.w"
 
-/*555:*/
+/*567:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:555*/
+/*:567*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:553*//*556:*/
+/*:565*//*568:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -59,16 +59,6 @@ void TypicaWebView::load(const QString&url)
 QWebView::load(QUrl(url));
 }
 
-void TypicaWebView::print()
-{
-QPrinter*printer= new QPrinter(QPrinter::HighResolution);
-QPrintDialog printDialog(printer,NULL);
-if(printDialog.exec()==QDialog::Accepted)
-{
-QWebView::print(printer);
-}
-}
-
 void TypicaWebView::setHtml(const QString&html,const QUrl&baseUrl)
 {
 QWebView::setHtml(html,baseUrl);
@@ -88,8 +78,28 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:556*//*562:*/
-#line 205 "./webview.w"
+/*:568*//*569:*/
+#line 144 "./webview.w"
+
+void TypicaWebView::print(const QString&printerName)
+{
+QPrinter*printer= new QPrinter(QPrinter::HighResolution);
+if(!printerName.isEmpty())
+{
+printer->setPrinterName(printerName);
+printer->setFullPage(true);
+QWebView::print(printer);
+return;
+}
+QPrintDialog printDialog(printer,NULL);
+if(printDialog.exec()==QDialog::Accepted)
+{
+QWebView::print(printer);
+}
+}
+
+/*:569*//*575:*/
+#line 220 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 {
@@ -101,8 +111,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:562*/
+/*:575*/
 #line 53 "./webview.w"
 
 
-/*:551*/
+/*:563*/

src/webview.h

@@ -1,4 +1,4 @@
-/*550:*/
+/*562:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -20,7 +20,7 @@ Q_OBJECT
 public:
 TypicaWebView();
 Q_INVOKABLE void load(const QString&url);
-Q_INVOKABLE void print();
+Q_INVOKABLE void print(const QString&printerName= QString());
 Q_INVOKABLE void setHtml(const QString&html,const QUrl&baseUrl= QUrl());
 Q_INVOKABLE void setContent(QIODevice*device);
 Q_INVOKABLE QString saveXml();
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:550*/
+/*:562*/

src/webview.w

@@ -31,7 +31,7 @@ class TypicaWebView : public QWebView@/
 	public:@/
 		TypicaWebView();
 		@[Q_INVOKABLE@,@, void@]@, load(const QString &url);@t\2\2@>@/
-		@[Q_INVOKABLE@,@, void@]@, print();@t\2\2@>@/
+		@[Q_INVOKABLE@,@, void@]@, print(const QString &printerName = QString());@t\2\2@>@/
 		@[Q_INVOKABLE@,@, void@]@, setHtml(const QString &html, const QUrl &baseUrl = QUrl());@t\2\2@>@/
 		@[Q_INVOKABLE@,@, void@]@, setContent(QIODevice *device);@t\2\2@>@/
 		@[Q_INVOKABLE@,@, QString@]@, saveXml();@t\2\2@>@/
@@ -115,16 +115,6 @@ void TypicaWebView::load(const QString &url)
 	QWebView::load(QUrl(url));
 }
 
-void TypicaWebView::print()
-{
-	QPrinter *printer = new QPrinter(QPrinter::HighResolution);
-	QPrintDialog printDialog(printer, NULL);
-	if(printDialog.exec() == QDialog::Accepted)
-	{
-		QWebView::print(printer);
-	}
-}
-
 void TypicaWebView::setHtml(const QString &html, const QUrl &baseUrl)
 {
 	QWebView::setHtml(html, baseUrl);
@@ -144,6 +134,31 @@ QString TypicaWebView::saveXml()
 	return page()->currentFrame()->documentElement().toOuterXml();
 }
 
+@ Print functionality has been extended to allow an optional argument. If the
+name of a printer is passed in, the print dialog will be bypassed. Note that
+when bypassing the print dialog, page margins are set to 0. This is intentional
+as the use case is for printing to more specialized printers where default page
+margins are not appropriate and CSS can be customized to ensure that all
+information fits in the printable area with the assumption of no margin.
+
+@<TypicaWebView implementation@>=
+void TypicaWebView::print(const QString &printerName)
+{
+	QPrinter *printer = new QPrinter(QPrinter::HighResolution);
+	if(!printerName.isEmpty())
+	{
+		printer->setPrinterName(printerName);
+		printer->setFullPage(true);
+		QWebView::print(printer);
+		return;
+	}
+	QPrintDialog printDialog(printer, NULL);
+	if(printDialog.exec() == QDialog::Accepted)
+	{
+		QWebView::print(printer);
+	}
+}
+
 @ Web views are exposed to the host environment in the usual manner.
 
 @<Set up the scripting engine@>=