Merge branch 'release-1.8'

README

@@ -1,12 +1,9 @@
-Typica is a free cross platform application for recording, managing, and using
-common records generated in commercial specialty coffee roasting operations
-such as roast profiles and green coffee inventory records.
-
-Project web site: http://www.randomfield.com/programs/typica/
+Typica is a free cross platform application for coffee roasting operations.
+More information is available on the project web site: https://typica.us/
 
 Typica is free software released under the MIT license as follows:
 
-Copyright 2007-2016 Neal Evan Wilson
+Copyright 2007-2017 Neal Evan Wilson
 
 Permission is hereby granteed, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -54,4 +51,29 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
+
+Parts of Typica are from qrcode-svg which is also used under the MIT license
+as follows:
+
+The MIT License (MIT)
+
+Copyright (c) 2016 papnkukn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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,27 @@
+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");
+pluginContext.table.clearOutputColumns();
+pluginContext.table.addOutputTemperatureColumn(1);
+pluginContext.table.addOutputTemperatureColumn(2);
+pluginContext.table.addOutputControlColumn(3);
+pluginContext.table.addOutputControlColumn(4);
+pluginContext.table.addOutputAnnotationColumn(5);
+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/dailyproductiondetail.xml

@@ -307,19 +307,19 @@
 					output.writeEndElement();
 					output.writeEndElement();	
 					output.writeEndElement();
-                                        output.writeStartElement("td");
-                                        output.writeAttribute("colspan", "4");
-                                        if(query.value(14)) {
-                                            output.writeTextElement("strong", "Roast Specification Notes");
-                                            var specArray = query.value(14).split("\n");
-                                            for(var i = 0; i < noteArray.length; i++) {
-                                                output.writeStartElement("p");
-                                                output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
-                                                output.writeCharacters(specArray[i]);
-                                                output.writeEndElement();
-                                            }                                            
-                                        }
-                                        output.writeEndElement();
+                    output.writeStartElement("td");
+                    output.writeAttribute("colspan", "4");
+                    if(query.value(14)) {
+                        output.writeTextElement("strong", "Roast Specification Notes");
+                        var specArray = query.value(14).split("\n");
+                        for(var i = 0; i < specArray.length; i++) {
+                            output.writeStartElement("p");
+                            output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                            output.writeCharacters(specArray[i]);
+                            output.writeEndElement();
+                        }                                            
+                    }
+                    output.writeEndElement();
 					output.writeEndElement();
 				}
 				output.writeEndElement();

config/Reports/greenforroasted.xml

@@ -0,0 +1,117 @@
+<window id="greenforroasted">
+    <reporttitle>Production:->Green Coffees Used for Roasted Coffees</reporttitle>
+    <layout type="vertical">
+        <layout type="horizontal">
+            <daterange id="dates" initial="19" /><!-- Year to Date -->
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print...</item>
+    </menu>
+    <program>
+        <![CDATA[
+            this.windowTitle = TTR("greenforroasted", "Typica - Green Coffees Used for Roasted Coffees");
+            var report = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                report.print();
+            });
+            var dateSelect = findChildObject(this, 'dates');
+            var dateQuery = new QSqlQuery;
+            dateQuery.exec("SELECT time::date FROM transactions WHERE time = (SELECT min(time) FROM transactions) OR time = (SELECT max(time) FROM transactions) ORDER BY time ASC");
+            dateQuery.next();
+            var lifetimeStartDate = dateQuery.value(0);
+            var lifetimeEndDate;
+            if(dateQuery.next()) {
+                lifetimeEndDate = dateQuery.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateQuery = dateQuery.invalidate();
+            dateSelect.rangeUpdated.connect(refresh);
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("greenforroasted", "Kg"));
+            unitBox.addItem(TTR("greenforroasted", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
+            function refresh() {
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                var conversion = 1;
+                var unitText = TTR("greensales", "Lb");
+                if(unitBox.currentIndex == 0) {
+                    conversion = 2.2;
+                    unitText = TTR("greensales", "Kg");
+                }
+                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");
+                output.writeTextElement("title", TTR("greenforroasted", "Green Coffees Used for Roasted Coffees"));
+                output.writeEndElement(); //head
+                output.writeStartElement("body");
+                output.writeTextElement("h1", TTR("greenforroasted", "Green Coffees Used for Roasted Coffees ") + startDate + "-" + endDate);
+                output.writeStartElement("ul");
+                var query = new QSqlQuery();
+                query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, (SELECT name FROM items WHERE id = roasted_id) AS rname, generate_subscripts(unroasted_id, 1) AS s, sum(roasted_quantity)/:c1 AS rq, min(time)::date, max(time)::date FROM roasting_log WHERE time >= :sd1 AND time < :ed1 ::date + interval '1 day' GROUP BY roasted_id, unroasted_id) SELECT q.*, (SELECT name FROM items WHERE id = unroasted_id[q.s]) || ' (' || unroasted_id[q.s] || ')' AS gname, (SELECT SUM(unroasted_quantity[q.s])/:c2 AS gq FROM roasting_log WHERE roasted_id = q.roasted_id AND unroasted_id = q.unroasted_id AND time >= :sd2 AND time < :ed2 ::date + interval '1 day') FROM q ORDER BY q.rname ASC, min ASC");
+                query.bind(":sd1", startDate);
+                query.bind(":sd2", startDate);
+                query.bind(":ed1", endDate);
+                query.bind(":ed2", endDate);
+                query.bind(":c1", conversion);
+                query.bind(":c2", conversion);
+                query.exec();
+                var prevRid = -1;
+                var prevGid = "";
+                var first = true;
+                while(query.next()) {
+                    if(query.value(0) != prevRid) { // New roasted item
+                        if(!first) {
+                            output.writeEndElement(); //ul from previous roasted item
+                            output.writeEndElement(); //ul from previous roasted item
+                        } else {
+                            first = false;
+                        }
+                        output.writeTextElement("li", query.value(2) + " (" + query.value(0) + ")");
+                        output.writeStartElement("ul");
+                        output.writeTextElement("li", query.value(4) + " " + unitText + " roasted between " + query.value(5) + " and " + query.value(6) + " with:");
+                        output.writeStartElement("ul");
+                        output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
+                    }
+                    else { // Same roasted item
+                        if(query.value(1) != prevGid) { // New set of greens
+                            output.writeEndElement(); //ul
+                            output.writeTextElement("li", query.value(4) + " " + unitText + " roasted between " + query.value(5) + " and " + query.value(6) + " with:");
+                            output.writeStartElement("ul");
+                            output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
+                        } else { // Same set of greens
+                            output.writeTextElement("li", query.value(8) + " " + unitText + " of " + query.value(7));
+                        }
+                    }
+                    prevRid = query.value(0);
+                    prevGid = query.value(1);
+                }
+                output.writeEndElement(); //ul
+                output.writeEndElement(); //body
+                output.writeEndElement(); //html
+                output.writeEndDocument();
+                report.setContent(buffer);
+                buffer.close();
+            }
+            refresh();
+        ]]>
+    </program>
+</window>

config/Reports/invchange.xml

@@ -66,7 +66,7 @@
 					unitText = TTR("invchange", "Kg");
 				}
 				var query = new QSqlQuery();
-					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id) AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity) AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost, (SELECT sum(quantity)/:c6 FROM purchase WHERE item = id) AS total_purchase FROM q ORDER BY name";
+                                var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, COALESCE((SELECT sum(quantity) FROM loss WHERE item = id AND time >= :sd8 AND time < :ed8 ::date + interval '1 day'), 0)/:c14 AS loss, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id) AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd9 ::date)) <> 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - loss - quantity) AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, loss * unit_cost * :c15 AS loss_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - loss - quantity) * unit_cost * :c13 AS adjustment_cost, (SELECT sum(quantity)/:c6 FROM purchase WHERE item = id) AS total_purchase FROM q ORDER BY name";
 				query.prepare(q);
 				query.bind(":sd1", startDate);
 				query.bind(":sd2", startDate);
@@ -74,13 +74,15 @@
 				query.bind(":sd4", startDate);
 				query.bind(":sd6", startDate);
 				query.bind(":sd7", startDate);
+                                query.bind(":sd8", startDate);
+                                query.bind(":sd9", startDate);
 				query.bind(":ed1", endDate);
 				query.bind(":ed2", endDate);
 				query.bind(":ed3", endDate);
 				query.bind(":ed4", endDate);
 				query.bind(":ed5", endDate);
-				query.bind(":ed6", endDate);
 				query.bind(":ed7", endDate);
+                                query.bind(":ed8", endDate);
 				query.bind(":c1", conversion);
 				query.bind(":c2", conversion);
 				query.bind(":c3", conversion);
@@ -93,6 +95,8 @@
 				query.bind(":c11", conversion);
 				query.bind(":c12", conversion);
 				query.bind(":c13", conversion);
+                                query.bind(":c14", conversion);
+                                query.bind(":c15", conversion);
 				query.exec();
 				output.writeStartElement("table");
 				output.writeAttribute("rules", "groups");
@@ -103,17 +107,19 @@
 				output.writeTextElement("th", TTR("invchange", "Coffee")); // 1
 				output.writeTextElement("th", TTR("invchange", "Reference")); // 2
 				output.writeTextElement("th", TTR("invchange", "Starting (") + unitText + ")"); // 3
-				output.writeTextElement("th", TTR("invchange", "Cost")); // 10
-				output.writeTextElement("th", TTR("invchange", "Purchase (") + unitText + ")"); // 4
 				output.writeTextElement("th", TTR("invchange", "Cost")); // 11
-				output.writeTextElement("th", TTR("invchange", "Use (") + unitText + ")"); // 5
+				output.writeTextElement("th", TTR("invchange", "Purchase (") + unitText + ")"); // 4
 				output.writeTextElement("th", TTR("invchange", "Cost")); // 12
-				output.writeTextElement("th", TTR("invchange", "Sale (") + unitText + ")"); // 6
+				output.writeTextElement("th", TTR("invchange", "Use (") + unitText + ")"); // 5
 				output.writeTextElement("th", TTR("invchange", "Cost")); // 13
-				output.writeTextElement("th", TTR("invchange", "Adjustment (") + unitText + ")"); // 9
-				output.writeTextElement("th", TTR("invchange", "Cost")); // 15
-				output.writeTextElement("th", TTR("invchange", "Ending (") + unitText + ")"); // 7
+				output.writeTextElement("th", TTR("invchange", "Sale (") + unitText + ")"); // 6
 				output.writeTextElement("th", TTR("invchange", "Cost")); // 14
+                                output.writeTextElement("th", TTR("invchange", "Loss (") + unitText + ")"); // 7
+                                output.writeTextElement("th", TTR("invchange", "Cost")) // 15
+				output.writeTextElement("th", TTR("invchange", "Adjustment (") + unitText + ")"); // 10
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 17
+				output.writeTextElement("th", TTR("invchange", "Ending (") + unitText + ")"); // 8
+				output.writeTextElement("th", TTR("invchange", "Cost")); // 16
 				output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
@@ -128,7 +134,9 @@
 				var sum9 = 0;
 				var sum15 = 0;
 				var sum7 = 0;
-				var sum14 = 0;;
+				var sum14 = 0;
+                                var loss_sum = 0;
+                                var loss_cost_sum = 0;
 				while(query.next())
 				{
 					output.writeStartElement("tr");
@@ -141,48 +149,55 @@
 					output.writeTextElement("td", query.value(1)); //Coffee
 					output.writeTextElement("td", query.value(2)); //Reference
 					output.writeStartElement("td"); //Starting Wt
-					output.writeAttribute("title", (parseFloat(query.value(3))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeAttribute("title", (parseFloat(query.value(3))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
 					output.writeCDATA(parseFloat(query.value(3)).toFixed(2));
 					output.writeEndElement(); //End of Starting Wt.
-					output.writeTextElement("td", parseFloat(query.value(10)).toFixed(2)); //Starting Cost
+					output.writeTextElement("td", parseFloat(query.value(11)).toFixed(2)); //Starting Cost
 					output.writeStartElement("td"); //Purchase Wt
-					output.writeAttribute("title", (parseFloat(query.value(4))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeAttribute("title", (parseFloat(query.value(4))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
 					output.writeCDATA(parseFloat(query.value(4)).toFixed(2));
 					output.writeEndElement(); //End of Purchase Wt
-					output.writeTextElement("td", parseFloat(query.value(11)).toFixed(2)); //Purchase Cost
+					output.writeTextElement("td", parseFloat(query.value(12)).toFixed(2)); //Purchase Cost
 					output.writeStartElement("td"); //Use Wt
-					output.writeAttribute("title", (parseFloat(query.value(5))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeAttribute("title", (parseFloat(query.value(5))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
 					output.writeCDATA(parseFloat(query.value(5)).toFixed(2));
 					output.writeEndElement(); //End of Use Wt
-					output.writeTextElement("td", parseFloat(query.value(12)).toFixed(2)); //Use Cost
+					output.writeTextElement("td", parseFloat(query.value(13)).toFixed(2)); //Use Cost
 					output.writeStartElement("td"); //Sale Wt
-					output.writeAttribute("title", (parseFloat(query.value(6))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeAttribute("title", (parseFloat(query.value(6))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
 					output.writeCDATA(parseFloat(query.value(6)).toFixed(2));
 					output.writeEndElement(); //End of Sale Wt
-					output.writeTextElement("td", parseFloat(query.value(13)).toFixed(2)); //Sale Cost
-					output.writeStartElement("td"); //Adjustment Wt
-					output.writeAttribute("title", (parseFloat(query.value(9))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
-					output.writeCDATA(parseFloat(query.value(9)).toFixed(2));
+					output.writeTextElement("td", parseFloat(query.value(14)).toFixed(2)); //Sale Cost
+					output.writeStartElement("td"); //Loss Wt
+                                        output.writeAttribute("title", (parseFloat(query.value(7))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
+                                        output.writeCDATA(parseFloat(query.value(7)).toFixed(2));
+                                        output.writeEndElement(); //End of loss Wt;
+                                        output.writeTextElement("td", parseFloat(query.value(15)).toFixed(2)); //Loss Cost
+                                        output.writeStartElement("td"); //Adjustment Wt
+					output.writeAttribute("title", (parseFloat(query.value(10))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(10)).toFixed(2));
 					output.writeEndElement(); //Adjustment Wt
-					output.writeTextElement("td", parseFloat(query.value(15)).toFixed(2)); //Adjustment Cost
+					output.writeTextElement("td", parseFloat(query.value(17)).toFixed(2)); //Adjustment Cost
 					output.writeStartElement("td"); //Ending Wt
-					output.writeAttribute("title", (parseFloat(query.value(7))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
-					output.writeCDATA(parseFloat(query.value(7)).toFixed(2));
+					output.writeAttribute("title", (parseFloat(query.value(8))/parseFloat(query.value(18)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(8)).toFixed(2));
 					output.writeEndElement(); //End of Ending Wt
-					output.writeTextElement("td", parseFloat(query.value(14)).toFixed(2)); //Ending Cost
+					output.writeTextElement("td", parseFloat(query.value(16)).toFixed(2)); //Ending Cost
 					output.writeEndElement();
 					sum3 += parseFloat(query.value(3));
-					sum10 += parseFloat(query.value(10));
+					sum10 += parseFloat(query.value(11));
 					sum4 += parseFloat(query.value(4));
-					sum11 += parseFloat(query.value(11));
+					sum11 += parseFloat(query.value(12));
 					sum5 += parseFloat(query.value(5));
-					sum12 += parseFloat(query.value(12));
+					sum12 += parseFloat(query.value(13));
 					sum6 += parseFloat(query.value(6));
-					sum13 += parseFloat(query.value(13));
-					sum9 += parseFloat(query.value(9));
-					sum15 += parseFloat(query.value(15));
-					sum7 += parseFloat(query.value(7));
-					sum14 += parseFloat(query.value(14));
+					sum13 += parseFloat(query.value(14));
+					sum9 += parseFloat(query.value(10));
+					sum15 += parseFloat(query.value(17));
+					sum7 += parseFloat(query.value(8));
+					sum14 += parseFloat(query.value(16));
+                                        loss_sum += parseFloat(query.value(7));
+                                        loss_cost_sum += parseFloat(query.value(15));
 				}
 				output.writeEndElement(); // tbody
 				output.writeStartElement("tfoot");
@@ -198,6 +213,8 @@
 				output.writeTextElement("td", sum12.toFixed(2));
 				output.writeTextElement("td", sum6.toFixed(2));
 				output.writeTextElement("td", sum13.toFixed(2));
+                                output.writeTextElement("td", loss_sum.toFixed(2));
+                                output.writeTextElement("td", loss_cost_sum.toFixed(2));
 				output.writeTextElement("td", sum9.toFixed(2));
 				output.writeTextElement("td", sum15.toFixed(2));
 				output.writeTextElement("td", sum7.toFixed(2));

config/Reports/itemtransactions.xml

@@ -1,325 +1,371 @@
 <window id="item_transactions">
-	<reporttitle>Inventory:->Item Transactions</reporttitle>
-	<layout type="vertical">
-		<layout type="horizontal">
-			<label>Item:</label>
-			<sqldrop id="item" data="0" display="1" showdata="true">
-				<null />
-				<query>SELECT id, name FROM items WHERE category = 'Coffee: Unroasted' ORDER BY name</query>
-			</sqldrop>
-			<label>Weight Unit:</label>
-			<sqldrop id="unit" />
-			<stretch />
-		</layout>
-		<webview id="report" />
-	</layout>
-	<menu name="File">
-		<item id="print" shortcut="Ctrl+P">Print</item>
-	</menu>
-	<program>
-		<![CDATA[
-			this.windowTitle = TTR("item_transactions", "Typica - Item Transactions");
-			var itemBox = findChildObject(this, 'item');
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem(TTR("item_transactions", "Kg"));
-			unitBox.addItem(TTR("item_transactions", "Lb"));
-			unitBox.currentIndex = QSettings.value("script/report_unit", 1);
-			unitBox['currentIndexChanged(int)'].connect(function() {
-				QSettings.setValue("script/report_unit", unitBox.currentIndex);
-				refresh();
-			});
-			var view = findChildObject(this, 'report');
-			var printMenu = findChildObject(this, 'print');
-			printMenu.triggered.connect(function() {
-				view.print();
-			});
-			itemBox['currentIndexChanged(int)'].connect(function() {
-				refresh();
-			});
-			function refresh() {
-				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");
-				output.writeTextElement("title", TTR("item_transactions", "Item Transactions"));
-				output.writeStartElement("script");
-				var scriptFile = new QFile(QSettings.value("config") + "/Scripts/d3.min.js");
-				scriptFile.open(1);
-				output.writeCDATA(scriptFile.readToString());
-				scriptFile.close();
-				output.writeEndElement();
-				output.writeStartElement("style");
-				output.writeAttribute("type", "text/css");
-				output.writeCDATA("tr.PURCHASE {background-color: #77FF77}");
-				output.writeCDATA("tr.USE {background-color: #FFFFFF}");
-				output.writeCDATA("tr.INVENTORY {background-color: #7777FF}");
-				output.writeCDATA("tr.SALE {background-color: #FF77FF}");
-				output.writeCDATA("tr.LOSS {background-color: #FF7777}");
-				output.writeCDATA("tr.MAKE {background-color: #FFFF77}");
-				output.writeEndElement(); // style
-				
-				output.writeEndElement();
-				output.writeStartElement("body");
-				output.writeTextElement("h1", TTR("item_transactions", "Item Transactions:"));
-				output.writeStartElement("table");
-				output.writeStartElement("tr");
-				output.writeStartElement("td");
-				output.writeTextElement("strong", "Item: ")
-				output.writeTextElement("span", itemBox.currentText);
-				output.writeEndElement(); // td
-				var query = new QSqlQuery();
-				query.prepare("SELECT reference, category FROM items WHERE id = :item");
-				query.bind(":item", itemBox.currentData());
-				query.exec();
-				if(query.next()) {
-					output.writeStartElement("td");
-					output.writeTextElement("strong", TTR("item_transactions", "Reference: "));
-					output.writeTextElement("span", query.value(0));
-					output.writeEndElement(); // td
-					output.writeStartElement("td");
-					output.writeTextElement("strong", TTR("item_transactions", "Category: "));
-					output.writeTextElement("span", query.value(1));
-					output.writeEndElement(); //td
-					output.writeEndElement(); //tr
-					query.prepare("SELECT origin, region, producer, grade, milling, drying FROM coffees WHERE id = :item");
-					query.bind(":item", itemBox.currentData());
-					query.exec();
-					if(query.next()) {
-						output.writeStartElement("tr");
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Origin: "));
-						output.writeTextElement("span", query.value(0));
-						output.writeEndElement(); // td
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Region: "));
-						output.writeTextElement("span", query.value(1));
-						output.writeEndElement(); // td
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Producer: "));
-						output.writeTextElement("span", query.value(2));
-						output.writeEndElement(); // td
-						output.writeEndElement(); // tr
-						output.writeStartElement("tr");
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Grade: "));
-						output.writeTextElement("span", query.value(3));
-						output.writeEndElement(); // td
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Milling: "));
-						output.writeTextElement("span", query.value(4));
-						output.writeEndElement(); // td
-						output.writeStartElement("td");
-						output.writeTextElement("strong", TTR("item_transactions", "Drying: "));
-						output.writeTextElement("span", query.value(5));
-						output.writeEndElement(); // td
-						output.writeEndElement(); // tr
-						query.prepare("SELECT decaf_method FROM decaf_coffees WHERE id = :item");
-						query.bind(":item", itemBox.currentData());
-						query.exec();
-						if(query.next()) {
-							output.writeStartElement("tr");
-							output.writeStartElement("td");
-							output.writeAttribute("colspan", "3");
-							output.writeTextElement("strong", TTR("item_transactions", "Decaffeination Method: "));
-							output.writeTextElement("span", query.value(0));
-							output.writeEndElement(); // td
-							output.writeEndElement(); // tr
-						}
-					}
-					output.writeEndElement() // table
-					
-					output.writeStartElement("div");
-					output.writeAttribute("id", "chart");
-					output.writeEndElement();
-					
-					query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_quantity, generate_subscripts(unroasted_quantity, 1) AS s FROM roasting_log) SELECT (SELECT name FROM items WHERE id = roasted_id) AS name, roasted_id, SUM(unroasted_quantity[s]) AS total, COUNT(unroasted_quantity[s]), SUM((unroasted_quantity[s]/unroasted_total_quantity)*roasted_quantity)::numeric(12,3) AS roast_proportion FROM q WHERE unroasted_id[s] = :item1 GROUP BY roasted_id UNION SELECT 'Green Sales', NULL, SUM(quantity), COUNT(1), NULL FROM sale WHERE item = :item2 UNION SELECT 'Inventory Adjustment', NULL, ((SELECT SUM(quantity) FROM purchase WHERE item = :item3) - (SELECT quantity FROM items WHERE id = :item4) - (SELECT SUM(quantity) FROM all_transactions WHERE type != 'PURCHASE' AND type != 'INVENTORY' AND item = :item5)), (SELECT COUNT(1) FROM inventory WHERE item = :item6), NULL UNION SELECT 'Loss', NULL, SUM(quantity), COUNT(1), NULL FROM loss WHERE item = :item7 UNION SELECT 'Current Inventory', NULL, (SELECT quantity FROM items WHERE id = :item8), NULL, NULL ORDER BY total DESC");
-					query.bind(":item1", itemBox.currentData());
-					query.bind(":item2", itemBox.currentData());
-					query.bind(":item3", itemBox.currentData());
-					query.bind(":item4", itemBox.currentData());
-					query.bind(":item5", itemBox.currentData());
-					query.bind(":item6", itemBox.currentData());
-					query.bind(":item7", itemBox.currentData());
-					query.bind(":item8", itemBox.currentData());
-					query.exec();
-					var chartData = "var data = [";
-					var roastedCoffeeLines = "";
-					var adjustmentLines = "";
-					var currentInventoryLine = "";
-					var conversion = 1;
-					if(unitBox.currentIndex == 0) {
-						conversion = 2.2;
-					}
-					while(query.next()) {
-						if(Number(query.value(1)) > 0) {
-							roastedCoffeeLines += "['" + query.value(0).replace(/\'/g, "\\x27") + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
-						} else if (query.value(0) == "Current Inventory") {
-							currentInventoryLine = "['Current Inventory'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "]";
-						} else {
-							if(Number(query.value(3)) > 0) {
-								adjustmentLines += "['" + query.value(0) + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
-							}
-						}
-					}
-					chartData = chartData + roastedCoffeeLines + adjustmentLines + currentInventoryLine + "];";
-					
-					output.writeTextElement("script", chartData);
-					
-					output.writeStartElement("script");
-					scriptFile = new QFile(QSettings.value("config") + "/Scripts/greenusechart.js");
-					scriptFile.open(1);
-					output.writeCDATA(scriptFile.readToString());
-					scriptFile.close();
-					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)");
-					switch(unitBox.currentIndex)
-					{
-						case 0:
-							query.bind(":c1", 2.2);
-							query.bind(":c2", 2.2);
-							break;
-						case 1:
-							query.bind(":c1", 1);
-							query.bind(":c2", 1);
-							break;
-					}
-					query.bind(":item", itemBox.currentData());
-					query.exec();
-					output.writeStartElement("table");
-					output.writeStartElement("tr");
-					output.writeTextElement("th", TTR("item_transactions", "Date"));
-					output.writeTextElement("th", TTR("item_transactions", "Type"));
-					output.writeTextElement("th", TTR("item_transactions", "Quantity"));
-					output.writeTextElement("th", TTR("item_transactions", "Balance"));
-					output.writeTextElement("th", TTR("item_transactions", "Record"));
-					output.writeEndElement(); // tr
-					var prev_balance = "0";
-					var prev_prec = 0;
-					var cur_prec = 0;
-                                        var max_prec = 3;
-					while(query.next()) {
-						output.writeStartElement("tr");
-						output.writeAttribute("class", query.value(1));
-						output.writeTextElement("td", query.value(0));
-						output.writeTextElement("td", query.value(1));
-                                                var split = prev_balance.split('.');
-                                                if(split.length > 1) {
-                                                    prev_prec = split[1].length;
-                                                } else {
-                                                    prev_prec = 0;
-                                                }
-                                                split = query.value(2).split('.');
-                                                if(split.length > 1) {
-                                                    cur_prec = split[1].length;
-                                                } else {
-                                                    cur_prec = 0;
-                                                }
-                                                var prec = prev_prec > cur_prec ? prev_prec : cur_prec;
-                                                var prec = (prec > max_prec ? max_prec : prec);
-						if(query.value(1) == "INVENTORY") {
-                                                    output.writeTextElement("td", (Number(query.value(2)) - Number(prev_balance)).toFixed(prec));
-						} else {
-                                                    output.writeTextElement("td", (Number(query.value(2)).toFixed(prec)));
-						}
-						output.writeTextElement("td", (Number(query.value(3)).toFixed(prec)));
-						prev_balance = query.value(3);
-						if(query.value(1) == "PURCHASE") {
-							output.writeStartElement("td");
-							output.writeStartElement("a");
-							output.writeAttribute("href", "typica://script/i" + query.value(5));
-							output.writeCDATA(query.value(6) + " (" + query.value(5) + ")");
-							output.writeEndElement();
-							output.writeEndElement();
-						} else if(query.value(1) == "USE") {
-							output.writeStartElement("td");
-							output.writeStartElement("a");
-							output.writeAttribute("href", "typica://script/p" + query.value(4).slice(1,-1));
-							output.writeCDATA(query.value(7) + " " + query.value(4));
-							output.writeEndElement();
-							output.writeEndElement();
-                                                } else if(query.value(1) == "LOSS") {
-                                                    output.writeTextElement("td", query.value(9));
-                                                } else if(query.value(1) == "SALE") {
-                                                    output.writeTextElement("td", query.value(8));
-						} else {
-							output.writeTextElement("td", "");
-						}
-						output.writeEndElement(); // tr
-					}
-					output.writeEndElement(); // table
-					/* Put the rest of the report here. No sense running queries if
-					   the item doesn't exist. */
-				} else {
-					/* Close tags if item data not found. */
-					output.writeEndElement(); // tr
-					output.writeEndElement(); // table
-				}
-				
-				output.writeEndElement(); // body
-				output.writeEndElement(); // html
-				output.writeEndDocument();
-				view.setContent(buffer);
-				buffer.close();
-				query = query.invalidate();
-			}
-			if(itemBox.currentData() > 0) {
-				refresh();
-			}
-			
-			/* Open invoices */
-			var openInvoice = function(url) {
-				var arg = url.slice(1, url.length);
-				var info = createWindow("invoiceinfo");
-				info.setInvoiceID(arg);
-				var query = new QSqlQuery();
-				query.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + arg);
-				query.next();
-				var timefield = findChildObject(info, 'date');
-				timefield.text = query.value(0);
-				var vendorfield = findChildObject(info, 'vendor');
-				vendorfield.text = query.value(2);
-				var invoicefield = findChildObject(info, 'invoice');
-				invoicefield.text = query.value(1);
-				var itemtable = findChildObject(info, 'itemtable');
-				itemtable.setQuery("SELECT record_type, item_id, description, (SELECT reference FROM items WHERE id = item_id) AS reference, (SELECT cost FROM purchase WHERE item = item_id) AS unit_cost, (SELECT quantity FROM purchase WHERE item = item_id) AS quantity, ((SELECT quantity FROM purchase WHERE item = item_id)/(SELECT conversion FROM lb_bag_conversion WHERE item = item_id))::numeric(12,2) AS sacks, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'FEE' ORDER BY item_id");
-				query = query.invalidate();
-			};
-			
-			/* Open batch data */
-			var openProfile = function(url) {
-				var arg = url.slice(1, url.length);
-				var details = createWindow("batchDetails");
-				var fakeTable = new Object;
-				fakeTable.holding = new Array(7);
-				fakeTable.data = function(r, c) {
-					return this.holding[c];
-				};
-				var query = new QSqlQuery();
-				query.exec("SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity AS green, roasted_quantity AS roasted, ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) AS weight_loss, duration, annotation FROM roasting_log WHERE files = '{" + arg + "}'");
-				query.next();
-				for(var i = 0; i < 8; i++) {
-					fakeTable.holding[i] = query.value(i);
-				}
-				query = query.invalidate();
-				details.loadData(fakeTable, 0);
-			};
-			
-			view.scriptLinkClicked.connect(function(url) {
-				var linkType = url[0];
-				switch(linkType) {
-					case 'i':
-						openInvoice(url);
-						break;
-					case 'p':
-						openProfile(url);
-						break;
-				}
-			});
-		]]>
-	</program>
+    <reporttitle>Inventory:->Item Transactions</reporttitle>
+    <layout type="vertical">
+        <layout type="horizontal">
+            <daterange id="dates" initial="23" /><!-- Lifetime-->
+            <label>Item:</label>
+            <sqldrop id="item" data="0" display="1" showdata="true">
+            <null />
+            <query>SELECT id, name FROM items WHERE category = 'Coffee: Unroasted' ORDER BY name</query>
+            </sqldrop>
+            <label>Weight Unit:</label>
+            <sqldrop id="unit" />
+            <stretch />
+        </layout>
+        <webview id="report" />
+    </layout>
+    <menu name="File">
+        <item id="print" shortcut="Ctrl+P">Print</item>
+    </menu>
+    <program>
+        <![CDATA[
+            this.windowTitle = TTR("item_transactions", "Typica - Item Transactions");
+            var dateSelect = findChildObject(this, 'dates');
+            var dateQuery = new QSqlQuery();
+            dateQuery.exec("SELECT time::date FROM transactions WHERE time = (SELECT min(time) FROM transactions) OR time = (SELECT max(time) FROM transactions) ORDER BY time ASC");
+            dateQuery.next();
+            var lifetimeStartDate = dateQuery.value(0);
+            var lifetimeEndDate;
+            if(dateQuery.next()) {
+                lifetimeEndDate = dateQuery.value(0);
+            } else {
+                lifetimeEndDate = lifetimeStartDate;
+            }
+            dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+            dateQuery = dateQuery.invalidate();
+            dateSelect.rangeUpdated.connect(function() {
+                refresh();
+            });
+            var itemBox = findChildObject(this, 'item');
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem(TTR("item_transactions", "Kg"));
+            unitBox.addItem(TTR("item_transactions", "Lb"));
+            unitBox.currentIndex = QSettings.value("script/report_unit", 1);
+            unitBox['currentIndexChanged(int)'].connect(function() {
+                QSettings.setValue("script/report_unit", unitBox.currentIndex);
+                refresh();
+            });
+            var view = findChildObject(this, 'report');
+            var printMenu = findChildObject(this, 'print');
+            printMenu.triggered.connect(function() {
+                view.print();
+            });
+            itemBox['currentIndexChanged(int)'].connect(function() {
+                refresh();
+            });
+            function refresh() {
+                var dateRange = dateSelect.currentRange();
+                var startDate = dateRange[0];
+                var endDate = dateRange[dateRange.length - 1];
+                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");
+                output.writeTextElement("title", TTR("item_transactions", "Item Transactions"));
+                output.writeStartElement("script");
+                var scriptFile = new QFile(QSettings.value("config") + "/Scripts/d3.min.js");
+                scriptFile.open(1);
+                output.writeCDATA(scriptFile.readToString());
+                scriptFile.close();
+                output.writeEndElement();
+                output.writeStartElement("style");
+                output.writeAttribute("type", "text/css");
+                output.writeCDATA("tr.PURCHASE {background-color: #77FF77}");
+                output.writeCDATA("tr.USE {background-color: #FFFFFF}");
+                output.writeCDATA("tr.INVENTORY {background-color: #7777FF}");
+                output.writeCDATA("tr.SALE {background-color: #FF77FF}");
+                output.writeCDATA("tr.LOSS {background-color: #FF7777}");
+                output.writeCDATA("tr.MAKE {background-color: #FFFF77}");
+                output.writeEndElement(); // style
+                output.writeEndElement();
+                output.writeStartElement("body");
+                output.writeTextElement("h1", TTR("item_transactions", "Item Transactions:"));
+                output.writeStartElement("table");
+                output.writeStartElement("tr");
+                output.writeStartElement("td");
+                output.writeTextElement("strong", "Item: ")
+                output.writeTextElement("span", itemBox.currentText);
+                output.writeEndElement(); // td
+                var query = new QSqlQuery();
+                query.prepare("SELECT reference, category FROM items WHERE id = :item");
+                query.bind(":item", itemBox.currentData());
+                query.exec();
+                if(query.next()) {
+                    output.writeStartElement("td");
+                    output.writeTextElement("strong", TTR("item_transactions", "Reference: "));
+                    output.writeTextElement("span", query.value(0));
+                    output.writeEndElement(); // td
+                    output.writeStartElement("td");
+                    output.writeTextElement("strong", TTR("item_transactions", "Category: "));
+                    output.writeTextElement("span", query.value(1));
+                    output.writeEndElement(); //td
+                    output.writeEndElement(); //tr
+                    query.prepare("SELECT origin, region, producer, grade, milling, drying FROM coffees WHERE id = :item");
+                    query.bind(":item", itemBox.currentData());
+                    query.exec();
+                    if(query.next()) {
+                        output.writeStartElement("tr");
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Origin: "));
+                        output.writeTextElement("span", query.value(0));
+                        output.writeEndElement(); // td
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Region: "));
+                        output.writeTextElement("span", query.value(1));
+                        output.writeEndElement(); // td
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Producer: "));
+                        output.writeTextElement("span", query.value(2));
+                        output.writeEndElement(); // td
+                        output.writeEndElement(); // tr
+                        output.writeStartElement("tr");
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Grade: "));
+                        output.writeTextElement("span", query.value(3));
+                        output.writeEndElement(); // td
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Milling: "));
+                        output.writeTextElement("span", query.value(4));
+                        output.writeEndElement(); // td
+                        output.writeStartElement("td");
+                        output.writeTextElement("strong", TTR("item_transactions", "Drying: "));
+                        output.writeTextElement("span", query.value(5));
+                        output.writeEndElement(); // td
+                        output.writeEndElement(); // tr
+                        query.prepare("SELECT decaf_method FROM decaf_coffees WHERE id = :item");
+                        query.bind(":item", itemBox.currentData());
+                        query.exec();
+                        if(query.next()) {
+                            output.writeStartElement("tr");
+                            output.writeStartElement("td");
+                            output.writeAttribute("colspan", "3");
+                            output.writeTextElement("strong", TTR("item_transactions", "Decaffeination Method: "));
+                            output.writeTextElement("span", query.value(0));
+                            output.writeEndElement(); // td
+                            output.writeEndElement(); // tr
+                        }
+                    }
+                    output.writeEndElement() // table
+                    output.writeStartElement("div");
+                    output.writeAttribute("id", "chart");
+                    output.writeEndElement();
+                    query.prepare("WITH q AS (SELECT roasted_id, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_quantity, generate_subscripts(unroasted_quantity, 1) AS s FROM roasting_log WHERE time >= :sd AND time < :ed ::date + interval '1 day') SELECT (SELECT name FROM items WHERE id = roasted_id) AS name, roasted_id, SUM(unroasted_quantity[s]) AS total, COUNT(unroasted_quantity[s]), SUM((unroasted_quantity[s]/unroasted_total_quantity)*roasted_quantity)::numeric(12,3) AS roast_proportion FROM q WHERE unroasted_id[s] = :item1 GROUP BY roasted_id UNION SELECT 'Green Sales', NULL, SUM(quantity), COUNT(1), NULL FROM sale WHERE item = :item2 UNION SELECT 'Inventory Adjustment', NULL, ((SELECT SUM(quantity) FROM purchase WHERE item = :item3) - (SELECT quantity FROM items WHERE id = :item4) - (SELECT SUM(quantity) FROM all_transactions WHERE type != 'PURCHASE' AND type != 'INVENTORY' AND item = :item5)), (SELECT COUNT(1) FROM inventory WHERE item = :item6), NULL UNION SELECT 'Loss', NULL, SUM(quantity), COUNT(1), NULL FROM loss WHERE item = :item7 UNION SELECT 'Current Inventory', NULL, (SELECT quantity FROM items WHERE id = :item8), NULL, NULL ORDER BY total DESC");
+                    query.bind(":sd", startDate);
+                    query.bind(":ed", endDate);
+                    query.bind(":item1", itemBox.currentData());
+                    query.bind(":item2", itemBox.currentData());
+                    query.bind(":item3", itemBox.currentData());
+                    query.bind(":item4", itemBox.currentData());
+                    query.bind(":item5", itemBox.currentData());
+                    query.bind(":item6", itemBox.currentData());
+                    query.bind(":item7", itemBox.currentData());
+                    query.bind(":item8", itemBox.currentData());
+                    query.exec();
+                    var chartData = "var data = [";
+                    var roastedCoffeeLines = "";
+                    var adjustmentLines = "";
+                    var currentInventoryLine = "";
+                    var conversion = 1;
+                    if(unitBox.currentIndex == 0) {
+                        conversion = 2.2;
+                    }
+                    while(query.next()) {
+                        if(Number(query.value(1)) > 0) {
+                            roastedCoffeeLines += "['" + query.value(0).replace(/\'/g, "\\x27") + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
+                        } else if (query.value(0) == "Current Inventory") {
+                            currentInventoryLine = "['Current Inventory'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "]";
+                        } else {
+                            if(Number(query.value(3)) > 0) {
+                                adjustmentLines += "['" + query.value(0) + "'," + query.value(2) / conversion + "," + query.value(3) + "," + query.value(4) / conversion + "],";
+                            }
+                        }
+                    }
+                    chartData = chartData + roastedCoffeeLines + adjustmentLines + currentInventoryLine + "];";
+                    output.writeTextElement("script", chartData);
+                    output.writeStartElement("script");
+                    scriptFile = new QFile(QSettings.value("config") + "/Scripts/greenusechart.js");
+                    scriptFile.open(1);
+                    output.writeCDATA(scriptFile.readToString());
+                    scriptFile.close();
+                    output.writeEndElement();
+                    eval(chartData);
+                    output.writeStartElement("table");
+                    output.writeStartElement("tr");
+                    output.writeTextElement("th", "Item");
+                    output.writeTextElement("th", "Green");
+                    output.writeTextElement("th", "Roasted");
+                    output.writeTextElement("th", "Transactions");
+                    output.writeEndElement();
+                    for(var r = 0; r < data.length; r++)
+                    {
+                        output.writeStartElement("tr");
+                        output.writeTextElement("td", data[r][0]);
+                        output.writeTextElement("td", data[r][1]);
+                        output.writeTextElement("td", data[r][3]);
+                        output.writeTextElement("td", data[r][2]);
+                        output.writeEndElement();
+                    }
+                    output.writeStartElement("tr");
+                    output.writeTextElement("th", "Totals:");
+                    output.writeTextElement("td", data.reduce(function(prev, current){
+                        return +(current[1]) + prev;
+                    }, 0));
+                    output.writeTextElement("td", data.reduce(function(prev, current){
+                        return +(current[3]) + prev;
+                    }, 0));
+                    output.writeTextElement("td", data.reduce(function(prev, current){
+                        return +(current[2]) + prev;
+                    }, 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, (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)
+                    {
+                        case 0:
+                            query.bind(":c1", 2.2);
+                            query.bind(":c2", 2.2);
+                            break;
+                        case 1:
+                            query.bind(":c1", 1);
+                            query.bind(":c2", 1);
+                            break;
+                    }
+                    query.bind(":item", itemBox.currentData());
+                    query.exec();
+                    output.writeStartElement("table");
+                    output.writeStartElement("tr");
+                    output.writeTextElement("th", TTR("item_transactions", "Date"));
+                    output.writeTextElement("th", TTR("item_transactions", "Type"));
+                    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;
+                    var cur_prec = 0;
+                    var max_prec = 3;
+                    while(query.next()) {
+                        output.writeStartElement("tr");
+                        output.writeAttribute("class", query.value(1));
+                        output.writeTextElement("td", query.value(0));
+                        output.writeTextElement("td", query.value(1));
+                        var split = prev_balance.split('.');
+                        if(split.length > 1) {
+                            prev_prec = split[1].length;
+                        } else {
+                            prev_prec = 0;
+                        }
+                        split = query.value(2).split('.');
+                        if(split.length > 1) {
+                            cur_prec = split[1].length;
+                        } else {
+                            cur_prec = 0;
+                        }
+                        var prec = prev_prec > cur_prec ? prev_prec : cur_prec;
+                        var prec = (prec > max_prec ? max_prec : prec);
+                        if(query.value(1) == "INVENTORY") {
+                            output.writeTextElement("td", (Number(query.value(2)) - Number(prev_balance)).toFixed(prec));
+                        } else {
+                            output.writeTextElement("td", (Number(query.value(2)).toFixed(prec)));
+                        }
+                        output.writeTextElement("td", (Number(query.value(3)).toFixed(prec)));
+                                prev_balance = query.value(3);
+                        if(query.value(1) == "PURCHASE") {
+                            output.writeStartElement("td");
+                            output.writeStartElement("a");
+                            output.writeAttribute("href", "typica://script/i" + query.value(5));
+                            output.writeCDATA(query.value(6) + " (" + query.value(5) + ")");
+                            output.writeEndElement();
+                            output.writeEndElement();
+                        } else if(query.value(1) == "USE") {
+                            output.writeStartElement("td");
+                            output.writeStartElement("a");
+                            output.writeAttribute("href", "typica://script/p" + query.value(4).slice(1,-1));
+                            output.writeCDATA(query.value(7) + " " + query.value(4));
+                            output.writeEndElement();
+                            output.writeEndElement();
+                        } else if(query.value(1) == "LOSS") {
+                            output.writeTextElement("td", query.value(9));
+                        } else if(query.value(1) == "SALE") {
+                            output.writeTextElement("td", query.value(8));
+                        } else {
+                            output.writeTextElement("td", "");
+                        }
+						output.writeTextElement("td", query.value(10));
+                        output.writeEndElement(); // tr
+                    }
+                    output.writeEndElement(); // table
+                    /* Put the rest of the report here. No sense running queries if
+                    the item doesn't exist. */
+                } else {
+                    /* Close tags if item data not found. */
+                    output.writeEndElement(); // tr
+                    output.writeEndElement(); // table
+                }
+                output.writeEndElement(); // body
+                output.writeEndElement(); // html
+                output.writeEndDocument();
+                view.setContent(buffer);
+                buffer.close();
+                query = query.invalidate();
+            }
+            if(itemBox.currentData() > 0) {
+                refresh();
+            }
+            /* Open invoices */
+            var openInvoice = function(url) {
+                var arg = url.slice(1, url.length);
+                var info = createWindow("invoiceinfo");
+                info.setInvoiceID(arg);
+                var query = new QSqlQuery();
+                query.exec("SELECT time, invoice, vendor FROM invoices WHERE id = " + arg);
+                query.next();
+                var timefield = findChildObject(info, 'date');
+                timefield.text = query.value(0);
+                var vendorfield = findChildObject(info, 'vendor');
+                vendorfield.text = query.value(2);
+                var invoicefield = findChildObject(info, 'invoice');
+                invoicefield.text = query.value(1);
+                var itemtable = findChildObject(info, 'itemtable');
+                itemtable.setQuery("SELECT record_type, item_id, description, (SELECT reference FROM items WHERE id = item_id) AS reference, (SELECT cost FROM purchase WHERE item = item_id) AS unit_cost, (SELECT quantity FROM purchase WHERE item = item_id) AS quantity, ((SELECT quantity FROM purchase WHERE item = item_id)/(SELECT conversion FROM lb_bag_conversion WHERE item = item_id))::numeric(12,2) AS sacks, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'PURCHASE' UNION SELECT record_type, NULL, description, NULL, NULL, NULL, NULL, cost FROM invoice_items WHERE invoice_id = " + arg + " AND record_type = 'FEE' ORDER BY item_id");
+                query = query.invalidate();
+            };
+            /* Open batch data */
+            var openProfile = function(url) {
+                var arg = url.slice(1, url.length);
+                var details = createWindow("batchDetails");
+                var fakeTable = new Object;
+                fakeTable.holding = new Array(7);
+                fakeTable.data = function(r, c) {
+                    return this.holding[c];
+                };
+                var query = new QSqlQuery();
+                query.exec("SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity AS green, roasted_quantity AS roasted, ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) AS weight_loss, duration, annotation FROM roasting_log WHERE files = '{" + arg + "}'");
+                query.next();
+                for(var i = 0; i < 8; i++) {
+                    fakeTable.holding[i] = query.value(i);
+                }
+                query = query.invalidate();
+                details.loadData(fakeTable, 0);
+            };
+            view.scriptLinkClicked.connect(function(url) {
+                var linkType = url[0];
+                switch(linkType) {
+                    case 'i':
+                        openInvoice(url);
+                        break;
+                    case 'p':
+                        openProfile(url);
+                        break;
+                }
+            });
+        ]]>
+    </program>
 </window>

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/greeninventory.xml

@@ -65,8 +65,8 @@
             button.clicked.connect(function() {
                 q = "INSERT INTO ";
                 q += (types.currentIndex == 0 ?
-                    "inventory (time, item, quantity)" :
-                    "loss (time, item, quantity, reason)");
+                    "inventory (time, item, quantity, person)" :
+                    "loss (time, item, quantity, reason, person)");
                 q += " VALUES ('now', ";
                 q = q + items.currentData();
                 q = q + ", ";
@@ -82,10 +82,12 @@
                     q = q + ")";
                 }
                 q += (types.currentIndex == 0 ?
-                    ")" :
-                    ", '" + reason.text + "')");
+                    ", :user)" :
+                    ", '" + reason.text + "', :user)");
                 query = new QSqlQuery();
-                query.exec(q);
+                query.prepare(q);
+				query.bind(":user", Application.currentTypicaUser());
+				query.exec();
                 updateStatus();
             });
             items['currentIndexChanged(int)'].connect(updateStatus);

config/Windows/greensales.xml

@@ -53,7 +53,7 @@
 			var submit = findChildObject(this, 'submit');
 			submit.clicked.connect(function() {
 				var query = new QSqlQuery();
-				query.prepare("INSERT INTO sale (time, item, quantity, customer) VALUES(:time, :item, :quantity, :customer)");
+				query.prepare("INSERT INTO sale (time, item, quantity, customer, person) VALUES(:time, :item, :quantity, :customer, :user)");
 				query.bind(":time", dateField.text);
 				if(customerField.text == "") {
 					query.bind(":customer", null);
@@ -62,6 +62,7 @@
 					query.bind(":customer", customerField.text);
 				}
 				var coffeesArray = sqlToArray(items.columnArray(0, 32));
+				query.bind(":user", Application.currentTypicaUser());
 				if(coffeesArray.length > 0)
 				{
 					for(var i = 0; i < coffeesArray.length; i++)

config/Windows/manuallogentry.xml

@@ -0,0 +1,496 @@
+<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>
+		<separator />
+		<item id="showC">Display Celsius</item>
+		<item id="showF">Display Fahrenheit</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.addOutputTemperatureColumn(1);
+		pluginContext.table.setHeaderData(2, "Note");
+		pluginContext.table.addOutputAnnotationColumn(2);
+		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');
+		var currentUnit = Units.Fahrenheit;
+		var showC = findChildObject(this, 'showC');
+        showC.triggered.connect(function() {
+            pluginContext.table.setDisplayUnits(Units.Celsius);
+            pluginContext.graph.showC();
+			QSettings.setValue("temperatureUnit", "C");
+			currentUnit = Units.Celsius;
+        });
+        var showF = findChildObject(this, 'showF');
+        showF.triggered.connect(function() {
+            pluginContext.table.setDisplayUnits(Units.Fahrenheit);
+            pluginContext.graph.showF();
+			QSettings.setValue("temperatureUnit", "F");
+			currentUnit = Units.Fahrenheit;
+        });
+		if(QSettings.value("temperatureUnit", "F") == "C") {
+			showC.trigger();
+		}
+		addmeasurement.clicked.connect(function() {
+			var fromUnit = 
+			pluginContext.newMeasurement(new Measurement(Units.convertTemperature(Number(currenttemperature.text), currentUnit, Units.Fahrenheit), 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 = "";
+			pluginContext.table.clearOutputColumns();
+			pluginContext.table.addOutputTemperatureColumn(1);
+			pluginContext.table.addOutputAnnotationColumn(2);
+		});
+		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);
+				buffer.open(3); /* saveXML closes the 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.bind(":data", buffer.readToString());
+				query.exec();
+				query.next();
+				fileID = query.value(0);
+				buffer.close();
+			}
+			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", sampleGreenArrivalDate.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, person) VALUES (:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files, :user)");
+				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);
+				if(fileID > 0) {
+					query.bind(":files", "{" + fileID + "}");
+				} else {
+					query.bind(":file", "{}");
+				}
+				query.bind(":user", Application.currentTypicaUser());
+				query.exec();
+			} else {
+				var q = "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, person) VALUES (:time, ";
+				q += productionGreenTable.columnArray(0, 32);
+				q += ", ";
+				var greenSum = 0.0;
+				for(var i = 0; i < productionGreenTable.data(i, 1, 0).value != ""; i++) {
+					var greenWt = convertToPounds(parseFloat(productionGreenTable.data(i, 1, 0)), productionGreenUnit.currentText);
+					productionGreenTable.setData(i, 1, greenWt, 32);
+					greenSum += greenWt;
+				}
+				q += productionGreenTable.columnArray(1, 32);
+				q += ", ";
+				q += greenWt;
+				q += ", ";
+				q += roastedItem.currentData();
+				q += ", ";
+				q += convertToPounds(parseFloat(roastedWeight.text), productionGreenUnit.currentText);
+				q += ", 'ROAST', :annotation, ";
+				q += selectedRoasterID;
+				q += ", :duration, TRUE, NULL, NULL, NULL, NULL, '{";
+				if(fileID > 0) {
+					q += fileID;
+				}
+				q += "}', :user)";
+				query.prepare(q);
+				query.bind(":time", roastTime.text);
+				query.bind(":annotation", notes.plainText);
+				query.bind(":duration", roastDuration.text);
+				query.bind(":user", Application.currentTypicaUser());
+				query.exec();
+			}
+			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" />
@@ -68,6 +73,10 @@
     <menu name="Database">
         <item id="resetconnection">Forget Connection Details</item>
     </menu>
+	<menu name="Users">
+		<item id="switchuser">Switch User</item>
+		<item id="createuser">Create New Users</item>
+	</menu>
     <program>
         var window = this;
         var navigationwindow = window;
@@ -87,6 +96,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");
@@ -133,7 +146,7 @@
         var nrbutton = findChildObject(this, 'newroasted');
         nrbutton.clicked.connect(function() {
             var nrwindow = createWindow("newroasted");
-            nrwindow.windowTitle = "New Roasted Coffee Item";
+            nrwindow.windowTitle = "Manage Roasted Coffee Items";
         });
         var importb = findChildObject(this, 'target');
         importb.clicked.connect(function() {
@@ -226,7 +239,7 @@
 		   Typica 1.6 and later. */
 		var DBCreateSampleRoasting = function() {
 			var query = new QSqlQuery;
-			query.exec("CREATE TABLE IF NOT EXISTS item_attributes (id bigint PRIMARY KEY NOT NULL, name text NOT NULL)");
+			query.exec("CREATE TABLE IF NOT EXISTS item_attributes (id bigserial PRIMARY KEY NOT NULL, name text NOT NULL)");
 			query.exec("CREATE TABLE IF NOT EXISTS coffee_sample_items(arrival timestamp without time zone, vendor text, attribute_ids bigint[], attribute_values text[], item_id bigint) INHERITS (items)");
 			query.exec("INSERT INTO TypicaFeatures (feature, enabled, version) VALUES('sample-roasting', TRUE, 1)");
 			query = query.invalidate();
@@ -272,77 +285,124 @@
 		/* Update trigger functions to make column names explicit */
 		var DBUpdateTriggers = function() {
 			var query = new QSqlQuery;
-			query.exec("CREATE OR REPLACE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE OR REPLACE FUNCTION log_make_update() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity <> OLD.roasted_quantity AND NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("UPDATE TypicaFeatures SET version = 4 WHERE feature = 'base-features'");
 		};
-                var DBUpdateReminders = function() {
-                    var query = new QSqlQuery;
-                    query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
-                    query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
-                    query = query.invalidate();
-                };
+        var DBUpdateReminders = function() {
+            var query = new QSqlQuery;
+            query.exec("CREATE TABLE IF NOT EXISTS reminders (id bigserial PRIMARY KEY NOT NULL, reminder text NOT NULL)");
+            query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
+            query = query.invalidate();
+        };
 		var DBUpdateSpecification = function() {
-                    var query = new QSqlQuery;
-                    query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
-                    query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
-                    query = query.invalidate();
-                };
-                
-		query = new QSqlQuery();
-		/* A table keeps track of database versioning information. This table is created
-		   if required. */
-		query.exec("CREATE TABLE IF NOT EXISTS TypicaFeatures (feature TEXT PRIMARY KEY, enabled boolean, version bigint)");
-		/* At the moment everything we're interested in is covered in the base-features
-		   row, but this can be extended later if needed. Each row encodes if certain
-		database structures exist and what version of those structures exist. */
-		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
-		if(query.next())
-		{
-                    if(query.value(2) < 1)
-                    {
-                            DBCreateBase();
-                    }
-                    if(query.value(2) < 2)
-                    {
-                            DBUpdateMultiUser();
-                            DBUpdateHistory();
-                    }
-                    if(query.value(2) < 3)
-                    {
-                            DBUpdateNotifications();
-                    }
-                    if(query.value(2) < 4)
-                    {
-                            DBUpdateTriggers();
-                    }
-                    if(query.value(2) < 5)
-                    {
-                        DBUpdateReminders();
-                    }
-                    if(query.value(2) < 6)
-                    {
-                        DBUpdateSpecification();
-                    }
-		}
-		else
-		{
-			DBCreateBase();
-		}
-		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'sample-roasting'");
-		if(query.next())
-		{
-			if(query.value(2) < 1)
+            var query = new QSqlQuery;
+            query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
+            query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
+            query = query.invalidate();
+        };
+		
+		/* Updates for Typica version 1.8 */
+		var DBUpdate18 = function() {
+			var query = new QSqlQuery;
+			/* Create a table for Typica users login data */
+			query.exec("CREATE TABLE IF NOT EXISTS typica_users(name TEXT PRIMARY KEY NOT NULL, password TEXT, active boolean NOT NULL, auto_login boolean NOT NULL)");
+			/* Update session user logging to only use the database user when a Typica user is not explicitly provided. This maintains compatibility for mixed version use. */
+			query.exec("CREATE OR REPLACE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN IF NEW.person IS NULL THEN NEW.person := session_user; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity, person) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i], NEW.person); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE OR REPLACE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity, person) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity, NEW.person); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE TABLE IF NOT EXISTS sample_roast_profiles(\"time\" timestamp without time zone NOT NULL, profile_name TEXT NOT NULL, file bigint NOT NULL)");
+			query.exec("UPDATE TypicaFeatures SET version = 7 WHERE feature = 'base-features'");
+			query = query.invalidate();
+		};
+		if(Application.databaseConnected()) {
+			query = new QSqlQuery();
+			/* A table keeps track of database versioning information. This
+			   table is created
+			   if required. */
+			query.exec("CREATE TABLE IF NOT EXISTS TypicaFeatures (feature TEXT PRIMARY KEY, enabled boolean, version bigint)");
+			query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
+			if(query.next())
+			{
+				if(query.value(2) < 1)
+				{
+				        DBCreateBase();
+				}
+				if(query.value(2) < 2)
+				{
+			        DBUpdateMultiUser();
+			        DBUpdateHistory();
+				}
+				if(query.value(2) < 3)
+				{
+			        DBUpdateNotifications();
+				}
+				if(query.value(2) < 4)
+				{
+			        DBUpdateTriggers();
+				}
+				if(query.value(2) < 5)
+				{
+				    DBUpdateReminders();
+				}
+				if(query.value(2) < 6)
+				{
+					DBUpdateSpecification();
+				}
+				if(query.value(2) < 7) {
+					DBUpdate18();
+				}
+			}
+			else
+			{
+				DBCreateBase();
+				DBUpdateMultiUser();
+		        DBUpdateHistory();
+				DBUpdateNotifications();
+				DBUpdateTriggers();
+				DBUpdateReminders();
+				DBUpdateSpecification();
+				DBUpdate18();
+			}
+			query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'sample-roasting'");
+			if(query.next())
+			{
+				if(query.value(2) < 1)
+				{
+					DBCreateSampleRoasting();
+				}
+			}
+			else
 			{
 				DBCreateSampleRoasting();
 			}
+			var promptNewUsers = true;
+			query.exec("SELECT count(1) FROM typica_users");
+			if(query.next()) {
+				if(Number(query.value(0)) > 0) {
+					promptNewUsers = false;
+				}
+			}
+			if(promptNewUsers) {
+				var newUserDialog = new NewTypicaUser();
+				newUserDialog.exec();
+			}
+			if(!Application.autoLogin()) {
+				var loginDialog = new LoginDialog();
+				loginDialog.exec();
+			}
+			query = query.invalidate();
 		}
-		else
-		{
-			DBCreateSampleRoasting();
-		}
-		query = query.invalidate();
+		
+		var switchuser = findChildObject(this, 'switchuser');
+		switchuser.triggered.connect(function() {
+			var loginDialog = new LoginDialog();
+			loginDialog.exec();
+		});
+		var createuser = findChildObject(this, 'createuser');
+		createuser.triggered.connect(function() {
+			var newUserDialog = new NewTypicaUser();
+			newUserDialog.exec();
+		});
         ]]>
     </program>
 </window>

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>
@@ -75,8 +78,19 @@
             </layout>
             <label>Specification Details</label>
             <textarea id="specnotes" />
+            <layout type="horizontal">
+                <label>File ID:</label>
+                <line id="filenofield" writable="false" />
+            </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[
@@ -107,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];
@@ -378,8 +393,8 @@
                     lossspec.text = "";
                     specnotes.plainText = "";
                 }
-                roastestimate.text = "";
                 query = query.invalidate();
+				drawTag();
             });
             var validateCapacity = function() {
                 if(checkCapacity == "true") {
@@ -389,6 +404,8 @@
                 }
                 return true;
             }
+            var duration = findChildObject(this, 'duration');
+            var timefield = findChildObject(this, 'time');
             profilebutton.clicked.connect(function() {
                 var proceed = false;
                 if(validateCapacity()) {
@@ -397,6 +414,10 @@
                     proceed = displayWarning(TTR("batchWindow", "Suspicious Input"),
                     TTR("batchWindow", "Entered green coffee weight exceeds maximum batch size. Continue?"));
                 }
+                if((proceed == true) && (timefield.text.length != 0)) {
+                    proceed = displayWarning(TTR("batchWindow", "Batch Already Roasted"),
+                    TTR("batchWindow", "Roasting data already exists for this batch. Roasting another batch from this window will overwrite existing data. Are you sure you want to do this?"));
+                }
                 if(proceed) {
                     doLoadProfile();
                 }
@@ -480,6 +501,10 @@
                     proceed = displayWarning(TTR("batchWindow", "Suspicious Input"),
                     TTR("batchWindow", "Entered green coffee weight exceeds maximum batch size. Continue?"));
                 }
+                if((proceed == true) && (timefield.text.length != 0)) {
+                    proceed = displayWarning(TTR("batchWindow", "Batch Already Roasted"),
+                    TTR("batchWindow", "Roasting data already exists for this batch. Roasting another batch from this window will overwrite existing data. Are you sure you want to do this?"));
+                }
                 if(proceed) {
                     doNoProfile();
                 }
@@ -491,19 +516,24 @@
                 navigationwindow.loggingWindow.activateWindow();
             }
             var submitbutton = findChildObject(this, 'submit');
-            var timefield = findChildObject(this, 'time');
             var notes = findChildObject(this, 'annotation');
-            var duration = findChildObject(this, 'duration');
             var approval = findChildObject(this, 'approval');
             approval.checked = true;
             var target = findChildObject(this, 'target');
+            var greenCheck = function() {
+                var itemArray = table.columnArray(0, 32).split("\\s*,\\s*");
+                var weightArray = table.columnArray(1, 0).split("\\s*,\\s*");
+                return (itemArray.length == weightArray.length) && (itemArray.length > 0);
+            }
             var checkSubmitEnable = function () {
                 if(roasted.currentIndex > 0) {
                     if(timefield.text.length > 0) {
                         if(duration.text.length > 0) {
                             if(batch.tempData.length > 0) {
                                 if(green.text.length > 0) {
-                                    return true;
+                                    if(greenCheck()) {
+                                        return true;
+                                    }
                                 }
                             }
                         }
@@ -528,6 +558,20 @@
                     }
                 }
             });
+            var filenofield = findChildObject(this, 'filenofield');
+            this.endBatch = function() {
+                var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+                var query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":name", timefield.text + " " + roasted.currentText);
+                query.bindFileData(":data", batch.tempData);
+                query.exec();
+                query.next();
+                filenofield.text = query.value(0);
+                var file = new QFile(batch.tempData);
+                file.remove();
+				drawTag();
+            }
             var doSubmit = function() {
                 checkQuery = new QSqlQuery();
                 checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
@@ -539,17 +583,9 @@
                     checkQuery.exec();
                 }
                 checkQuery = checkQuery.invalidate();
-                var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
                 query = new QSqlQuery();
-                query.prepare(q);
-                query.bind(":name", timefield.text + " " + roasted.currentText);
-                query.bindFileData(":data", batch.tempData);
-                query.exec();
-                query.next();
-                var fileno = query.value(0);
-                var file = new QFile(batch.tempData);
-                file.remove();
-                var q2 = "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, ";
+                var fileno = Number(filenofield.text);
+                var q2 = "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, person) VALUES(:time, ";
                 q2 = q2 + table.columnArray(0, 32);
                 q2 = q2 + ", ";
                 for(var i = 0; table.data(i, 1, 0).value != ""; i++)
@@ -567,14 +603,21 @@
                 q2 = q2 + selectedRoasterID;
                 q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
                 q2 = q2 + fileno;
-                q2 = q2 + "}')";
+                q2 = q2 + "}', :user) RETURNING time";
                 query2 = new QSqlQuery();
                 query2.prepare(q2);
                 query2.bind(":time", timefield.text);
                 query2.bind(":annotation", notes.plainText);
                 query2.bind(":duration", duration.text);
                 query2.bind(":approval", approval.checked);
+				query2.bind(":user", Application.currentTypicaUser());
                 query2.exec();
+                if(!query2.next()) {
+                    displayError(TTR("batchWindow", "Database Insert Failed"), TTR("batchWindow", "Failed to save batch to database. Please check inputs and connection and try again."));
+                    query2 = query2.invalidate();
+                    query = query.invalidate();
+                    return;
+                }
                 query2 = query2.invalidate();
                 if(target.checked) {
                     var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
@@ -589,6 +632,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,6 +132,7 @@
 			newMenu.triggered.connect(function() {
 				createWindow("sampleRoastingBatch");
 			});
+            this.endBatch = function() {};
 			var batch = this;
 			batch.submitButton = submit;
 			var name = findChildObject(this, 'name');
@@ -179,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();
@@ -270,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) {
-                                doLoadProfile();
-                            }
-                        });
-                        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);
@@ -346,7 +347,7 @@
 				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.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, person) VALUES(:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files, :user)");
 				query.bind(":time", timefield.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
                                 query.bind(":greens", "{" + convertToPounds(parseFloat(green.text), GunitBox.currentText) + "}");
@@ -357,6 +358,7 @@
 				query.bind(":machine", Number(selectedRoasterID));
 				query.bind(":duration", duration.text);
 				query.bind(":files", "{" + fileno + "}");
+				query.bind(":user", Application.currentTypicaUser());
 				query.exec();
 				query = query.invalidate();
 				batch.close();

config/Windows/purchase.xml

@@ -317,7 +317,7 @@
                     query.exec();
                     query.next();
                     var item_id = query.value(0);
-                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor) VALUES(:time, :item, :quantity, :cost, :vendor)";
+                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor, person) VALUES(:time, :item, :quantity, :cost, :vendor, :user)";
                     query.prepare(q);
                     query.bind(":time", dateField.date);
                     query.bind(":item", item_id);
@@ -332,6 +332,7 @@
                         query.bind(":cost", Number(costEntry.text) / convertToPounds(parseFloat(quantityEntry.text), unitEntry.currentText));
                     }
                     query.bind(":vendor", vendorField.currentText);
+					query.bind(":user", Application.currentTypicaUser());
                     query.exec();
                     q = "INSERT INTO lb_bag_conversion (item, conversion) VALUES(:item, :conversion)";
                     query.prepare(q);

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/3rdparty/qextserialport/src/qextserialenumerator_linux.cpp

@@ -135,7 +135,7 @@ QList<QextPortInfo> QextSerialEnumeratorPrivate::getPorts_sys()
     // (USB-serial, bluetooth-serial, 18F PICs, and so on)
     // if you know an other name prefix for serial ports please let us know
     portNamePrefixes.clear();
-    portNamePrefixes << QLatin1String("ttyACM*") << QLatin1String("ttyUSB*") << QLatin1String("rfcomm*");
+    portNamePrefixes << QLatin1String("ttyACM*") << QLatin1String("ttyUSB*") << QLatin1String("rfcomm*") << QLatin1String("tnt*");
     portNameList += dir.entryList(portNamePrefixes, (QDir::System | QDir::Files), QDir::Name);
 
     foreach (QString str , portNameList) {

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
@@ -46,3 +48,4 @@ ICON = resources/icons/appicons/logo.icns
 QMAKE_INFO_PLIST = resources/Info.plist
 
 CODECFORTR = UTF-8
+TRANSLATIONS = Translations/Typica_de.ts

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 6592 "./typica.w"
+#line 6808 "./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:*/
+/*695:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*668:*/
+/*697:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:668*//*669:*/
+/*:697*//*698:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:669*//*670:*/
+/*:698*//*699:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:670*//*671:*/
+/*:699*//*700:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:671*/
+/*:700*/
 #line 81 "./daterangeselector.w"
 
-/*672:*/
+/*701:*/
 #line 207 "./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:*/
+/*702:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:673*/
+/*:702*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:672*//*674:*/
+/*:701*//*703:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:674*//*675:*/
+/*:703*//*704:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:675*//*676:*/
+/*:704*//*705:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:676*//*677:*/
+/*:705*//*706:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:677*//*678:*/
+/*:706*//*707:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:678*//*679:*/
+/*:707*//*708:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:679*//*680:*/
+/*:708*//*709:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:680*//*681:*/
+/*:709*//*710:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,12 +317,12 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:681*/
+/*:710*/
 #line 82 "./daterangeselector.w"
 
 
-#ifdef __unix__
+#if __APPLE__
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:666*/
+/*:695*/

src/daterangeselector.h

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

src/daterangeselector.w

@@ -81,7 +81,7 @@ class DateRangeSelector : public QWidget
 @<CustomDateRangePopup implementation@>
 @<DateRangeSelector implementation@>
 
-#ifdef __unix__
+#if __APPLE__
 #include "moc_daterangeselector.cpp"
 #endif
 

src/draglabel.cpp

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

src/draglabel.h

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

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 4772 "./typica.w"
+#line 4865 "./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 4774 "./typica.w"
+#line 4867 "./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/mergeseries.w

@@ -0,0 +1,285 @@
+@** Difference and Mean.
+
+\noindent Some roasters find value in comparing the difference between
+measurements on different data series. For example, the difference between
+intake and exhaust air or the difference between air and seed temperatures.
+These can be expressed as an additional relative temperature series. Similarly,
+a roaster might have multiple thermocouples where neither is individually as
+reliable as taking the mean between the two. The difference and mean series
+allow either of these to be calculated automatically.
+
+Since these are very similar structurally, a common base class is provided
+for performing some calculation based on two inputs. Difference and mean
+series then only need to override the |calculate()| method.
+
+@<Class declarations@>=
+class MergeSeries : public QObject
+{
+	Q_OBJECT
+	public:
+		MergeSeries();
+	public slots:
+		void in1(Measurement measure);
+		void in2(Measurement measure);
+	signals:
+		void newData(Measurement measure);
+	protected:
+		virtual void calculate(Measurement m1, Measurement m2) = 0;
+	private:
+		Measurement last1;
+		Measurement last2;
+		bool received1;
+		bool received2;
+};
+
+class DifferenceSeries : public MergeSeries
+{
+	Q_OBJECT
+	public:
+		DifferenceSeries();
+	protected:
+		void calculate(Measurement m1, Measurement m2);
+};
+
+class MeanSeries : public MergeSeries
+{
+	Q_OBJECT
+	public:
+		MeanSeries();
+	protected:
+		void calculate(Measurement m1, Measurement m2);
+};
+
+@ Classes derived from |MergeSeries| will wait until there is a measurement
+from both series and then call |calculate()| with the most recent measurement
+from each. This allows the use of measurements from sources with different
+sample rates, though there is no guarantee that measurements with the closest
+timestamps will be paired. This is done to minimize latency on the series.
+
+@<MergeSeries implementation@>=
+void MergeSeries::in1(Measurement measure)
+{
+	last1 = measure;
+	received1 = true;
+	if(received1 && received2)
+	{
+		calculate(last1, last2);
+		received1 = false;
+		received2 = false;
+	}
+}
+
+void MergeSeries::in2(Measurement measure)
+{
+	last2 = measure;
+	received2 = true;
+	if(received1 && received2)
+	{
+		calculate(last1, last2);
+		received1 = false;
+		received2 = false;
+	}
+}
+
+@ The constructor just needs to set the initial |bool|s to |false|.
+
+@<MergeSeries implementation@>=
+MergeSeries::MergeSeries() : QObject(NULL), received1(false), received2(false)
+{
+	/* Nothing needs to be done here. */
+}
+
+@ The calculations will emit a new |Measurement| with the calculated
+temperature value. If the measurement times are different, the highest value
+is used. A difference needs to be treated as a relative measurement whereas a
+mean does not.
+
+@<MergeSeries implementation@>=
+void DifferenceSeries::calculate(Measurement m1, Measurement m2)
+{
+	Measurement outval(m1.temperature() - m2.temperature(),
+	                   (m1.time() > m2.time() ? m1.time() : m2.time()));
+	outval.insert("relative", true);
+	emit newData(outval);
+}
+
+void MeanSeries::calculate(Measurement m1, Measurement m2)
+{
+	Measurement outval((m1.temperature() + m2.temperature()) / 2,
+                       (m1.time() > m2.time() ? m1.time() : m2.time()));
+	emit newData(outval);
+}
+
+@ Nothing special needs to happen in the constructors.
+
+@<MergeSeries implementation@>=
+DifferenceSeries::DifferenceSeries() : MergeSeries()
+{
+	/* Nothing needs to be done here. */
+}
+
+MeanSeries::MeanSeries() : MergeSeries()
+{
+	/* Nothing needs to be done here. */
+}
+
+@ The base class does not need to be exposed to the host environment, but the
+derived classes do.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructDifferenceSeries(QScriptContext *context,
+                                       QScriptEngine *engine);
+QScriptValue constructMeanSeries(QScriptContext *context,
+                                 QScriptEngine *engine);
+
+@ The constructors are registered in the usual way.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructDifferenceSeries);
+value = engine->newQMetaObject(&DifferenceSeries::staticMetaObject,
+                               constructor);
+engine->globalObject().setProperty("DifferenceSeries", value);
+constructor = engine->newFunction(constructMeanSeries);
+value = engine->newQMetaObject(&MeanSeries::staticMetaObject, constructor);
+engine->globalObject().setProperty("MeanSeries", value);
+
+@ The constructors are trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructDifferenceSeries(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new DifferenceSeries);
+	setQObjectProperties(object, engine);
+	return object;
+}
+
+QScriptValue constructMeanSeries(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new MeanSeries);
+	setQObjectProperties(object, engine);
+	return object;
+}
+
+@ Both of these require configuration, however since these are structurally
+identical, rather than create multiple configuration widgets I have opted to
+instead have a selector to choose between the two options.
+
+@<Class declarations@>=
+class MergeSeriesConfWidget : public BasicDeviceConfigurationWidget
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE MergeSeriesConfWidget(DeviceTreeModel *model,
+                                          const QModelIndex &index);
+	private slots:
+		void updateColumn1(const QString &column);
+		void updateColumn2(const QString &column);
+		void updateOutput(const QString &column);
+		void updateType(int type);
+};
+
+@ The constructor sets up the user interface.
+
+@<MergeSeriesConfWidget implementation@>=
+MergeSeriesConfWidget::MergeSeriesConfWidget(DeviceTreeModel *model,
+                                             const QModelIndex &index)
+: BasicDeviceConfigurationWidget(model, index)
+{
+	QFormLayout *layout = new QFormLayout;
+	QComboBox *type = new QComboBox;
+	type->addItem(tr("Difference"), QVariant("Difference"));
+	type->addItem(tr("Mean"), QVariant("Mean"));
+	layout->addRow(tr("Series type:"), type);
+	QLineEdit *column1 = new QLineEdit;
+	layout->addRow(tr("First input column name:"), column1);
+	QLineEdit *column2 = new QLineEdit;
+	layout->addRow(tr("Second input column name:"), column2);
+	QLineEdit *output = new QLineEdit;
+	layout->addRow(tr("Output column name:"), output);
+	@<Get device configuration data for current node@>@;
+	for(int i = 0; i < configData.size(); i++)
+	{
+		node = configData.at(i).toElement();
+		if(node.attribute("name") == "type")
+		{
+			type->setCurrentIndex(type->findData(node.attribute("value")));
+		}
+		else if(node.attribute("name") == "column1")
+		{
+			column1->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "column2")
+		{
+			column2->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "output")
+		{
+			output->setText(node.attribute("value"));
+		}
+	}
+	updateColumn1(column1->text());
+	updateColumn2(column2->text());
+	updateOutput(output->text());
+	updateType(type->currentIndex());
+	connect(column1, SIGNAL(textEdited(QString)), this, SLOT(updateColumn1(QString)));
+	connect(column2, SIGNAL(textEdited(QString)), this, SLOT(updateColumn2(QString)));
+	connect(output, SIGNAL(textEdited(QString)), this, SLOT(updateOutput(QString)));
+	connect(type, SIGNAL(currentIndexChanged(int)), this, SLOT(updateType(int)));
+	setLayout(layout);
+}
+
+@ The update methods are trivial.
+
+@<MergeSeriesConfWidget implementation@>=
+void MergeSeriesConfWidget::updateColumn1(const QString &column)
+{
+	updateAttribute("column1", column);
+}
+
+void MergeSeriesConfWidget::updateColumn2(const QString &column)
+{
+	updateAttribute("column2", column);
+}
+
+void MergeSeriesConfWidget::updateOutput(const QString &column)
+{
+	updateAttribute("output", column);
+}
+
+void MergeSeriesConfWidget::updateType(int index)
+{
+	switch(index)
+	{
+		case 0:
+			updateAttribute("type", "Difference");
+			break;
+		case 1:
+			updateAttribute("type", "Mean");
+			break;
+		default:
+			break;
+	}
+}
+
+@ This is registered with the configuration system.
+
+@<Register device configuration widgets@>=
+app.registerDeviceConfigurationWidget("mergeseries",
+                                      MergeSeriesConfWidget::staticMetaObject);
+
+@ This is accessed through the advanced features menu.
+
+@<Add node inserters to advanced features menu@>=
+NodeInserter *mergeSeriesInserter = new NodeInserter(tr("Merge Series"),
+                                                     tr("Merge"),
+                                                     "mergeseries");
+connect(mergeSeriesInserter, SIGNAL(triggered(QString, QString)),
+        this, SLOT(insertChildNode(QString, QString)));
+advancedMenu->addAction(mergeSeriesInserter);
+
+@ The class implementations are currently expanded into |"typica.cpp"|.
+
+@<Class implementations@>=
+@<MergeSeriesConfWidget implementation@>
+@<MergeSeries implementation@>
+

src/moc_scale.cpp

@@ -22,7 +22,7 @@ static const uint qt_meta_data_SerialScale[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       4,   14, // methods
+       6,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -35,7 +35,9 @@ static const uint qt_meta_data_SerialScale[] = {
  // slots: signature, parameters, type, tag, flags
       60,   12,   12,   12, 0x0a,
       67,   12,   12,   12, 0x0a,
-      75,   12,   12,   12, 0x08,
+      83,   75,   12,   12, 0x0a,
+     119,  108,   12,   12, 0x0a,
+     149,   12,   12,   12, 0x08,
 
        0        // eod
 };
@@ -43,7 +45,9 @@ static const uint qt_meta_data_SerialScale[] = {
 static const char qt_meta_stringdata_SerialScale[] = {
     "SerialScale\0\0weight,unit\0"
     "newMeasurement(double,Units::Unit)\0"
-    "tare()\0weigh()\0dataAvailable()\0"
+    "tare()\0weigh()\0command\0setWeighCommand(QString)\0"
+    "terminator\0setCommandTerminator(QString)\0"
+    "dataAvailable()\0"
 };
 
 void SerialScale::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -55,7 +59,9 @@ void SerialScale::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 0: _t->newMeasurement((*reinterpret_cast< double(*)>(_a[1])),(*reinterpret_cast< Units::Unit(*)>(_a[2]))); break;
         case 1: _t->tare(); break;
         case 2: _t->weigh(); break;
-        case 3: _t->dataAvailable(); break;
+        case 3: _t->setWeighCommand((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: _t->setCommandTerminator((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 5: _t->dataAvailable(); break;
         default: ;
         }
     }
@@ -93,9 +99,9 @@ int SerialScale::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 4)
+        if (_id < 6)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 4;
+        _id -= 6;
     }
     return _id;
 }

src/modbus.w

@@ -0,0 +1,748 @@
+@** Another Approach for Modbus RTU Support.
+
+\noindent The original code for dealing with Modbus RTU devices had a number of
+limitations. It was awkward to configure, limited to using a single device per
+bus, supported a small number of channels, and only worked with fixed point
+numeric representations. The following sections are an initial draft of a more
+flexible reworking of Modbus RTU support which should be easier to extend to
+cover Modbus TCP, allows a wider range of numeric representations, and allows
+for the use of any number of devices on the bus and any number of channels.
+
+Initial support is focused on function 3 and 4 registers with a known
+configuration. Outputs and the ability to configure inputs based on the values
+at other addresses will be added later. Modbus TCP support is also planned.
+
+Once feature parity with the old Modbus code is reached, the older code will be
+removed.
+
+Rather than use a single configuration widget for the entire bus, this is now
+split to use one configuration widget for the bus and another widget for an
+input channel.
+
+@<Class declarations@>=
+class ModbusNGConfWidget : public BasicDeviceConfigurationWidget
+{
+    Q_OBJECT
+    public:
+        Q_INVOKABLE ModbusNGConfWidget(DeviceTreeModel *model, const QModelIndex &index);
+    private slots:
+        void updatePort(const QString &value);
+        void updateBaudRate(const QString &value);
+        void updateParity(int value);
+        void updateFlowControl(int value);
+        void updateStopBits(int value);
+        void addInput();
+    private:
+        ParitySelector *m_parity;
+        FlowSelector *m_flow;
+        StopSelector *m_stop;
+};
+
+@ The configuration widget for the bus only handles the details of the serial
+port and allows adding child nodes representing input channels.
+
+@<ModbusNG implementation@>=
+ModbusNGConfWidget::ModbusNGConfWidget(DeviceTreeModel *model, const QModelIndex &index) :
+    BasicDeviceConfigurationWidget(model, index), m_parity(new ParitySelector),
+    m_flow(new FlowSelector), m_stop(new StopSelector)
+{
+    QFormLayout *layout = new QFormLayout;
+    PortSelector *port = new PortSelector;
+    BaudSelector *baud = new BaudSelector;
+    QPushButton *newInput = new QPushButton(tr("Add Input Channel"));
+    layout->addRow(QString(tr("Port:")), port);
+    layout->addRow(QString(tr("Baud rate:")), baud);
+    layout->addRow(QString(tr("Parity:")), m_parity);
+    layout->addRow(QString(tr("Flow control:")), m_flow);
+    layout->addRow(QString(tr("Stop bits:")), m_stop);
+    layout->addRow(newInput);
+
+    @<Get device configuration data for current node@>@;
+
+    for(int i = 0; i < configData.size(); i++)
+    {
+        node = configData.at(i).toElement();
+        if(node.attribute("name") == "port")
+        {
+            int idx = port->findText(node.attribute("value"));
+            if(idx >= 0)
+            {
+                port->setCurrentIndex(idx);
+            }
+            else
+            {
+                port->addItem(node.attribute("value"));
+            }
+        }
+        else if(node.attribute("name") == "baud")
+        {
+            baud->setCurrentIndex(baud->findText(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "parity")
+        {
+            m_parity->setCurrentIndex(m_parity->findData(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "flow")
+        {
+            m_flow->setCurrentIndex(m_flow->findData(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "stop")
+        {
+            m_stop->setCurrentIndex(m_stop->findData(node.attribute("value")));
+        }
+    }
+
+    updatePort(port->currentText());
+    updateBaudRate(baud->currentText());
+    updateParity(m_parity->currentIndex());
+    updateFlowControl(m_flow->currentIndex());
+    updateStopBits(m_stop->currentIndex());
+    connect(port, SIGNAL(currentIndexChanged(QString)), this, SLOT(updatePort(QString)));
+    connect(port, SIGNAL(editTextChanged(QString)), this, SLOT(updatePort(QString)));
+    connect(baud, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateBaudRate(QString)));
+    connect(m_parity, SIGNAL(currentIndexChanged(int)), this, SLOT(updateParity(int)));
+    connect(m_flow, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(updateFlowControl(int)));
+    connect(m_stop, SIGNAL(currentIndexChanged(int)), this, SLOT(updateStopBits(int)));
+    connect(newInput, SIGNAL(clicked()), this, SLOT(addInput()));
+
+    setLayout(layout);
+}
+
+void ModbusNGConfWidget::updatePort(const QString &value)
+{
+    updateAttribute("port", value);
+}
+
+void ModbusNGConfWidget::updateBaudRate(const QString &value)
+{
+    updateAttribute("baud", value);
+}
+
+void ModbusNGConfWidget::updateParity(int value)
+{
+    updateAttribute("parity", m_parity->itemData(value).toString());
+}
+
+void ModbusNGConfWidget::updateFlowControl(int value)
+{
+    updateAttribute("flow", m_flow->itemData(value).toString());
+}
+
+void ModbusNGConfWidget::updateStopBits(int value)
+{
+    updateAttribute("stop", m_stop->itemData(value).toString());
+}
+
+void ModbusNGConfWidget::addInput()
+{
+    insertChildNode(tr("Input"), "modbusnginput");
+}
+
+@ Next, there is a configuration widget for input channels.
+
+@<Class declarations@>=
+class ModbusNGInputConfWidget : public BasicDeviceConfigurationWidget
+{
+    Q_OBJECT
+    public:
+        Q_INVOKABLE ModbusNGInputConfWidget(DeviceTreeModel *model, const QModelIndex &index);
+    private slots:
+        void updateStation(int value);
+        void updateAddress(int value);
+        void updateFunction(int value);
+        void updateFormat(int value);
+        void updateDecimals(int value);
+        void updateUnit(int value);
+        void updateColumnName(const QString &value);
+        void updateHidden(bool value);
+};
+
+@ This is where the function, address, and additional required details about
+an input channel are defind.
+
+@<ModbusNG implementation@>=
+ModbusNGInputConfWidget::ModbusNGInputConfWidget(DeviceTreeModel *model, const QModelIndex &index) : BasicDeviceConfigurationWidget(model, index)
+{
+    QFormLayout *layout = new QFormLayout;
+    QSpinBox *station = new QSpinBox;
+    station->setMinimum(1);
+    station->setMaximum(247);
+    layout->addRow(tr("Station ID"), station);
+    QComboBox *function = new QComboBox;
+    function->addItem("3", "3");
+    function->addItem("4", "4");
+    function->setCurrentIndex(1);
+    layout->addRow(tr("Function"), function);
+    ShortHexSpinBox *address = new ShortHexSpinBox;
+    layout->addRow(tr("Address"), address);
+    QComboBox *format = new QComboBox;
+    format->addItem(tr("16 bits fixed point"), "16fixedint");
+    format->addItem(tr("32 bits floating point (High Low)"), "32floathl");
+    format->addItem(tr("32 bits floating point (Low High)"), "32floatlh");
+    layout->addRow(tr("Data format"), format);
+    QSpinBox *decimals = new QSpinBox;
+    decimals->setMinimum(0);
+    decimals->setMaximum(9);
+    layout->addRow(tr("Decimal places"), decimals);
+    QComboBox *unit = new QComboBox;
+    unit->addItem("Celsius", "C");
+    unit->addItem("Fahrenheit", "F");
+    unit->addItem("Control", "Control");
+    unit->setCurrentIndex(1);
+    layout->addRow(tr("Unit"), unit);
+    QLineEdit *column = new QLineEdit;
+    layout->addRow(tr("Column name"), column);
+    QCheckBox *hidden = new QCheckBox(tr("Hide this channel"));
+    layout->addRow(hidden);
+    
+    @<Get device configuration data for current node@>@;
+    for(int i = 0; i < configData.size(); i++)
+    {
+        node = configData.at(i).toElement();
+        if(node.attribute("name") == "station")
+        {
+            station->setValue(node.attribute("value").toInt());
+        }
+        else if(node.attribute("name") == "function")
+        {
+            function->setCurrentIndex(function->findText(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "address")
+        {
+            address->setValue(node.attribute("value").toInt());
+        }
+        else if(node.attribute("name") == "format")
+        {
+            format->setCurrentIndex(format->findData(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "decimals")
+        {
+            decimals->setValue(node.attribute("value").toInt());
+        }
+        else if(node.attribute("name") == "unit")
+        {
+            unit->setCurrentIndex(unit->findData(node.attribute("value")));
+        }
+        else if(node.attribute("name") == "column")
+        {
+            column->setText(node.attribute("value"));
+        }
+        else if(node.attribute("name") == "hidden")
+        {
+            hidden->setChecked(node.attribute("value") == "true" ? true : false);
+        }
+    }
+    updateStation(station->value());
+    updateFunction(function->currentIndex());
+    updateAddress(address->value());
+    updateFormat(format->currentIndex());
+    updateDecimals(decimals->value());
+    updateUnit(unit->currentIndex());
+    updateColumnName(column->text());
+    updateHidden(hidden->isChecked());
+    
+    connect(station, SIGNAL(valueChanged(int)), this, SLOT(updateStation(int)));
+    connect(function, SIGNAL(currentIndexChanged(int)), this, SLOT(updateFunction(int)));
+    connect(address, SIGNAL(valueChanged(int)), this, SLOT(updateAddress(int)));
+    connect(format, SIGNAL(currentIndexChanged(int)), this, SLOT(updateFormat(int)));
+    connect(decimals, SIGNAL(valueChanged(int)), this, SLOT(updateDecimals(int)));
+    connect(unit, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUnit(int)));
+    connect(column, SIGNAL(textEdited(QString)), this, SLOT(updateColumnName(QString)));
+    connect(hidden, SIGNAL(toggled(bool)), this, SLOT(updateHidden(bool)));
+    
+    setLayout(layout);
+}
+
+void ModbusNGInputConfWidget::updateStation(int value)
+{
+    updateAttribute("station", QString("%1").arg(value));
+}
+
+void ModbusNGInputConfWidget::updateFunction(int  value)
+{
+    updateAttribute("function", QString("%1").arg(value == 0 ? "3" : "4"));
+}
+
+void ModbusNGInputConfWidget::updateAddress(int value)
+{
+    updateAttribute("address", QString("%1").arg(value));
+}
+
+void ModbusNGInputConfWidget::updateFormat(int value)
+{
+    switch(value)
+    {
+        case 0:
+            updateAttribute("format", "16fixedint");
+            break;
+        case 1:
+            updateAttribute("format", "32floathl");
+            break;
+        case 2:
+            updateAttribute("format", "32floatlh");
+            break;
+    }
+}
+
+void ModbusNGInputConfWidget::updateDecimals(int value)
+{
+    updateAttribute("decimals", QString("%1").arg(value));
+}
+
+void ModbusNGInputConfWidget::updateUnit(int value)
+{
+    switch(value)
+    {
+        case 0:
+            updateAttribute("unit", "C");
+            break;
+        case 1:
+            updateAttribute("unit", "F");
+            break;
+        case 2:
+	        updateAttribute("unit", "Control");
+	        break;
+    }
+}
+
+void ModbusNGInputConfWidget::updateColumnName(const QString &value)
+{
+    updateAttribute("column", value);
+}
+
+void ModbusNGInputConfWidget::updateHidden(bool value)
+{
+    updateAttribute("hidden", value ? "true" : "false");
+}
+
+@ The configuration widgets need to be registered.
+
+@<Register device configuration widgets@>=
+app.registerDeviceConfigurationWidget("modbusngport", ModbusNGConfWidget::staticMetaObject);
+app.registerDeviceConfigurationWidget("modbusnginput",
+                                      ModbusNGInputConfWidget::staticMetaObject);
+
+@ A |NodeInserter| is also needed.
+
+@<Register top level device configuration nodes@>=
+inserter = new NodeInserter(tr("ModbusNG Port"), tr("Modbus RTU Port"), "modbusngport", NULL);
+topLevelNodeInserters.append(inserter);
+
+@ While the old design only needed to deal with a small number of potential
+messages and responses, it makes sense for the new design to use a scan list
+of arbitrary length. An initial implementation can simply store the data needed
+to make requests, properly interpret the results, and output data to the
+correct channels. There is room to improve operational efficiency later by
+batching operations on adjacent addresses on the same function into a single
+request, but there are known devices in use in coffee roasters which do not
+support reading from multiple registers simultaneously, so there must also be a
+way to turn such optimizations off.
+
+@<Class declarations@>=
+enum ModbusDataFormat
+{
+    Int16,
+    FloatHL,
+    FloatLH
+};
+
+struct ModbusScanItem
+{
+    QByteArray request;
+    ModbusDataFormat format;
+    int decimalPosition;
+    Units::Unit unit;
+    mutable double lastValue;
+};
+
+@ Another class is used to handle the communication with the bus and serve as
+an integration point for \pn{}.
+
+@<Class declarations@>=
+class ModbusNG : public QObject
+{
+    Q_OBJECT
+    public:
+        ModbusNG(DeviceTreeModel *model, const QModelIndex &index);
+        ~ModbusNG();
+        Q_INVOKABLE int channelCount();
+        Channel* getChannel(int);
+        Q_INVOKABLE QString channelColumnName(int);
+        Q_INVOKABLE QString channelIndicatorText(int);
+        Q_INVOKABLE bool isChannelHidden(int);
+        Q_INVOKABLE QString channelType(int);
+    private slots:
+        void sendNextMessage();
+        void timeout();
+        void dataAvailable();
+        void rateLimitTimeout();
+    private:
+        quint16 calculateCRC(QByteArray data);
+        QextSerialPort *port;
+        int delayTime;
+        QTimer *messageDelayTimer;
+        QTimer *commTimeout;
+        QTimer *rateLimiter;
+        int scanPosition;
+        bool waiting;
+        QByteArray responseBuffer;
+        QList<Channel*> channels;
+        QList<ModbusScanItem> scanList;
+        QList<QString> channelNames;
+        QList<QString> channelLabels;
+        QList<bool> hiddenStates;
+        QList<QString> channelTypeList;
+        QVector<double> lastMeasurement;
+};
+
+@ One of the things that the old Modbus code got right was in allowing the
+constructor to handle device configuration by accepting its configuration
+sub-tree. In this design, child nodes establish a scan list.
+
+@<ModbusNG implementation@>=
+ModbusNG::ModbusNG(DeviceTreeModel *model, const QModelIndex &index) :
+    QObject(NULL), messageDelayTimer(new QTimer), commTimeout(new QTimer),
+    rateLimiter(new QTimer), scanPosition(0), waiting(false)
+{
+    QDomElement portReferenceElement =
+        model->referenceElement(model->data(index, Qt::UserRole).toString());
+    QDomNodeList portConfigData = portReferenceElement.elementsByTagName("attribute");
+    QDomElement node;
+    QVariantMap attributes;
+    for(int i = 0; i < portConfigData.size(); i++)
+    {
+        node = portConfigData.at(i).toElement();
+        attributes.insert(node.attribute("name"), node.attribute("value"));
+    }
+    port = new QextSerialPort(attributes.value("port").toString(),
+                              QextSerialPort::EventDriven);
+    port->setBaudRate((BaudRateType)(attributes.value("baud").toInt()));
+    port->setDataBits(DATA_8);
+    port->setParity((ParityType)attributes.value("parity").toInt());
+    port->setStopBits((StopBitsType)attributes.value("stop").toInt());
+    port->setFlowControl((FlowType)attributes.value("flow").toInt());
+    delayTime = (int)(((double)(1)/(double)(attributes.value("baud").toInt())) * 144000.0);
+    messageDelayTimer->setSingleShot(true);
+    commTimeout->setSingleShot(true);
+    rateLimiter->setSingleShot(true);
+    rateLimiter->setInterval(0);
+    connect(messageDelayTimer, SIGNAL(timeout()), this, SLOT(sendNextMessage()));
+    connect(commTimeout, SIGNAL(timeout()), this, SLOT(timeout()));
+    connect(port, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
+    connect(rateLimiter, SIGNAL(timeout()), this, SLOT(rateLimitTimeout()));
+    if(!port->open(QIODevice::ReadWrite))
+    {
+	    qDebug() << "Failed to open serial port";
+    }
+    for(int i = 0; i < model->rowCount(index); i++)
+    {
+        QModelIndex channelIndex = model->index(i, 0, index);
+        QDomElement channelReferenceElement =
+            model->referenceElement(model->data(channelIndex, Qt::UserRole).toString());
+        QDomNodeList channelConfigData =
+            channelReferenceElement.elementsByTagName("attribute");
+        QDomElement channelNode;
+        QVariantMap channelAttributes;
+        for(int j = 0; j < channelConfigData.size(); j++)
+        {
+            channelNode = channelConfigData.at(j).toElement();
+            channelAttributes.insert(channelNode.attribute("name"),
+                                     channelNode.attribute("value"));
+        }
+        ModbusScanItem scanItem;
+        QString format = channelAttributes.value("format").toString();
+        if(format == "16fixedint")
+        {
+            scanItem.format = Int16;
+        }
+        else if(format == "32floathl")
+        {
+            scanItem.format = FloatHL;
+        }
+        else if(format == "32floatlh")
+        {
+            scanItem.format = FloatLH;
+        }
+        scanItem.request.append((char)channelAttributes.value("station").toInt());
+        scanItem.request.append((char)channelAttributes.value("function").toInt());
+        quint16 startAddress = (quint16)channelAttributes.value("address").toInt();
+        char *startAddressBytes = (char*)&startAddress;
+        scanItem.request.append(startAddressBytes[1]);
+        scanItem.request.append(startAddressBytes[0]);
+        scanItem.request.append((char)0x00);
+        if(scanItem.format == Int16)
+        {
+            scanItem.request.append((char)0x01);
+        }
+        else
+        {
+            scanItem.request.append((char)0x02);
+        }
+        quint16 crc = calculateCRC(scanItem.request);
+        char *crcBytes = (char*)&crc;
+        scanItem.request.append(crcBytes[0]);
+        scanItem.request.append(crcBytes[1]);
+        scanItem.decimalPosition = channelAttributes.value("decimals").toInt();
+        if(channelAttributes.value("unit").toString() == "C")
+        {
+            scanItem.unit = Units::Celsius;
+            channelTypeList.append("T");
+        }
+        else if(channelAttributes.value("unit").toString() == "F")
+        {
+            scanItem.unit = Units::Fahrenheit;
+            channelTypeList.append("T");
+        }
+        else
+        {
+	        scanItem.unit = Units::Unitless;
+	        channelTypeList.append("C");
+        }
+        scanList.append(scanItem);
+        lastMeasurement.append(0.0);
+        channels.append(new Channel);
+        channelNames.append(channelAttributes.value("column").toString());
+        hiddenStates.append(
+            channelAttributes.value("hidden").toString() == "true" ? true : false);
+        channelLabels.append(model->data(channelIndex, 0).toString());
+    }
+    messageDelayTimer->start();
+}
+
+ModbusNG::~ModbusNG()
+{
+    commTimeout->stop();
+    messageDelayTimer->stop();
+    port->close();
+}
+
+void ModbusNG::sendNextMessage()
+{
+    if(scanList.length() > 0 && !waiting)
+    {
+        port->write(scanList.at(scanPosition).request);
+        commTimeout->start(2000);
+        messageDelayTimer->start(delayTime);
+        waiting = true;
+    }
+}
+
+void ModbusNG::timeout()
+{
+    qDebug() << "Communications timeout.";
+    messageDelayTimer->start();
+}
+
+void ModbusNG::rateLimitTimeout()
+{
+	messageDelayTimer->start();
+}
+
+void ModbusNG::dataAvailable()
+{
+    if(messageDelayTimer->isActive())
+    {
+        messageDelayTimer->stop();
+    }
+    responseBuffer.append(port->readAll());
+    if(responseBuffer.size() < 5)
+    {
+        return;
+    }
+    if(responseBuffer.size() < 5 + responseBuffer.at(2))
+    {
+        return;
+    }
+    responseBuffer = responseBuffer.left(5 + responseBuffer.at(2));
+    commTimeout->stop();
+    if(calculateCRC(responseBuffer) == 0)
+    {
+        quint16 intresponse;
+        float floatresponse;
+        char *ibytes = (char*)&intresponse;
+        char *fbytes = (char*)&floatresponse;
+        double output;
+        switch(scanList.at(scanPosition).format)
+        {
+            case Int16:
+                ibytes[0] = responseBuffer.at(4);
+                ibytes[1] = responseBuffer.at(3);
+                output = intresponse;
+                for(int i = 0; i < scanList.at(scanPosition).decimalPosition; i++)
+                {
+                    output /= 10;
+                }
+                break;
+            case FloatHL:
+                fbytes[0] = responseBuffer.at(4);
+                fbytes[1] = responseBuffer.at(3);
+                fbytes[2] = responseBuffer.at(6);
+                fbytes[3] = responseBuffer.at(5);
+                output = floatresponse;
+                break;
+            case FloatLH:
+                fbytes[0] = responseBuffer.at(6);
+                fbytes[1] = responseBuffer.at(5);
+                fbytes[2] = responseBuffer.at(4);
+                fbytes[3] = responseBuffer.at(3);
+                output = floatresponse;
+                break;
+        }
+        if(scanList.at(scanPosition).unit == Units::Celsius)
+        {
+            output = output * 9.0 / 5.0 + 32.0;
+        }
+        scanList.at(scanPosition).lastValue = output;
+    }
+    else
+    {
+        qDebug() << "CRC failed";
+    }
+    scanPosition = (scanPosition + 1) % scanList.size();
+    if(scanPosition == 0)
+    {
+        QTime time = QTime::currentTime();
+        bool doOutput = false;
+        for(int i = 0; i < scanList.size(); i++)
+        {
+	        if(scanList.at(i).lastValue != lastMeasurement.at(i))
+	        {
+		        doOutput = true;
+		        break;
+	        }
+        }
+        if(doOutput)
+        {
+	        for(int i = 0; i < scanList.size(); i++)
+	        {
+		        lastMeasurement[i] = scanList.at(i).lastValue;
+		        if(scanList.at(scanPosition).unit == Units::Unitless)
+		        {
+			        channels.at(i)->input(Measurement(scanList.at(i).lastValue, time, Units::Unitless));
+		        }
+		        else
+		        {
+		            channels.at(i)->input(Measurement(scanList.at(i).lastValue, time, Units::Fahrenheit));
+	            }
+            }
+        }
+    }
+    responseBuffer.clear();
+    waiting = false;
+    if(scanPosition == 0)
+    {
+	    rateLimiter->start();
+    }
+    else
+    {
+	    messageDelayTimer->start(delayTime);
+    }
+}
+
+quint16 ModbusNG::calculateCRC(QByteArray data)
+{
+    quint16 retval = 0xFFFF;
+    int i = 0;
+    while(i < data.size())
+    {
+        retval ^= 0x00FF & (quint16)data.at(i);
+        for(int j = 0; j < 8; j++)
+        {
+            if(retval & 1)
+            {
+                retval = (retval >> 1) ^ 0xA001;
+            }
+            else
+            {
+                retval >>= 1;
+            }
+        }
+        i++;
+    }
+    return retval;
+}
+
+int ModbusNG::channelCount()
+{
+    return channels.size();
+}
+
+Channel* ModbusNG::getChannel(int channel)
+{
+    return channels.at(channel);
+}
+
+QString ModbusNG::channelColumnName(int channel)
+{
+    return channelNames.at(channel);
+}
+
+QString ModbusNG::channelIndicatorText(int channel)
+{
+    return channelLabels.at(channel);
+}
+
+bool ModbusNG::isChannelHidden(int channel)
+{
+    return hiddenStates.at(channel);
+}
+
+QString ModbusNG::channelType(int channel)
+{
+	return channelTypeList.at(channel);
+}
+
+@ This class must be exposed to the host environment.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructModbusNG(QScriptContext *context, QScriptEngine *engine);
+void setModbusNGProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue ModbusNG_getChannel(QScriptContext *context, QScriptEngine *engine);
+
+@ The host environment is informed of the constructor.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructModbusNG);
+value = engine->newQMetaObject(&ModbusNG::staticMetaObject, constructor);
+engine->globalObject().setProperty("ModbusNG", value);
+
+@ The constructor takes the configuration model and the index to the device as
+arguments.
+
+@<Functions for scripting@>=
+QScriptValue constructModbusNG(QScriptContext *context, QScriptEngine *engine)
+{
+    QScriptValue object;
+    if(context->argumentCount() == 2)
+    {
+        object = engine->newQObject(new ModbusNG(argument<DeviceTreeModel *>(0, context),
+                                                 argument<QModelIndex>(1, context)),
+                                    QScriptEngine::ScriptOwnership);
+        setModbusNGProperties(object, engine);
+    }
+    else
+    {
+        context->throwError("Incorrect number of arguments passed to "@|
+            "ModbusNG constructor.");
+    }
+    return object;
+}
+
+void setModbusNGProperties(QScriptValue value, QScriptEngine *engine)
+{
+    setQObjectProperties(value, engine);
+    value.setProperty("getChannel", engine->newFunction(ModbusNG_getChannel));
+}
+
+QScriptValue ModbusNG_getChannel(QScriptContext *context, QScriptEngine *engine)
+{
+    ModbusNG *self = getself<ModbusNG *>(context);
+    QScriptValue object;
+    if(self)
+    {
+        object = engine->newQObject(self->getChannel(argument<int>(0, context)));
+        setChannelProperties(object, engine);
+    }
+    return object;
+}

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/resources/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Typica 1.7.0</string>
+	<string>Typica 1.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>@TYPEINFO@</string>
 	<key>CFBundleExecutable</key>
@@ -17,10 +17,10 @@
 	<key>CFBundleDisplayName</key>
 	<string>Typica</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.0</string>
+	<string>1.8.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.0</string>
+	<string>1.8.0</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2007–2016 Neal Wilson</string>
+	<string>© 2007–2017 Neal Wilson</string>
 </dict>
 </plist>

src/resources/html/about.html

@@ -1,32 +1,30 @@
 <!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">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>Typica - Data for Coffee Roasters</title>
+		<title>Typica - Software for Coffee Roasting Operations</title>
 		<link rel="stylesheet" type="text/css" href="style.css" />
 	</head>
 	<body>
 		<div id="page">
 			<div id="topmatter">
 				<div class="topbanner">
-					<a href="http://www.randomfield.com/programs/typica/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
-					<h1><a href="http://www.randomfield.com/programs/typica/">Typica</a></h1>
-					<h2>Version 1.7.0</h2>
+					<a href="https://typica.us/"><img src="../icons/appicons/logo96.png" height="96px" width="96px" alt="Typica logo" /></a>
+					<h1><a href="https://typica.us/">Typica</a></h1>
+					<h2>Version 1.8.0</h2>
 				</div>
 			<div id="maintext">
-				<p>Copyright &copy; 2007&ndash;2016 Neal Evan Wilson
+				<p>Copyright &copy; 2007&ndash;2017 Neal Evan Wilson
 					<span class="icons">
-						<a href="mailto:roaster@wilsonscoffee.com?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
+						<a href="mailto:neal@typica.us?subject=Thanks%20for%20Typica&amp;body=Message%20initiated%20from%20Typica.">&#9993;</a>
 						<a href="https://twitter.com/N3Roaster">&#62217;</a>
 						<a href="https://github.com/N3Roaster">&#62208;</a>
-						<a href="http://appliedcoffeetechnology.tumblr.com/">&#62229;</a>
-						<a href="http://www.linkedin.com/profile/view?id=179814079">&#62232;</a>
 					</span>
 				</p>
 				<p>German Translation: Mario Champignon
-                                    <span class="icons">
-                                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
-                                    </span>
-                                </p>
+                    <span class="icons">
+                        <a href="mailto:mario_champignon@hotmail.com">&#9993;</a>
+                    </span>
+                </p>
 				
 				<h3>License Information</h3>
 				<p>Permission is hereby granted, free of charge, to any person
@@ -93,7 +91,13 @@
 					<li>The name Michael Bostock may not be used to endorse or promote products derived from this software without specific prior written permission.
 				</ul>
 				<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-
+				<p>QR codes are generated by a slightly modified <a href="https://github.com/papnkukn/qrcode-svg">qrcode-svg</a> which is provided under the following license.</p>
+				<p>The MIT License (MIT)</p>
+				<p>Copyright (c) 2016 papnkukn</p>
+				<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+				<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+				<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
+				<p>The word "QR Code" is <a href="http://www.denso-wave.com/qrcode/faqpatent-e.html">registered trademark of DENSO WAVE INCORPORATED</a>.</p>
 			</div>
 		</div>
 	</body>

src/resources/icons/appicons/logo.svg

@@ -1,18 +1,84 @@
-<?xml version="1.0" standalone="yes"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 512 512" width="512px" height="512px">
-	<title>Typica application icon</title>
-	<defs>
-		<radialGradient id="orangeradial" gradientUnits="userSpaceOnUse" cx="288" cy="288" r="320" fx="320" fy="320" spreadMethod="pad">
-			<stop offset="0%" stop-color="orangered" />
-			<stop offset="100%" stop-color="white" />
-		</radialGradient>
-		<radialGradient id="flame" gradientUnits="userSpaceOnUse" cx="192" cy="320" r="224" fx="224" fy="352" spreadmethod="pad">
-			<stop offset="65%" stop-color="royalblue" />
-			<stop offset="100%" stop-color="aliceblue" />
-		</radialGradient>
-	</defs>
-	<path d="M416 32 L416 480 L32 480 L32 480 L32 96 A64 64 0 0 1 96 32 Z" stroke="orangered" stroke-width="1" fill="url(#orangeradial)" />
-	<path d="M32 384 L160 128 L480 288 L384 480 L32 480 Z" stroke="orangered" stroke-width="1" fill="aliceblue" />
-	<path d="M64 352 C64 448 352 448 352 352 Q352 320 288 256 C224 192 224 160 288 96 C192 96 64 288 64 352" stroke="royalblue" fill="url(#flame)" stroke-width="1" />
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="205.03497mm"
+   height="205.03497mm"
+   viewBox="0 0 726.50187 726.50187"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="typica2logo.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="437.07058"
+     inkscape:cy="264.99486"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     inkscape:window-x="-5"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4667" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-20.191517,-307.72555)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     style="display:inline;opacity:1"
+     transform="translate(-20.191517,-307.72555)">
+    <path
+       style="fill:#7f6a0d;fill-opacity:1;stroke:#8a7127;stroke-width:1.00999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       d="M 20.76606,1032.3588 C 22.14203,896.38392 73.17102,731.09727 146.2537,611.20266 216.74295,509.15107 235.78235,504.35496 305.5479,447.39049 340.61147,417.6994 379.33066,338.50538 388.03248,324.7659 c 1.27482,64.16895 -12.66237,162.28087 -17.0384,226.23928 -7.89434,68.25736 -12.71934,137.33988 -28.45455,204.33381 -12.61427,42.79597 -18.00679,31.23433 -77.25862,35.52947 C 171.58481,865.99877 79.3506,933.87182 20.76606,1032.3588 Z"
+       id="path3462"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:#053d1a;fill-opacity:1;stroke:#679b27;stroke-width:2.05999994;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       d="m 21.10538,1031.605 c 54.0778,-104.01153 121.63419,-191.53118 229.58628,-244.0922 100.53161,-42.70356 222.64766,-3.87115 320.77056,37.23617 54.94778,23.8555 114.20568,40.7637 174.57878,39.5697 -73.2709,59.97445 -165.88148,85.56725 -254.68528,112.7226 -69.99517,19.70993 -142.97415,31.19113 -215.74856,24.48983 -85.44247,-3.3499 -174.52237,-4.7892 -254.50178,30.0739 z"
+       id="path3464"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>

src/scale.cpp

@@ -1,5 +1,5 @@
-/*1008:*/
-#line 131 "./scales.w"
+/*1060:*/
+#line 135 "./scales.w"
 
 #include "scale.h"
 #include <QStringList> 
@@ -10,8 +10,8 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:1008*//*1009:*/
-#line 149 "./scales.w"
+/*:1060*//*1061:*/
+#line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
 {
@@ -24,8 +24,8 @@ responseBuffer.clear();
 }
 else
 {
-/*1010:*/
-#line 189 "./scales.w"
+/*1062:*/
+#line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
 if(responseParts.size()> 2)
@@ -35,34 +35,34 @@ responseParts.replace(0,QString("-%1").arg(responseParts[0]));
 }
 double weight= responseParts[0].toDouble();
 Units::Unit unit= Units::Unitless;
-if(responseParts[1]=="lb")
+if(responseParts[1].compare("lb",Qt::CaseInsensitive)==0)
 {
 unit= Units::Pound;
 }
-else if(responseParts[1]=="kg")
+else if(responseParts[1].compare("kg",Qt::CaseInsensitive)==0)
 {
 unit= Units::Kilogram;
 }
-else if(responseParts[1]=="g")
+else if(responseParts[1].compare("g",Qt::CaseInsensitive)==0)
 {
 unit= Units::Gram;
 }
-else if(responseParts[1]=="oz")
+else if(responseParts[1].compare("oz",Qt::CaseInsensitive)==0)
 {
 unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1010*/
-#line 161 "./scales.w"
+/*:1062*/
+#line 165 "./scales.w"
 
 responseBuffer.clear();
 }
 }
 }
 
-/*:1009*//*1011:*/
-#line 220 "./scales.w"
+/*:1061*//*1063:*/
+#line 224 "./scales.w"
 
 void SerialScale::tare()
 {
@@ -71,7 +71,29 @@ write("!KT\x0D");
 
 void SerialScale::weigh()
 {
-write("!KP\x0D");
+
+write(weighCommand+commandTerminator);
+}
+
+void SerialScale::setWeighCommand(const QString&command)
+{
+weighCommand= command.toAscii();
+}
+
+void SerialScale::setCommandTerminator(const QString&terminator)
+{
+if(terminator=="CRLF")
+{
+commandTerminator= "\x0D\x0A";
+}
+else if(terminator=="CR")
+{
+commandTerminator= "\x0D";
+}
+else if(terminator=="LF")
+{
+commandTerminator= "\x0A";
+}
 }
 
-/*:1011*/
+/*:1063*/

src/scale.h

@@ -1,4 +1,4 @@
-/*1007:*/
+/*1059:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -15,14 +15,18 @@ SerialScale(const QString&port);
 public slots:
 void tare();
 void weigh();
+void setWeighCommand(const QString&command);
+void setCommandTerminator(const QString&terminator);
 signals:
 void newMeasurement(double weight,Units::Unit unit);
 private slots:
 void dataAvailable();
 private:
 QByteArray responseBuffer;
+QByteArray weighCommand;
+QByteArray commandTerminator;
 };
 
 #endif
 
-/*:1007*/
+/*:1059*/

src/scales.w

@@ -115,12 +115,16 @@ class SerialScale : public QextSerialPort
 	public slots:
 		void tare();
 		void weigh();
+		void setWeighCommand(const QString &command);
+		void setCommandTerminator(const QString &terminator);
 	signals:
 		void newMeasurement(double weight, Units::Unit unit);
 	private slots:
 		void dataAvailable();
 	private:
 		QByteArray responseBuffer;
+		QByteArray weighCommand;
+		QByteArray commandTerminator;
 };
 
 #endif
@@ -195,19 +199,19 @@ if(responseParts.size() > 2)
 }
 double weight = responseParts[0].toDouble();
 Units::Unit unit = Units::Unitless;
-if(responseParts[1] == "lb")
+if(responseParts[1].compare("lb", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Pound;
 }
-else if(responseParts[1] == "kg")
+else if(responseParts[1].compare("kg", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Kilogram;
 }
-else if(responseParts[1] == "g")
+else if(responseParts[1].compare("g", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Gram;
 }
-else if(responseParts[1] == "oz")
+else if(responseParts[1].compare("oz", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Ounce;
 }
@@ -225,7 +229,29 @@ void SerialScale::tare()
 
 void SerialScale::weigh()
 {
-	write("!KP\x0D");
+	//write("!KP\x0D");
+	write(weighCommand + commandTerminator);
+}
+
+void SerialScale::setWeighCommand(const QString &command)
+{
+	weighCommand = command.toAscii();
+}
+
+void SerialScale::setCommandTerminator(const QString &terminator)
+{
+	if(terminator == "CRLF")
+	{
+		commandTerminator = "\x0D\x0A";
+	}
+	else if(terminator == "CR")
+	{
+		commandTerminator = "\x0D";
+	}
+	else if(terminator == "LF")
+	{
+		commandTerminator = "\x0A";
+	}
 }
 
 @ This must be available to the host environment.
@@ -380,12 +406,16 @@ class SerialScaleConfWidget : public BasicDeviceConfigurationWidget
 		void updateParity(int index);
 		void updateFlowControl(int index);
 		void updateStopBits(int index);
+		void updateWeighCommand(const QString &command);
+		void updateCommandTerminator(const QString &terminator);
 	private:
 		PortSelector *port;
 		BaudSelector *baud;
 		ParitySelector *parity;
 		FlowSelector *flow;
 		StopSelector *stop;
+		QLineEdit *weighcommand;
+		QComboBox *commandterminator;
 };
 
 @ This is very similar to other configuration widgets.
@@ -395,7 +425,8 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
                                              const QModelIndex &index)
 : BasicDeviceConfigurationWidget(model, index),
   port(new PortSelector), baud(new BaudSelector), parity(new ParitySelector),
-  flow(new FlowSelector), stop(new StopSelector)
+  flow(new FlowSelector), stop(new StopSelector),
+  weighcommand(new QLineEdit("!KP")), commandterminator(new QComboBox)
 {
 	QFormLayout *layout = new QFormLayout;
 	layout->addRow(tr("Port:"), port);
@@ -415,6 +446,16 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
 	layout->addRow(tr("Stop Bits:"), stop);
 	connect(stop, SIGNAL(currentIndexChanged(int)),
 	        this, SLOT(updateStopBits(int)));
+	layout->addRow(tr("Weigh Command:"), weighcommand);
+	connect(weighcommand, SIGNAL(textChanged(QString)),
+	        this, SLOT(updateWeighCommand(QString)));
+	commandterminator->addItem("CRLF");
+	commandterminator->addItem("CR");
+	commandterminator->addItem("LF");
+	layout->addRow(tr("Command Terminator:"), commandterminator);
+	connect(commandterminator, SIGNAL(currentIndexChanged(QString)),
+	        this, SLOT(updateCommandTerminator(QString)));
+	
 	@<Get device configuration data for current node@>@;
 	for(int i = 0; i < configData.size(); i++)
 	{
@@ -448,12 +489,23 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
 		{
 			stop->setCurrentIndex(stop->findData(node.attribute("value")));
 		}
+		else if(node.attribute("name") == "weighcommand")
+		{
+			weighcommand->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "commandterminator")
+		{
+			commandterminator->setCurrentIndex(
+				commandterminator->findText(node.attribute("value")));
+		}
 	}
 	updatePort(port->currentText());
 	updateBaudRate(baud->currentText());
 	updateParity(parity->currentIndex());
 	updateFlowControl(flow->currentIndex());
 	updateStopBits(stop->currentIndex());
+	updateWeighCommand(weighcommand->text());
+	updateCommandTerminator(commandterminator->currentText());
 	setLayout(layout);
 }
 
@@ -485,6 +537,16 @@ void SerialScaleConfWidget::updateStopBits(int index)
 	updateAttribute("stopbits", stop->itemData(index).toString());
 }
 
+void SerialScaleConfWidget::updateWeighCommand(const QString &command)
+{
+	updateAttribute("weighcommand", command);
+}
+
+void SerialScaleConfWidget::updateCommandTerminator(const QString &terminator)
+{
+	updateAttribute("commandterminator", terminator);
+}
+
 @ The configuration widget is registered with the configuration system.
 
 @<Register device configuration widgets@>=

src/thresholdannotation.w

@@ -0,0 +1,220 @@
+@** Threshold Annotations.
+
+\noindent Value annotations are fine for cases where we want to capture the
+fact that a control series has changed to some specific value, but there are
+times when it is more useful to know when a data series has passed through some
+value in a particular direction even if the exact value of interest is never
+directly recorded. For example, it would be possible to automatically mark a
+point near turnaround by watching for a rate of temperature change ascending
+through 0. This could also be set up to match range timers and mark events of
+interest that begin at consistent temperatures.
+
+As usual, this is a feature that must be configured on a per roaster basis.
+
+@<Class declarations@>=
+class ThresholdAnnotationConfWidget : public BasicDeviceConfigurationWidget
+{
+    Q_OBJECT
+    public:
+        Q_INVOKABLE ThresholdAnnotationConfWidget(DeviceTreeModel *model,
+                                                  const QModelIndex &index);
+    private slots:
+        void updateSourceColumn(const QString &source);
+        void updateThreshold(double value);
+        void updateDirection(int index);
+        void updateAnnotation(const QString &note);
+};
+
+@ The configuration widget needs to provide fields for determining which data
+series should be used to generate the annotation, the value that the
+|ThresholdDetector| should use as its trigger, the direction this should fire
+on, and the text of the annotation.
+
+@<ThresholdAnnotationConfWidget implementation@>=
+ThresholdAnnotationConfWidget::ThresholdAnnotationConfWidget(DeviceTreeModel *model,
+                                                             const QModelIndex &index)
+: BasicDeviceConfigurationWidget(model, index)
+{
+    QFormLayout *layout = new QFormLayout;
+    QLineEdit *source = new QLineEdit;
+    layout->addRow(tr("Source column name:"), source);
+    QDoubleSpinBox *value = new QDoubleSpinBox;
+    value->setMinimum(-9999.99);
+    value->setMaximum(9999.99);
+    value->setDecimals(2);
+    layout->addRow(tr("Threshold value:"), value);
+    QComboBox *direction = new QComboBox;
+    direction->addItem(tr("Ascending"));
+    direction->addItem(tr("Descending"));
+    layout->addRow(tr("Direction:"), direction);
+    QLineEdit *annotation = new QLineEdit;
+    layout->addRow(tr("Annotation:"), annotation);
+    @<Get device configuration data for current node@>@;
+    for(int i = 0; i < configData.size(); i++)
+    {
+        node = configData.at(i).toElement();
+        if(node.attribute("name") == "source")
+        {
+            source->setText(node.attribute("value"));
+        }
+        else if(node.attribute("name") == "value")
+        {
+            value->setValue(node.attribute("value").toDouble());
+        }
+        else if(node.attribute("name") == "direction")
+        {
+            direction->setCurrentIndex(node.attribute("value").toInt());
+        }
+        else if(node.attribute("name") == "annotation")
+        {
+            annotation->setText(node.attribute("value"));
+        }
+    }
+    updateSourceColumn(source->text());
+    updateThreshold(value->value());
+    updateDirection(direction->currentIndex());
+    updateAnnotation(annotation->text());
+    connect(source, SIGNAL(textEdited(QString)), this, SLOT(updateSourceColumn(QString)));
+    connect(value, SIGNAL(valueChanged(double)), this, SLOT(updateThreshold(double)));
+    connect(direction, SIGNAL(currentIndexChanged(int)), this, SLOT(updateDirection(int)));
+    connect(annotation, SIGNAL(textEdited(QString)), this, SLOT(updateAnnotation(QString)));
+    setLayout(layout);
+}
+
+@ Configuration of the model is done as usual.
+
+@<ThresholdAnnotationConfWidget implementation@>=
+void ThresholdAnnotationConfWidget::updateSourceColumn(const QString &source)
+{
+    updateAttribute("source", source);
+}
+
+void ThresholdAnnotationConfWidget::updateThreshold(double value)
+{
+    updateAttribute("value", QString("%1").arg(value));
+}
+
+void ThresholdAnnotationConfWidget::updateDirection(int direction)
+{
+    updateAttribute("direction", QString("%1").arg(direction));
+}
+
+void ThresholdAnnotationConfWidget::updateAnnotation(const QString &annotation)
+{
+    updateAttribute("annotation", annotation);
+}
+
+@ The configurationwidget is registered with the configuration system as usual.
+
+@<Register device configuration widgets@>=
+app.registerDeviceConfigurationWidget("thresholdannotation",
+                                      ThresholdAnnotationConfWidget::staticMetaObject);
+
+@ A NodeInserter makes the configuration available.
+
+@<Add annotation control node inserters@>=
+NodeInserter *thresholdAnnotationInserter = new NodeInserter(tr("Threshold Annotation"),
+                                                             tr("Threshold Annotation"),
+                                                             "thresholdannotation");
+annotationMenu->addAction(thresholdAnnotationInserter);
+connect(thresholdAnnotationInserter, SIGNAL(triggered(QString, QString)),
+        this, SLOT(insertChildNode(QString, QString)));
+
+@ While we could use |ThresholdDetector| in the configuration directly, it is
+easier to provide another class with the same interface as |AnnotationButton|
+to leverage existing code for handling these.
+
+@<Class declarations@>=
+class Annotator : public QObject
+{@t\1@>@/
+    Q_OBJECT@;
+    QString note;
+    int tc;
+    int ac;
+    QTimer t;
+    public:
+        Annotator(const QString &text);@/
+    @t\4@>public slots@t\kern-3pt@>:@/
+        void setAnnotation(const QString &annotation);
+        void setTemperatureColumn(int tempcolumn);
+        void setAnnotationColumn(int annotationcolumn);
+        void annotate();
+    private slots:
+        void catchTimer();
+    signals:@/
+        void annotation(QString annotation, int tempcolumn, int notecolumn);@t\2@>@/
+}@t\kern-3pt@>;
+
+@ To use this class with a |ThresholdDetector|, simply connect the
+|timeForValue()| signal to the |annotate()| slot and use the existing
+|AnnotationButton| code to keep the columns up to date.
+
+@<Annotator implementation@>=
+Annotator::Annotator(const QString &text) : QObject(NULL), note(text)
+{
+    t.setInterval(0);
+    t.setSingleShot(true);
+    connect(&t, SIGNAL(timeout()), this, SLOT(catchTimer()));
+}
+
+void Annotator::setAnnotation(const QString &annotation)
+{
+    note = annotation;
+}
+
+void Annotator::setTemperatureColumn(int tempcolumn)
+{
+    tc = tempcolumn;
+}
+
+void Annotator::setAnnotationColumn(int annotationcolumn)
+{
+    ac = annotationcolumn;
+}
+
+@ When connecting a |ThresholdDetector| to an |Annotator| directly, the
+annotation can be recorded before the measurement reaches the log. The result
+of this is that the annotation appears with the measurement immediately before
+the one it should appear next to. To solve this, the annotation is delayed
+until the next iteration of the event loop.
+
+@<Annotator implementation@>=
+void Annotator::catchTimer()
+{
+    emit annotation(note, tc, ac);
+}
+
+void Annotator::annotate()
+{
+    t.start();
+}
+
+@ It must be possible to create these from a script.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructAnnotator(QScriptContext *context,
+                                QScriptEngine *engine);
+void setAnnotatorProperties(QScriptValue value, QScriptEngine *engine);
+
+@ The engine is informed of the constructor.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructAnnotator);
+value = engine->newQMetaObject(&Annotator::staticMetaObject, constructor);
+engine->globalObject().setProperty("Annotator", value);
+
+@ The implementation is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructAnnotator(QScriptContext *context, QScriptEngine *engine)
+{
+    QScriptValue object = engine->newQObject(new Annotator(argument<QString>(0, context)));
+    setAnnotatorProperties(object, engine);
+    return object;
+}
+
+void setAnnotatorProperties(QScriptValue value, QScriptEngine *engine)
+{
+    setQObjectProperties(value, engine);
+}
+

src/typica.rc

@@ -1,7 +1,7 @@
 #include <winver.h>
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION 	1,7,0,0
-PRODUCTVERSION 	1,7,0,0
+FILEVERSION 	1,8,0,0
+PRODUCTVERSION 	1,8,0,0
 FILEFLAGSMASK	0x3fL
 #ifdef _DEBUG
 	FILEFLAGS	VS_FF_DEBUG
@@ -16,13 +16,13 @@ BEGIN
 		BLOCK "040904b0"
 		BEGIN
 			VALUE "CompanyName", "Wilson's Coffee & Tea\0"
-			VALUE "FileDescription", "Typica 1.7.0\0"
-			VALUE "FileVersion", "1.7.0\0"
+			VALUE "FileDescription", "Typica 1.8.0\0"
+			VALUE "FileVersion", "1.8.0\0"
 			VALUE "InternalName", "Typica\0"
-			VALUE "LegalCopyright", "Copyright 2007-2016 Neal Evan Wilson\0"
+			VALUE "LegalCopyright", "Copyright 2007-2017 Neal Evan Wilson\0"
 			VALUE "OriginalFilename", "Typica.exe\0"
 			VALUE "ProductName", "Typica\0"
-			VALUE "ProductVersion", "1.7.0\0"
+			VALUE "ProductVersion", "1.8.0\0"
 		END
 	END
 	BLOCK "VarFileInfo"
@@ -31,4 +31,4 @@ BEGIN
 	END
 END
 
-IDI_ICON1	ICON	DISCARDABLE	"resources/icons/appicons/logo256.ico"
+IDI_ICON1	ICON	DISCARDABLE	"resources/icons/appicons/logo.ico"

src/typica.w

@@ -22,8 +22,8 @@
 \mark{\noexpand\nullsec0{A Note on Notation}}
 \def\pn{Typica}
 \def\filebase{typica}
-\def\version{1.7.0 \number\year-\number\month-\number\day}
-\def\years{2007--2016}
+\def\version{1.8.0 \number\year-\number\month-\number\day}
+\def\years{2007--2017}
 \def\title{\pn{} (Version \version)}
 \newskip\dangerskipb
 \newskip\dangerskip
@@ -609,6 +609,9 @@ generated file empty.
 @<SerialScaleConfWidget implementation@>@/
 @<ValueAnnotation implementation@>@/
 @<ValueAnnotationConfWidget implementation@>@/
+@<ModbusNG implementation@>@/
+@<ThresholdAnnotationConfWidget implementation@>@/
+@<Annotator implementation@>@/
 
 @ A few headers are required for various parts of \pn{}. These allow the use of
 various Qt modules.
@@ -807,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|.
@@ -837,6 +850,41 @@ void setQLayoutItemProperties(QScriptValue, QScriptEngine *)
     /* Nothing needs to be done here. */
 }
 
+@* Timers.
+
+\noindent Some features in Typica require access to functionality similar to
+what |QTimer| provides from the host environment. This includes allowing
+script devices to periodically poll connected hardware and allowing a safety
+delay on profile translation.
+
+<@Function prototypes for scripting@>=
+void setQTimerProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue constructQTimer(QScriptContext *context, QScriptEngine *engine);
+
+@ The host environment is informed of the constructor.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructQTimer);
+value = engine->newQMetaObject(&QTimer::staticMetaObject, constructor);
+engine->globalObject().setProperty("Timer", value);
+
+@ Everything that we are interested in here is a signal, slot, or property so
+there is little else to do.
+
+@<Functions for scripting@>=
+void setQTimerProperties(QScriptValue value, QScriptEngine *engine)
+{
+	setQObjectProperties(value, engine);
+}
+
+QScriptValue constructQTimer(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new QTimer);
+	setQTimerProperties(object, engine);
+	return object;
+}
+
+
 @* Scripting QWidget.
 
 \noindent The first interesting class in this hierarchy is |QWidget|. This is
@@ -991,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@>@/
@@ -1004,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@>;
@@ -1020,7 +1079,14 @@ class ScriptQMainWindow : public QMainWindow@/
 ScriptQMainWindow::ScriptQMainWindow()@+: QMainWindow(NULL),
     cprompt(tr("Closing this window may result in loss of data. Continue?"))@/
 {
-    /* Nothing needs to be done here. */
+    if(!AppInstance->databaseConnected())
+    {
+	    statusBar()->addWidget(new QLabel(tr("Not connected to database")));
+    }
+    else
+    {
+	    statusBar()->addWidget(new UserLabel);
+    }
 }
 
 void ScriptQMainWindow::saveSizeAndPosition(const QString &key)
@@ -1070,6 +1136,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
@@ -4329,6 +4400,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");
@@ -4339,6 +4413,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())
 {
@@ -4363,6 +4447,8 @@ if(!filename.isEmpty())
     {
         app.configuration()->setContent(&file, true);
     }
+} else {
+	return 1;
 }
 @<Substitute included fragments@>@;
 
@@ -4533,6 +4619,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.
@@ -4641,6 +4729,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
@@ -4764,6 +4853,10 @@ while(j < menuItems.count())
         {
             menu->addSeparator();
         }
+        else if(itemElement.tagName() == "plugins")
+        {
+	        @<Process plugin item@>@;
+        }
     }
     j++;
 }
@@ -4877,6 +4970,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
@@ -5012,6 +5179,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,
@@ -6165,6 +6336,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
@@ -6304,6 +6512,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
@@ -8219,6 +8435,7 @@ class ThresholdDetector : public QObject@/
     signals:@/
         void timeForValue(double);
     private:@/
+        bool previousValueValid;
         double previousValue;
         double threshold;
         EdgeDirection currentDirection;
@@ -8227,12 +8444,19 @@ class ThresholdDetector : public QObject@/
 @ This class emits the time in seconds when a given measurement crosses the
 threshold value in the appropriate direction.
 
+This was previously written with |previousValue| initialized negative and a
+check that |previousValue| was non-negative. When the |ThresholdDetector| is
+connected to a data source representing temperature measurements this is a
+reasonable choice, however it breaks when connected to a rate of change series.
+To make this more generally correct, a boolean is checked to determine if a
+previous value has been set.
+
 @<ThresholdDetector Implementation@>=
 void ThresholdDetector::newMeasurement(Measurement measure)
 {
     if((currentDirection == Ascending && previousValue < threshold &&
-       previousValue >= 0) || (currentDirection == Descending &&
-       previousValue > threshold && previousValue >= 0))
+       previousValueValid) || (currentDirection == Descending &&
+       previousValue > threshold && previousValueValid))
     {
         if((currentDirection == Ascending && measure.temperature() >= threshold) ||
            (currentDirection == Descending && measure.temperature() <= threshold))
@@ -8245,9 +8469,11 @@ void ThresholdDetector::newMeasurement(Measurement measure)
         }
     }
     previousValue = measure.temperature();
+    previousValueValid = true;
 }
 
 ThresholdDetector::ThresholdDetector(double value) : QObject(NULL),
+    previousValueValid(false),
     previousValue(-1), threshold(value), currentDirection(Ascending)
 {
     /* Nothing needs to be done here. */
@@ -8956,6 +9182,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@/
@@ -8970,7 +9199,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);
@@ -9102,11 +9331,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))
@@ -9114,14 +9343,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);
         }
     }
@@ -12569,6 +12807,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
@@ -12589,19 +12829,30 @@ class Application : public QApplication@/
         QDomDocument* configuration();
         @<Device configuration members@>@;
         QSqlDatabase database();
+        Q_INVOKABLE bool databaseConnected();
+        Q_INVOKABLE QString currentTypicaUser();
+        Q_INVOKABLE bool login(const QString &user, const QString &password);
+        Q_INVOKABLE bool autoLogin();
         QScriptEngine *engine;@/
     @[public slots@]:@/
+	    void setDatabaseConnected(bool status);
+	    void setCurrentTypicaUser(const QString &user);
         @<Extended Application slots@>@;
+    @[signals@]:@/
+	    void userChanged(const QString &user);
     private:@/
         @<Application private data members@>@;
         QDomDocument conf;
+        bool connectionStatus;
+        QString currentUser;
 };
 
 @ The constructor for this class handles a few things that had previously been
 handled in |main()|.
 
 @<Application Implementation@>=
-Application::Application(int &argc, char **argv) : QApplication(argc, argv)@/
+Application::Application(int &argc, char **argv) : QApplication(argc, argv),
+	connectionStatus(false), currentUser(QString())@/
 {
     @<Allow use of the default QSettings constructor@>@;
     @<Load translation objects@>@;
@@ -12669,6 +12920,20 @@ QSqlDatabase Application::database()
     return QSqlDatabase::cloneDatabase(connection, QString(connectionName));
 }
 
+@ Starting with version 1.8 there are methods for determining if a connection
+to the database was successfully established when Typica was opened.
+
+@<Application Implementation@>=
+void Application::setDatabaseConnected(bool status)
+{
+	connectionStatus = status;
+}
+
+bool Application::databaseConnected()
+{
+	return connectionStatus;
+}
+
 @** Table editor for ordered arrays with SQL relations.
 
 \noindent A database in use at Wilson's Coffee \char'046~Tea stores information
@@ -13495,15 +13760,20 @@ SqlConnectionSetup::SqlConnectionSetup() :
     cancelButton(new QPushButton(tr("Cancel"))),
     connectButton(new QPushButton(tr("Connect")))@/
 {
+	QSettings settings;
     driver->addItem("PostgreSQL", "QPSQL");
     formLayout->addRow(tr("Database driver:"), driver);
     formLayout->addRow(tr("Host name:"), hostname);
+    hostname->setText(settings.value("database/hostname").toString());
     formLayout->addRow(tr("Port number:"), portnumber);
-    portnumber->setText("5432");
+    portnumber->setText(settings.value("database/portnumber", "5432").toString());
     formLayout->addRow(tr("Database name:"), dbname);
+    dbname->setText(settings.value("database/dbname").toString());
     formLayout->addRow(tr("User name:"), user);
+    user->setText(settings.value("database/user").toString());
     password->setEchoMode(QLineEdit::Password);
     formLayout->addRow(tr("Password:"), password);
+    password->setText(settings.value("database/password").toString());
     layout->addLayout(formLayout);
     buttons->addStretch(1);
     buttons->addWidget(cancelButton);
@@ -13548,6 +13818,7 @@ void SqlConnectionSetup::testConnection()
         settings.setValue("database/user", user->text());
         settings.setValue("database/password", password->text());
         database.close();
+        AppInstance->setDatabaseConnected(true);
         accept();
     }
     else
@@ -13587,6 +13858,7 @@ if(!database.open())
 else
 {
     database.close();
+    AppInstance->setDatabaseConnected(true);
 }
 
 @** Viewing a record of batches.
@@ -14293,6 +14565,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.
@@ -15325,7 +15599,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);
@@ -17098,7 +17372,11 @@ StopSelector::StopSelector(QWidget *parent) : QComboBox(parent)
 
 @** Configuration of Serial Devices Using Modbus RTU.
 
-\noindent One protocol that is used across a broad class of devices is called
+\noindent The following sections contain the details of older code related to
+Modbus RTU support. While the various selector widgets are shared with the new
+code, the configuration widgets and device interfaces are being replaced.
+
+One protocol that is used across a broad class of devices is called
 Modbus RTU. This protocol allows multiple devices to be chained together on a
 two wire bus which can be connected to a single serial port. The communication
 protocol involves a single message which is sent from a master device (in this
@@ -18171,7 +18449,6 @@ ModbusRTUDevice::ModbusRTUDevice(DeviceTreeModel *model,@| const QModelIndex &in
 : QObject(NULL), messageDelayTimer(new QTimer), commTimeout(new QTimer), unitIsF(@[true@]), readingsv(@[false@]),
     waiting(@[false@])@/
 {@/
-qDebug() << "Initializing Modbus RTU Device";
     QDomElement portReferenceElement = model->referenceElement(model->data(index,
         Qt::UserRole).toString());
     QDomNodeList portConfigData = portReferenceElement.elementsByTagName("attribute");
@@ -18657,6 +18934,7 @@ void ModbusRTUDevice::sendNextMessage()
         char *check = (char*)&crc;
         message.append(check[0]);
         message.append(check[1]);
+        qDebug() << "Writing" << message.toHex();
         port->write(message);
         commTimeout->start(2000);
         messageDelayTimer->start(delayTime);
@@ -19330,6 +19608,8 @@ app.registerDeviceConfigurationWidget("modbusrtu", ModbusConfigurator::staticMet
 inserter = new NodeInserter(tr("Modbus RTU Device"), tr("Modbus RTU Device"), "modbusrtu", NULL);
 topLevelNodeInserters.append(inserter);
 
+@i modbus.w
+
 @i unsupportedserial.w
 
 @i phidgets.w
@@ -19898,9 +20178,11 @@ class TranslationConfWidget : public BasicDeviceConfigurationWidget
     @[private slots@]:@/
         void updateMatchingColumn(const QString &column);
         void updateTemperature();
+        void updateDelay();
     private:@/
         QDoubleSpinBox *temperatureValue;
         QComboBox *unitSelector;
+        QSpinBox *delaySelector;
 };
 
 @ The constructor sets up our user interface.
@@ -19908,7 +20190,8 @@ class TranslationConfWidget : public BasicDeviceConfigurationWidget
 @<TranslationConfWidget implementation@>=
 TranslationConfWidget::TranslationConfWidget(DeviceTreeModel *model, const QModelIndex &index)
 : BasicDeviceConfigurationWidget(model, index),
-    temperatureValue(new QDoubleSpinBox), unitSelector(new QComboBox)
+    temperatureValue(new QDoubleSpinBox), unitSelector(new QComboBox),
+    delaySelector(new QSpinBox)
 {
     unitSelector->addItem("Fahrenheit");
     unitSelector->addItem("Celsius");
@@ -19919,6 +20202,7 @@ TranslationConfWidget::TranslationConfWidget(DeviceTreeModel *model, const QMode
     layout->addRow(tr("Column to match:"), column);
     layout->addRow(tr("Unit:"), unitSelector);
     layout->addRow(tr("Value:"), temperatureValue);
+    layout->addRow(tr("Start of batch safety delay:"), delaySelector);
     @<Get device configuration data for current node@>@;
     for(int i = 0; i < configData.size(); i++)
     {
@@ -19935,12 +20219,18 @@ TranslationConfWidget::TranslationConfWidget(DeviceTreeModel *model, const QMode
         {
             temperatureValue->setValue(node.attribute("value").toDouble());
         }
+        else if(node.attribute("name") == "delay")
+        {
+	        delaySelector->setValue(node.attribute("value").toInt());
+        }
     }
     updateMatchingColumn(column->text());
     updateTemperature();
+    updateDelay();
     connect(column, SIGNAL(textEdited(QString)), this, SLOT(updateMatchingColumn(QString)));
     connect(unitSelector, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateTemperature()));
     connect(temperatureValue, SIGNAL(valueChanged(double)), this, SLOT(updateTemperature()));
+    connect(delaySelector, SIGNAL(valueChanged(int)), this, SLOT(updateDelay()));
     setLayout(layout);
 }
 
@@ -19968,6 +20258,11 @@ void TranslationConfWidget::updateMatchingColumn(const QString &column)
     updateAttribute("column", column);
 }
 
+void TranslationConfWidget::updateDelay()
+{
+	updateAttribute("delay", QString("%1").arg(delaySelector->value()));
+}
+
 @ This is registered with the configuration system.
 
 @<Register device configuration widgets@>=
@@ -19975,12 +20270,18 @@ app.registerDeviceConfigurationWidget("translation", TranslationConfWidget::stat
 
 @i rate.w
 
+@i mergeseries.w
+
 @i dataqsdk.w
 
 @i scales.w
 
 @i valueannotation.w
 
+@i thresholdannotation.w
+
+@i user.w
+
 @** Local changes.
 
 \noindent This is the end of \pn{} as distributed by its author. It is expected

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/unsupportedserial.w

@@ -692,44 +692,6 @@ QScriptValue SerialPort_flush(QScriptContext *context, QScriptEngine *)
 	return QScriptValue();
 }
 
-@* Timers.
-
-\noindent While some devices will output a steady stream of measurements which
-can be continuously read as they come in, other devices must be polled for
-their current state. One approach is to poll the device immediately after
-reading the response from the previous polling, but there are times when we may
-want to limit the rate at which we poll the device. There are also devices
-which specify a length of time during which data should not be sent. For these
-cases, we expose |QTimer| to the host environment which allows us to wait. This
-is also useful for producing simulations to test features without needing to be
-connected to real hardware.
-
-<@Function prototypes for scripting@>=
-void setQTimerProperties(QScriptValue value, QScriptEngine *engine);
-QScriptValue constructQTimer(QScriptContext *context, QScriptEngine *engine);
-
-@ The host environment is informed of the constructor.
-
-@<Set up the scripting engine@>=
-constructor = engine->newFunction(constructQTimer);
-value = engine->newQMetaObject(&QTimer::staticMetaObject, constructor);
-engine->globalObject().setProperty("Timer", value);
-
-@ Everything that we are interested in here is a signal, slot, or property so
-there is little else to do.
-
-@<Functions for scripting@>=
-void setQTimerProperties(QScriptValue value, QScriptEngine *engine)
-{
-	setQObjectProperties(value, engine);
-}
-
-QScriptValue constructQTimer(QScriptContext *, QScriptEngine *engine)
-{
-	QScriptValue object = engine->newQObject(new QTimer);
-	setQTimerProperties(object, engine);
-	return object;
-}
 
 
 

src/user.w

@@ -0,0 +1,347 @@
+@** Typica User Management.
+
+\noindent Starting in version 1.8, the concepts of database user and \pn{} user
+are separated. This means that there must be controls for creating new users
+and for selecting the user to log in as. Other management interfaces can be
+implemented in configuration scripts.
+
+@* Application extensions for user handling.
+
+\noindent In order to present information about the currently logged in user
+globally, it was decided to provide a few methods in |Application| that can be
+used to report and change the current user.
+
+The first of these simply reports the currently logged in user.
+
+@<Application Implementation@>=
+QString Application::currentTypicaUser()
+{
+	return currentUser;
+}
+
+@ Next is a method that can be used to force the login of a specified user
+without checking for an entered password. This is used for users that are set
+to login automatically.
+
+@<Application Implementation@>=
+void Application::setCurrentTypicaUser(const QString &user)
+{
+	currentUser = user;
+	emit userChanged(currentUser);
+}
+
+@ A login method is provided which determines if a user exists that matches the
+user name and password specified and reports if the login attempt was
+successful.
+
+@<Application Implementation@>=
+bool Application::login(const QString &user, const QString &password)
+{
+	SqlQueryConnection h;
+	QSqlQuery *dbquery = h.operator->();
+	dbquery->prepare("SELECT 1 FROM typica_users WHERE name = :name AND password = :password AND active = TRUE");
+	dbquery->bindValue(":name", user);
+	dbquery->bindValue(":password", password);
+	dbquery->exec();
+	if(dbquery->next())
+	{
+		currentUser = user;
+		emit userChanged(currentUser);
+		return true;
+	}
+	return false;
+}
+
+@ A convenience method is also provided to attempt an automatic login if one is
+specified in the database.
+
+@<Application Implementation@>=
+bool Application::autoLogin()
+{
+	SqlQueryConnection h;
+	QSqlQuery *dbquery = h.operator->();
+	dbquery->exec("SELECT name FROM typica_users WHERE auto_login = TRUE");
+	if(dbquery->next())
+	{
+		currentUser = dbquery->value(0).toString();
+		emit userChanged(currentUser);
+		return true;
+	}
+	return false;
+}
+
+@* Login dialog.
+
+\noindent If there are no users set to log in automatically or any time a user
+change is requested, a login dialog should be presented.
+
+@<Class declarations@>=
+class LoginDialog : public QDialog
+{
+	Q_OBJECT
+	public:
+		LoginDialog();
+	public slots:
+		void attemptLogin();
+	private:
+		QLineEdit *user;
+		QLineEdit *password;
+		QLabel *warning;
+		QPushButton *login;
+};
+
+@ The constructor sets up the interface.
+
+@<LoginDialog implementation@>=
+LoginDialog::LoginDialog() : QDialog(),
+	user(new QLineEdit), password(new QLineEdit),
+	warning(new QLabel(tr("Log in failed."))),
+	login(new QPushButton(tr("Log In")))
+{
+	setModal(true);
+	QVBoxLayout *mainLayout = new QVBoxLayout;
+	warning->setVisible(false);
+	password->setEchoMode(QLineEdit::Password);
+	QFormLayout *form = new QFormLayout;
+	form->addRow(tr("Name:"), user);
+	form->addRow(tr("Password:"), password);
+	form->addRow(warning);
+	QHBoxLayout *buttonBox = new QHBoxLayout;
+	buttonBox->addStretch();
+	buttonBox->addWidget(login);
+	mainLayout->addLayout(form);
+	mainLayout->addLayout(buttonBox);
+	connect(login, SIGNAL(clicked()), this, SLOT(attemptLogin()));
+	setLayout(mainLayout);
+}
+
+@ The log in button attempts to log in with the specified credentials.
+
+@<LoginDialog implementation@>=
+void LoginDialog::attemptLogin()
+{
+	if(AppInstance->login(user->text(), password->text()))
+	{
+		accept();
+	}
+	else
+	{
+		warning->setVisible(true);
+	}
+}
+
+@ Scripts must be able to create login dialogs.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructLoginDialog);
+value = engine->newQMetaObject(&LoginDialog::staticMetaObject, constructor);
+engine->globalObject().setProperty("LoginDialog", value);
+
+@ The constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructLoginDialog(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new LoginDialog);
+	return object;
+}
+
+@ A function prototype is required.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructLoginDialog(QScriptContext *context, QScriptEngine *engine);
+
+@* Currently logged in user.
+
+\noindent Every main window in \pn{} should be able to report on the currently
+logged in user and it should be possible to bring up an interface to switch
+users. An easy way to do this is through a widget inserted into the status bar
+of every window that listens for user change data from the |Application|
+instance.
+
+@<Class declarations@>=
+class UserLabel : public QLabel
+{
+	Q_OBJECT
+	public:
+		UserLabel();
+	public slots:
+		void updateLabel(const QString &user);
+	protected:
+		void mouseReleaseEvent(QMouseEvent *event);
+};
+
+@ On first instantiation, the constructor sets the displayed text to indicate
+the currently logged in user and starts listening for user change events.
+
+@<UserLabel implementation@>=
+UserLabel::UserLabel() : QLabel()
+{
+	setTextFormat(Qt::PlainText);
+	updateLabel(AppInstance->currentTypicaUser());
+	connect(AppInstance, SIGNAL(userChanged(QString)),
+	        this, SLOT(updateLabel(QString)));
+}
+
+@ When the currently logged in user changes, the label text updates itself.
+
+@<UserLabel implementation@>=
+void UserLabel::updateLabel(const QString &user)
+{
+	setText(QString(tr("Current operator: %1").arg(user)));
+}
+
+@ In order to handle clicks, |mouseReleaseEvent()| is implemented.
+
+@<UserLabel implementation@>=
+void UserLabel::mouseReleaseEvent(QMouseEvent *event)
+{
+	LoginDialog *dialog = new LoginDialog;
+	dialog->exec();
+}
+
+@* User Creation.
+
+\noindent The first time \pn{} is started with a database connection and a
+multi-user aware configuration there will not be any user records in the
+database. An interface for adding new users is provided.
+
+@<Class declarations@>=
+class NewTypicaUser: public QDialog
+{
+	Q_OBJECT
+	public:
+		NewTypicaUser();
+	public slots:
+		void createAndReset();
+		void createAndClose();
+		void validate();
+		void cancelValidate();
+	private:
+		void createNewUser();
+		QLineEdit *userField;
+		QLineEdit *passwordField;
+		QCheckBox *autoLogin;
+		QPushButton *saveAndCloseButton;
+		QPushButton *saveAndNewButton;
+		QPushButton *cancelButton;
+};
+
+@ The constructor sets up the dialog.
+
+@<NewTypicaUser implementation@>=
+NewTypicaUser::NewTypicaUser() : QDialog(),
+	userField(new QLineEdit), passwordField(new QLineEdit),
+	autoLogin(new QCheckBox(tr("Log in automatically"))),
+	saveAndCloseButton(new QPushButton(tr("Save and Close"))),
+	saveAndNewButton(new QPushButton(tr("Save and Create Another"))),
+	cancelButton(new QPushButton(tr("Cancel")))
+{
+	setModal(true);
+	QVBoxLayout *mainLayout = new QVBoxLayout;
+	QFormLayout *form = new QFormLayout;
+	QHBoxLayout *buttons = new QHBoxLayout;
+	form->addRow(tr("Name:"), userField);
+	passwordField->setEchoMode(QLineEdit::Password);
+	form->addRow(tr("Password:"), passwordField);
+	form->addRow(autoLogin);
+	buttons->addWidget(cancelButton);
+	buttons->addStretch();
+	buttons->addWidget(saveAndNewButton);
+	buttons->addWidget(saveAndCloseButton);
+	mainLayout->addLayout(form);
+	mainLayout->addLayout(buttons);
+	setLayout(mainLayout);
+	setWindowTitle(tr("Create New User"));
+	connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(saveAndCloseButton, SIGNAL(clicked()), this, SLOT(createAndClose()));
+	connect(saveAndNewButton, SIGNAL(clicked()), this, SLOT(createAndReset()));
+	connect(userField, SIGNAL(textChanged(QString)), this, SLOT(validate()));
+}
+
+@ Slots handle basic operation.
+
+@<NewTypicaUser implementation@>=
+void NewTypicaUser::createAndReset()
+{
+	createNewUser();
+	userField->setText("");
+	passwordField->setText("");
+	autoLogin->setChecked(false);
+}
+
+void NewTypicaUser::createAndClose()
+{
+	createNewUser();
+	accept();
+}
+
+void NewTypicaUser::createNewUser()
+{
+	SqlQueryConnection h;
+	QSqlQuery *dbquery = h.operator->();
+	dbquery->prepare("INSERT INTO typica_users (name, password, active, auto_login) VALUES (:name, :password, true, :auto)");
+	dbquery->bindValue(":name", userField->text());
+	dbquery->bindValue(":password", passwordField->text());
+	dbquery->bindValue(":auto", autoLogin->isChecked());
+	dbquery->exec();
+	cancelButton->setEnabled(true);
+}
+
+void NewTypicaUser::validate()
+{
+	if(!userField->text().isEmpty())
+	{
+		saveAndCloseButton->setEnabled(true);
+		saveAndNewButton->setEnabled(true);
+	}
+	else
+	{
+		saveAndCloseButton->setEnabled(false);
+		saveAndNewButton->setEnabled(false);
+	}
+}
+
+void NewTypicaUser::cancelValidate()
+{
+	SqlQueryConnection h;
+	QSqlQuery *dbquery = h.operator->();
+	dbquery->exec("SELECT count(1) FROM typica_users");
+	if(dbquery->next())
+	{
+		if(dbquery->value(0).toInt() > 0)
+		{
+			cancelButton->setEnabled(true);
+			return;
+		}
+	}
+	cancelButton->setEnabled(false);
+}
+
+@ This is exposted to the host environment in the usual way.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructNewTypicaUser);
+value = engine->newQMetaObject(&NewTypicaUser::staticMetaObject, constructor);
+engine->globalObject().setProperty("NewTypicaUser", value);
+
+@ The constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructNewTypicaUser(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new NewTypicaUser);
+	return object;
+}
+
+@ A function prototype is required.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructNewTypicaUser(QScriptContext *context, QScriptEngine *engine);
+
+@ Add class implementations to generated source file.
+
+@<Class implementations@>=
+@<NewTypicaUser implementation@>
+@<UserLabel implementation@>
+@<LoginDialog implementation@>

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@>=

typica.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
-Version=1.6.3
+Version=1.8.0
 Name=Typica
-GenericName=Coffee Roasting
-Comment=Data acquisition, reporting, and management for coffee roasters
+GenericName=Typica
+Comment=Coffee Roasting Operations
 Exec=typica
 Icon=typica
 Terminal=false