Merge branch 'release-1.6.3'

.gitignore

@@ -9,4 +9,5 @@ typica.c
 *.pdf
 *.scn
 *.toc
-Typica-build*
+Typica-build*
+*.o

README

@@ -6,7 +6,7 @@ Project web site: http://www.randomfield.com/programs/typica/
 
 Typica is free software released under the MIT license as follows:
 
-Copyright 2007-2013 Neal Evan Wilson
+Copyright 2007-2015 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

config/Reports/auco.xml

@@ -37,7 +37,10 @@
 				QSettings.setValue("script/report_unit", unitBox.currentIndex);
 				refresh();
 			});
+			var rowData = new Array();
+			var rowIndex;
             function refresh() {
+				rowIndex = 0;
                 var buffer = new QBuffer;
                 buffer.open(3);
                 var output = new XmlWriter(buffer);
@@ -119,7 +122,15 @@
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-                    output.writeTextElement("td", query.value(0));
+					output.writeAttribute("id", "r" + rowIndex);
+					output.writeStartElement("td");
+					output.writeStartElement("a");
+					output.writeAttribute("href", "typica://script/r" + rowIndex);
+					rowIndex++;
+					rowData.push(query.value(0));
+					output.writeCharacters(query.value(0));
+					output.writeEndElement();
+					output.writeEndElement();
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
 					output.writeTextElement("td", query.value(3));
@@ -146,7 +157,15 @@
                 while(query.next())
                 {
                     output.writeStartElement("tr");
-                    output.writeTextElement("td", query.value(0));
+					output.writeAttribute("id", "d" + rowIndex);
+					output.writeStartElement("td");
+					output.writeStartElement("a");
+					output.writeAttribute("href", "typica://script/d" + rowIndex);
+					rowIndex++;
+					rowData.push(query.value(0));
+					output.writeCharacters(query.value(0));
+					output.writeEndElement();
+					output.writeEndElement();
                     output.writeTextElement("td", query.value(1));
                     output.writeTextElement("td", query.value(2));
 					output.writeTextElement("td", query.value(3));
@@ -170,6 +189,39 @@
                 QSettings.setValue("auco_sort", sortBox.currentIndex);
                 refresh();
             });
+			report.scriptLinkClicked.connect(function(url) {
+				var element = new WebElement(report.findFirstElement("#" + url));
+				var regular = url[0] == 'r';
+				var index = url.slice(1, url.length);
+				var tableref;
+				if(regular) {
+					tableref = "regular_coffees";
+				} else {
+					tableref = "decaf_coffees";
+				}
+				var origin = rowData[Number(url.slice(1, url.length))];
+				var details = '<tr><td /><td colspan="6"><table><tr><th>Id</th><th>Name</th><th>Rate</th><th>Inventory</th><th>First Use</th><th>Last Use</th></tr>';
+				var query = new QSqlQuery();
+				query.prepare("SELECT id, name, (rate/:conversion1)::numeric(12,3), (stock/:conversion2)::numeric(12,3), (SELECT min(time)::date FROM use WHERE item = id) AS first_use, (SELECT max(time)::date FROM use WHERE item = id) AS last_use FROM coffee_history WHERE origin = :origin AND id IN (SELECT id FROM " + tableref + ") ORDER BY first_use DESC");
+				var conversion = 1;
+				if(unitBox.currentIndex == 0) {
+					conversion = 2.2;
+				}
+				query.bind(":conversion1", conversion);
+				query.bind(":conversion2", conversion);
+				query.bind(":origin", origin);
+				query.exec();
+				while(query.next()) {
+					details += "<tr>";
+					for(var i = 0; i < 6; i++) {
+						details += "<td>" + query.value(i) + "</td>";
+					}
+					details += "</tr>";
+				}
+				query = query.invalidate();
+				details += "</table></td></tr>";
+				element.appendOutside(details);
+			});
         ]]>
     </program>
 </window>

config/Reports/dailyproductiondetail.xml

@@ -100,7 +100,12 @@
 					output.writeStartElement("tr");
 					output.writeTextElement("td", String(query.value(0)).split("T")[1]);
 					output.writeTextElement("td", query.value(2));
-					output.writeTextElement("td", query.value(11));
+					output.writeStartElement("td");
+					output.writeStartElement("a");
+					output.writeAttribute("href", "typica://script/p" + query.value(11).slice(1,-1));
+					output.writeCDATA(query.value(11));
+					output.writeEndElement();
+					output.writeEndElement();
 					var unroastedWeightsList = sqlToArray(query.value(5));
 					output.writeStartElement("td");
 					for(var i = 0; i < unroastedWeightsList.length; i++)
@@ -407,6 +412,24 @@
 			dateField.dateChanged.connect(function() {
 				refresh();
 			});
+			
+			view.scriptLinkClicked.connect(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);
+			});
 		]]>
 	</program>
 </window>

config/Reports/greensales.xml

@@ -0,0 +1,112 @@
+<window id="greensales">
+	<reporttitle>Sales:->Green Coffee Sales</reporttitle>
+	<layout type="vertical">
+		<layout type="horizontal">
+			<daterange id="dates" initial="9" /><!-- Current Month 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 = "Typica - Green Coffee Sales";
+			var dateSelect = findChildObject(this, 'dates');
+			var dateQuery = new QSqlQuery();
+			dateQuery.exec("SELECT time::date FROM sale WHERE time = (SELECT min(time) FROM sale) OR time = (SELECT max(time) FROM sale) 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();
+			var unitBox = findChildObject(this, 'unit');
+			unitBox.addItem("Kg");
+			unitBox.addItem("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();
+			});
+			var reportitems = new Array();
+			function refresh() {
+				var buffer = new QBuffer;
+				buffer.open(3);
+				var output = new XmlWriter(buffer);
+				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", "Green Coffee Sales");
+				output.writeEndElement();
+				output.writeStartElement("body");
+				var dateRange = dateSelect.currentRange();
+				var startDate = dateRange[0];
+				var endDate = dateRange[dateRange.length - 1];
+				output.writeTextElement("h1", "Green Coffee Sales: " + startDate + " - " + endDate);
+				var conversion = 1;
+				var unitText = 'Lb';
+				if(unitBox.currentIndex == 0) {
+					conversion = 2.2;
+					unitText = 'Kg';
+				}
+				var query = new QSqlQuery();
+				query.prepare("SELECT item, (SELECT name FROM coffees WHERE id = item) AS name, (SELECT origin FROM coffees WHERE id = item) AS origin, (SELECT reference FROM coffees WHERE id = item) AS reference, (SUM(quantity)/:conversion)::numeric(12,3) FROM sale WHERE time < :ed ::date + interval '1 day' AND time >= :sd GROUP BY item ORDER BY name ASC");
+				query.bind(":conversion", conversion);
+				query.bind(":ed", endDate);
+				query.bind(":sd", startDate);
+				query.exec();
+				output.writeStartElement("table");
+				output.writeAttribute("rules", "groups");
+				output.writeAttribute("cellpadding", "3px");
+				output.writeStartElement("thead");
+				output.writeStartElement("tr");
+				output.writeTextElement("th", "ID"); // 0
+				output.writeTextElement("th", "Coffee"); // 1
+				output.writeTextElement("th", "Origin"); // 2
+				output.writeTextElement("th", "Reference"); // 3
+				output.writeTextElement("th", "Quantity"); // 4
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeStartElement("tbody");
+				while(query.next()) {
+					output.writeStartElement("tr");
+					output.writeAttribute("id", "r"+query.value(0));
+					reportitems.push(query.value(0));
+					output.writeTextElement("td", query.value(0));
+					output.writeTextElement("td", query.value(1));
+					output.writeTextElement("td", query.value(2));
+					output.writeTextElement("td", query.value(3));
+					output.writeTextElement("td", query.value(4));
+					output.writeEndElement();
+				}
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndElement();
+				output.writeEndDocument();
+				view.setContent(buffer);
+				buffer.close();
+				query = query.invalidate();
+			}
+			refresh();
+			dateSelect.rangeUpdated.connect(refresh);
+		]]>
+	</program>
+</window>
+

config/Reports/itemtransactions.xml

@@ -46,6 +46,9 @@
 				output.writeAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 				output.writeStartElement("head");
 				output.writeTextElement("title", "Item Transactions");
+				output.writeStartElement("script");
+				output.writeAttribute("src", "Scripts/d3.min.js");
+				output.writeEndElement();
 				output.writeStartElement("style");
 				output.writeAttribute("type", "text/css");
 				output.writeCDATA("tr.PURCHASE {background-color: #77FF77}");
@@ -126,7 +129,48 @@
 					}
 					output.writeEndElement() // table
 					
-					query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2 FROM item_history(:item)");
+					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");
+					output.writeAttribute("src", "Scripts/greenusechart.js");
+					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))) FROM item_history(:item)");
 					switch(unitBox.currentIndex)
 					{
 						case 0:
@@ -146,6 +190,7 @@
 					output.writeTextElement("th", "Type");
 					output.writeTextElement("th", "Quantity");
 					output.writeTextElement("th", "Balance");
+					output.writeTextElement("th", "Record");
 					output.writeEndElement(); // tr
 					var prev_balance = "0";
 					var prev_prec = 0;
@@ -175,6 +220,23 @@
 						}
 						output.writeTextElement("td", query.value(3));
 						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 {
+							output.writeTextElement("td", "");
+						}
 						output.writeEndElement(); // tr
 					}
 					output.writeEndElement(); // table
@@ -193,7 +255,59 @@
 				buffer.close();
 				query = query.invalidate();
 			}
-			refresh();
+			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/greenusechart.js

@@ -0,0 +1,116 @@
+// Data access functions
+var label = function(d) {return d[0];};
+var greenValue = function(d) {return d[1];};
+var transactionCount = function(d) {return d[2];};
+var roastValue = function(d) {return d[3];};
+
+// Chart parameters
+var valueLabelWidth = 0; // Temporary, will be updated when labels are generated
+var barHeight = 30;
+var barHeight2 = barHeight / 2;
+var barLabelWidth = 0;
+var barLabelPadding = 5;
+var gridLabelHeight = 18;
+var gridChartOffset = 3;
+var maxBarWidth = 500;
+
+// Scales
+var x1s = d3.scale.linear().domain([0, d3.max(data, function(d) { return greenValue(d); })*1.15]).range([0, maxBarWidth]);
+var x2s = d3.scale.linear().domain([0, d3.max(data, function(d) { return transactionCount(d); })*1.15]).range([0, maxBarWidth]);
+var ys = d3.scale.ordinal().domain(d3.range(0, data.length)).rangeBands([0, data.length * barHeight]);
+var ytext = function(d, i) {return ys(i) + ys.rangeBand() / 2;};
+var ybar = function(d, i) {return ys(i);};
+var ybar2 = function(d, i) {return ys(i) + (barHeight2 / 2)};
+var ybar3 = function(d, i) {return ys(i);};
+var ybar4 = function(d, i) {return ys(i) + barHeight;};
+
+// Chart
+var svg = d3.select("#chart").append("svg")
+	.attr("width", 1000)
+	.attr("height", gridLabelHeight + gridLabelHeight + gridChartOffset + data.length * barHeight);
+
+// Bar labels
+var yxe = svg.append("g")
+	.attr("class", "y axis left");
+yxe.selectAll("text").data(data).enter().append("text")
+	.attr("y", ytext)
+	.attr("stroke", "none")
+	.attr("fill", "black")
+	.attr("dy", ".35em")
+	.attr("text-anchor", "end")
+	.text(label);
+// Determine maximum label width
+yxe.selectAll("text").each(function() {
+	if(barLabelWidth < this.getComputedTextLength()) {
+		barLabelWidth = this.getComputedTextLength();
+	}
+});
+barLabelWidth += 10;
+yxe.attr("transform", "translate(" + (barLabelWidth - barLabelPadding) + "," + (gridLabelHeight + gridChartOffset) + ")");
+
+// Weight axis
+var x1xe = svg.append("g")
+	.attr("class", "x axis top")
+	.attr("transform", "translate(" + barLabelWidth + "," + gridLabelHeight + ")");
+	
+x1xe.selectAll("text").data(x1s.ticks(10)).enter().append("text")
+	.attr("x", x1s)
+	.attr("dy", -3)
+	.attr("text-anchor", "middle")
+	.text(String);
+// Top ticks extend approximately half way down the chart
+x1xe.selectAll("line").data(x1s.ticks(10)).enter().append("line")
+	.attr("x1", x1s)
+	.attr("x2", x1s)
+	.attr("y1", 0)
+	.attr("y2", ys.rangeExtent()[1] /2)
+	.style("stroke", "#ccc");
+
+// Transaction count axis
+var x2xe = svg.append("g")
+	.attr("class", "x axis bottom")
+	.attr("transform", "translate(" + barLabelWidth + "," + (ys.rangeExtent()[1] + gridChartOffset + gridLabelHeight + gridLabelHeight) + ")");
+
+x2xe.selectAll("text").data(x2s.ticks(10)).enter().append("text")
+	.attr("x", x2s)
+	.attr("dy", -3)
+	.attr("text-anchor", "middle")
+	.text(String);
+// Bottom ticks extend approximately half way up the chart	
+x2xe.selectAll("line").data(x2s.ticks(10)).enter().append("line")
+	.attr("x1", x2s)
+	.attr("x2", x2s)
+	.attr("y1", -gridLabelHeight - (ys.rangeExtent()[1] /2))
+	.attr("y2", -gridLabelHeight)
+	.style("stroke", "#ccc");
+
+// Green coffee bars
+var gbars = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+gbars.selectAll("rect").data(data).enter().append("rect")
+	.attr("y", ybar)
+	.attr("height", barHeight)
+	.attr("width", function(d) {return x1s(greenValue(d));})
+	.attr("stroke", "white")
+	.attr("fill", "royalblue");
+
+// Roasted coffee bars
+var rbars = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+rbars.selectAll("rect").data(data).enter().append("rect")
+	.attr("y", ybar2)
+	.attr("height", barHeight2)
+	.attr("width", function(d) {return x1s(roastValue(d));})
+	.attr("stroke", "white")
+	.attr("fill", "orangered");
+
+// Transaction ticks
+var tticks = svg.append("g")
+	.attr("transform", "translate(" + barLabelWidth + "," + (gridLabelHeight + gridChartOffset) + ")");
+tticks.selectAll("line").data(data).enter().append("line")
+	.attr("x1", function(d) {return x2s(transactionCount(d));})
+	.attr("x2", function(d) {return x2s(transactionCount(d));})
+	.attr("y1", ybar3)
+	.attr("y2", ybar4)
+	.attr("stroke-width", "3")
+	.style("stroke", "black");

config/Windows/batchdetailsnew.xml

@@ -8,6 +8,9 @@
         </layout>
         <webview id="view" />
     </layout>
+	<menu name="File">
+		<item id="save" shortcut="Ctrl+S">Save…</item>
+	</menu>
     <program>
         <![CDATA[
 			var window = this;
@@ -17,7 +20,7 @@
 			var compare = findChildObject(this, 'compare');
 			var edit = findChildObject(this, 'edit');
 			edit.enabled = false;
-			if(typeof(navigationwindow.loggingWindow) == "undefined") {
+			if(typeof(Windows.loggingWindow) == "undefined") {
 				compare.enabled = false;
 				target.enabled = false;
 			}
@@ -44,7 +47,7 @@
                 var nextSeries = startSeries + 2;
                 QSettings.setValue('cseries', nextSeries);
                 var input = new XMLInput(buffer, startSeries);
-                var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
+                var graph = findChildObject(Windows.loggingWindow, 'graph');
                 input.measure.connect(graph.newMeasurement);
                 input.input();
 				query = query.invalidate();
@@ -59,13 +62,13 @@
 				var pname = query.value(1);
                 query = query.invalidate();
 				var input = new XMLInput(buffer, 1);
-				var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-				var log = findChildObject(navigationwindow.loggingWindow, 'log');
+				var graph = findChildObject(Windows.loggingWindow, 'graph');
+				var log = findChildObject(Windows.loggingWindow, 'log');
 				log.clear();
 				graph.clear();
 				input.newTemperatureColumn.connect(log.setHeaderData);
 				input.newTemperatureColumn.connect(function(col, text) {
-					if(text == navigationwindow.loggingWindow.targetcolumnname)
+					if(text == Windows.loggingWindow.targetcolumnname)
 					{
 						targetseries = col;
 					}
@@ -83,7 +86,7 @@
 				input.lastColumn.connect(function(c) {
 					lc = c;
 					QSettings.setValue("liveColumn", c + 1);
-					navigationwindow.loggingWindow.postLoadColumnSetup(c);
+					Windows.loggingWindow.postLoadColumnSetup(c);
 				});
 				input.annotation.connect(log.newAnnotation);
 				input.annotation.connect(function(note, tcol, ncol) {
@@ -91,9 +94,9 @@
 						log.newAnnotation(note, i, ncol);
 					}
 				});
-				navigationwindow.loggingWindow.windowTitle = "Typica - " + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
+				Windows.loggingWindow.windowTitle = "Typica - " + pname;
+				Windows.loggingWindow.raise();
+				Windows.loggingWindow.activateWindow();
 				input.input();
 				log.newAnnotation("End", 1, lc);
 				query = query.invalidate();
@@ -139,7 +142,11 @@
 					viewer.windowTitle = "Typica - " + pname;
 					viewer.raise();
 					viewer.activateWindow();
+					graph.updatesEnabled = false;
+					log.updatesEnabled = false;
 					input.input();
+					log.updatesEnabled = true;
+					graph.updatesEnabled = true;
 					log.newAnnotation("End", 1, lc);
 				}
 				else {
@@ -209,7 +216,7 @@
 					nameQuery.bind(":id", items[i]);
 					nameQuery.exec();
 					nameQuery.next();
-					output.writeTextElement("td", nameQuery.value(0));
+					output.writeTextElement("td", nameQuery.value(0) + " (" + items[i] + ")");
 					output.writeStartElement("td");
 					output.writeAttribute("align", "center");
 					output.writeCharacters(quantities[i]);
@@ -330,6 +337,13 @@
 				query = query.invalidate();
 				edit.enabled = true;
 			};
+			var saveMenu = findChildObject(this, 'save');
+			saveMenu.triggered.connect(function() {
+				var filename = QFileDialog.getSaveFileName(window, "Save Log As…", QSettings.value("script/lastDir", "") + "/");
+				if(filename != "") {
+					saveFileFromDatabase(fileID, filename);
+				}
+			});
         ]]>
     </program>
 </window>

config/Windows/greeninventory.xml

@@ -40,7 +40,7 @@
 			var button = findChildObject(this, 'update');
 			var value = findChildObject(this, 'quantity');
 			button.clicked.connect(function() {
-				q = "INSERT INTO inventory VALUES ('now', ";
+				q = "INSERT INTO inventory (time, item, quantity) VALUES ('now', ";
 				q = q + items.currentData();
 				q = q + ", ";
 				if(units.currentText == "lb") {

config/Windows/greensales.xml

@@ -2,7 +2,7 @@
 	<layout type="vertical">
 		<layout type="horizontal">
 			<label>Date:</label>
-			<calendar id="date" />
+			<calendar time="true" id="date" />
 			<label>Customer:</label>
 			<line id="customer" />
 			<label>Weight Unit:</label>
@@ -53,7 +53,7 @@
 			var submit = findChildObject(this, 'submit');
 			submit.clicked.connect(function() {
 				var query = new QSqlQuery();
-				query.prepare("INSERT INTO sale VALUES(:time, :item, :quantity, :customer)");
+				query.prepare("INSERT INTO sale (time, item, quantity, customer) VALUES(:time, :item, :quantity, :customer)");
 				query.bind(":time", dateField.text);
 				if(customerField.text == "") {
 					query.bind(":customer", null);

config/Windows/importprofiles.xml

@@ -13,7 +13,7 @@
             var filename = QFileDialog.getOpenFileName(win, 'Open Log…', QSettings.value('script/lastDir', '') + '/');
             if(filename != '') {
                 QSettings.setValue("script/lastDir", dir(filename));
-                var q = "INSERT INTO files VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+                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", baseName(filename));
@@ -22,7 +22,7 @@
                 query.next();
                 var fileno = query.value(0);
                 var id = box.currentData();
-                q = "INSERT INTO item_files VALUES('now', ";
+                q = "INSERT INTO item_files (time, item, files) VALUES('now', ";
                 q = q + id;
                 q = q + ", '{";
                 q = q + fileno;

config/Windows/invoicelist.xml

@@ -6,7 +6,7 @@
 		<![CDATA[
 			this.windowTitle = "Typica - Invoice List";
 			var table = findChildObject(this, 'table');
-			table.setQuery("SELECT id, time, invoice, vendor FROM invoices ORDER BY time DESC");
+			table.setQuery("SELECT id, time, invoice, vendor, (SELECT sum(cost) FROM invoice_items WHERE invoice_id = id) AS cost FROM invoices ORDER BY time DESC");
 			table.openEntry.connect(function(arg) {
 				var info = createWindow("invoiceinfo");
 				info.setInvoiceID(arg);

config/Windows/navigation.xml

@@ -210,8 +210,6 @@ type="push" />
 			query.exec("CREATE VIEW short_log AS SELECT roasting_log.\"time\", (SELECT items.name FROM items WHERE (items.id = roasting_log.roasted_id)) AS name, roasting_log.unroasted_total_quantity, roasting_log.roasted_quantity, ((((roasting_log.unroasted_total_quantity - roasting_log.roasted_quantity) / roasting_log.unroasted_total_quantity) * (100)::numeric))::numeric(12,2) AS weight_loss, roasting_log.duration FROM roasting_log ORDER BY roasting_log.\"time\"");
 			query.exec("CREATE FUNCTION add_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity + NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION bags_in_stock(bigint) RETURNS numeric AS $_$SELECT quantity / (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM items WHERE id = $1;$_$ LANGUAGE sql IMMUTABLE STRICT");
-			query.exec("CREATE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE 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 VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN WHILE i <= u LOOP INSERT INTO use VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION replace_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE FUNCTION subtract_inventory() RETURNS trigger AS $$ BEGIN UPDATE items SET quantity = quantity - NEW.quantity WHERE id = NEW.item; RETURN NEW; END; $$ LANGUAGE plpgsql");
@@ -236,7 +234,7 @@ type="push" />
 			query.exec("CREATE TRIGGER subtract_inventory_trigger AFTER INSERT ON use FOR EACH ROW EXECUTE PROCEDURE subtract_inventory()");
 			query.exec("ALTER TABLE ONLY item_files ADD CONSTRAINT item_files_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
 			query.exec("ALTER TABLE ONLY transactions ADD CONSTRAINT transactions_item_fkey FOREIGN KEY (item) REFERENCES items(id)");
-			query.exec("INSERT INTO TypicaFeatures VALUES('base-features', TRUE, 1)");
+			query.exec("INSERT INTO TypicaFeatures (feature, enabled, version) VALUES('base-features', TRUE, 1)");
 			query = query.invalidate();
 		};
 		
@@ -244,10 +242,9 @@ type="push" />
 		   Typica 1.6 and later. */
 		var DBCreateSampleRoasting = function() {
 			var query = new QSqlQuery;
-			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 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("CREATE TABLE IF NOT EXISTS item_attributes (id bigint 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 VALUES('sample-roasting', TRUE, 1)");
+			query.exec("INSERT INTO TypicaFeatures (feature, enabled, version) VALUES('sample-roasting', TRUE, 1)");
 			query = query.invalidate();
 		};
 		
@@ -280,6 +277,23 @@ type="push" />
 			query = query.invalidate();
 		};
 		
+		/* Asynchronous notifications */
+		var DBUpdateNotifications = function() {
+			var query = new QSqlQuery;
+			query.exec("CREATE OR REPLACE FUNCTION notify_roasting_log_change() RETURNS TRIGGER AS $$ BEGIN NOTIFY RoastingLogChange; RETURN NULL; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE TRIGGER notify_roasting_log_change AFTER INSERT OR UPDATE ON roasting_log FOR EACH STATEMENT EXECUTE PROCEDURE notify_roasting_log_change()");
+			query = query.invalidate();
+		};
+		
+		/* 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'");
+		};
+		
 		query = new QSqlQuery();
 		/* A table keeps track of database versioning information. This table is created
 		   if required. */
@@ -299,6 +313,14 @@ type="push" />
 				DBUpdateMultiUser();
 				DBUpdateHistory();
 			}
+			if(query.value(2) < 3)
+			{
+				DBUpdateNotifications();
+			}
+			if(query.value(2) < 4)
+			{
+				DBUpdateTriggers();
+			}
 		}
 		else
 		{

config/Windows/newbatch.xml

@@ -244,6 +244,8 @@
                 query.bind(":item", Number(roasted.currentData()));
                 query.bind(":again", Number(roasted.currentData()));
 				query.exec();
+				var graph;
+				var log;
 				if(query.next())
 				{
 					var files = query.value(0);
@@ -259,8 +261,8 @@
 						var buffer = new QBuffer(query.value(0));
 						var pname = query.value(1);
 						var input = new XMLInput(buffer, 1);
-						var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-						var log = findChildObject(navigationwindow.loggingWindow, 'log');
+						graph = findChildObject(navigationwindow.loggingWindow, 'graph');
+						log = findChildObject(navigationwindow.loggingWindow, 'log');
 						log.clear();
 						graph.clear();
 						input.newTemperatureColumn.connect(log.setHeaderData);
@@ -279,20 +281,28 @@
 								targetDetector.newMeasurement(data);
 							}
 						});
-						input.annotation.connect(log.newAnnotation);
 						var lc;
 						input.lastColumn.connect(function(c) {
 							lc = c;
 							QSettings.setValue("liveColumn", c + 1);
 							navigationwindow.loggingWindow.postLoadColumnSetup(c)
 						});
+						input.annotation.connect(function(note, tcol, ncol) {
+							for(var i = tcol; i < ncol; i++) {
+								log.newAnnotation(note, i, ncol);
+							}
+						});
 					}
 				}
                 query = query.invalidate();
 				navigationwindow.loggingWindow.windowTitle = "Typica - [*]" + pname;
 				navigationwindow.loggingWindow.raise();
 				navigationwindow.loggingWindow.activateWindow();
+				graph.updatesEnabled = false;
+				log.updatesEnabled = false;
 				input.input();
+				log.updatesEnabled = true;
+				graph.updatesEnabled = true;
 				log.newAnnotation("End", 1, lc);
 			});
 			var noprofilebutton = findChildObject(this, 'noprofile');
@@ -307,19 +317,20 @@
 			var notes = findChildObject(this, 'annotation');
 			var duration = findChildObject(this, 'duration');
 			var approval = findChildObject(this, 'approval');
+			approval.checked = true;
 			var target = findChildObject(this, 'target');
 			submitbutton.clicked.connect(function() {
 				checkQuery = new QSqlQuery();
 				checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
 				if(!checkQuery.next())
 				{
-					checkQuery.prepare("INSERT INTO machine VALUES(:id, :name)");
+					checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
 					checkQuery.bind(":id", selectedRoasterID);
 					checkQuery.bind(":name", selectedRoasterName);
 					checkQuery.exec();
 				}
 				checkQuery = checkQuery.invalidate();
-				var q = "INSERT INTO files VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+				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);
@@ -329,7 +340,7 @@
 				var fileno = query.value(0);
 				var file = new QFile(batch.tempData);
 				file.remove();
-				var q2 = "INSERT INTO roasting_log VALUES(:time, ";
+				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, ";
 				q2 = q2 + table.columnArray(0, 32);
 				q2 = q2 + ", ";
 				for(var i = 0; table.data(i, 1, 0).value != ""; i++)
@@ -357,7 +368,7 @@
 				query2.exec();
                 query2 = query2.invalidate();
 				if(target.checked) {
-					var q3 = "INSERT INTO item_files VALUES(:time, :item, '{";
+					var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
 					q3 = q3 + fileno;
 					q3 = q3 + "}')";
 					query.prepare(q3);

config/Windows/newroaster.xml

@@ -17,7 +17,7 @@
 			var rnumber = findChildObject(this, 'id');
 			var nrwindow = this;
 			button.clicked.connect(function() {
-				var q = "INSERT INTO machine VALUES (";
+				var q = "INSERT INTO machine (id, name) VALUES (";
 				q = q + rnumber.text;
 				q = q + ", :name)";
 				query = new QSqlQuery();

config/Windows/newsamplebatch.xml

@@ -227,7 +227,11 @@
 						});
 						navigationwindow.loggingWindow.raise();
 						navigationwindow.loggingWindow.activateWindow();
+						log.updatesEnabled = false;
+						graph.updatesEnabled = false;
 						input.input();
+						graph.updatesEnabled = true;
+						log.updatesEnabled = true;
 						log.newAnnotation("End", 1, lc);
 					}
 				}
@@ -248,7 +252,7 @@
 			var target = findChildObject(this, 'target');
 			submit.clicked.connect(function() {
 				query = new QSqlQuery();
-				query.prepare("INSERT INTO files VALUES(DEFAULT, :name, 'profile', NULL, :data) RETURNING id");
+				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);
 				query.bindFileData(":data", batch.tempData);
 				query.exec();
@@ -258,7 +262,7 @@
 				file.remove();
 				if(target.checked)
 				{
-					query.prepare("INSERT INTO sample_roast_profiles VALUES(:time, :name, :file)");
+					query.prepare("INSERT INTO sample_roast_profiles (time, profile_name, file) VALUES(:time, :name, :file)");
 					query.bind(":time", timefield.text);
 					query.bind(":name", profileName.currentText);
 					query.bind(":file", Number(fileno));
@@ -289,14 +293,14 @@
 					}
 					else
 					{
-						query.prepare("INSERT INTO item_attributes VALUES(DEFAULT, :name) RETURNING id");
+						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 VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Green Sample', :arrival, :vendor, :attrids, :attrvals, NULL) RETURNING id");
+				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", name.text);
 				query.bind(":arrival", arrival.date);
 				query.bind(":vendor", vendor.text);
@@ -305,12 +309,12 @@
 				query.exec();
 				query.next();
 				var greenId = query.value(0);
-				query.prepare("INSERT INTO items VALUES(DEFAULT, :name, NULL, 'lb', 0, 'Coffee: Roasted Sample') RETURNING id");
+				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", name.text + " " + profileName.currentText);
 				query.exec();
 				query.next();
 				var roastedId = query.value(0);
-				query.prepare("INSERT INTO roasting_log VALUES(:time, :unroastedids, NULL, :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) VALUES(:time, :unroastedids, NULL, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
 				query.bind(":time", timefield.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
 				query.bind(":green", convertToPounds(parseFloat(green.text), GunitBox.currentText));

config/Windows/optime.xml

@@ -63,7 +63,7 @@
 			});
 			submitbutton.clicked.connect(function() {
 				query = new QSqlQuery();
-				var q = "INSERT INTO operational_time VALUES (:machine, :start, :stop, :duration)";
+				var q = "INSERT INTO operational_time (machine, start_time, end_time, duration) VALUES (:machine, :start, :stop, :duration)";
 				query.prepare(q);
 				query.bind(":machine", machine.currentData());
 				query.bind(":start", startline.text);

config/Windows/productionroaster.xml

@@ -64,10 +64,13 @@
 		var translationCurrentColumn = -1;
 		var configModel = new DeviceTreeModel;
 		var rootIndex = configModel.index(roasterlist.currentIndex, 0);
+		var roasterIndex = roasterlist.currentIndex;
 		var channels = new Array();
 		var annotationButtons = new Array();
 		var nidevices = new Array();
 		var dataqsdkdevices = new Array();
+		var jsdevices = new Array();
+		var pdevices = new Array();
 		var temperatureDisplays = new Array();
 		var columnNames = new Array();
 		var modbusdevices = new Array();
@@ -356,6 +359,57 @@
 						tabControls.push(outputControl);
 					}
 				}
+				else if(driverReference.driver == "unsupporteddevice")
+				{
+					var device = createDevice(driverIndex);
+					for(var j = 0; j < device.channelCount(); j++) {
+						channels.push(device.getChannel(j));
+						columnNames.push(device.channelColumnName(j));
+						var unit = device.expectedChannelUnit(j);
+						if(unit == Units.Fahrenheit) {
+							channelType.push("T");
+						} else {
+							channelType.push("C");
+						}
+						if(device.isChannelHidden(j)) {
+							channelVisibility.push(false);
+						} else {
+							channelVisibility.push(true);
+							var indicator = new TemperatureDisplay;
+							if(unit == Units.Unitless) {
+								indicator.setDisplayUnits(Units.Unitless);
+								indicator.digitCount = 6;
+							}
+							temperatureDisplays.push(indicator);
+							var decorator = new WidgetDecorator(indicator, device.channelIndicatorText(j), 2);
+							device.getChannel(j).newData.connect(indicator.setValue);
+							indicatorPanel.addWidget(decorator);
+						}
+					}
+					device.start();
+					jsdevices.push(device);
+				}
+				else if(driverReference.driver == "phidgets1048")
+				{
+					var device = new PhidgetsTemperatureSensor(driverIndex);
+					for(var j = 0; j < device.channelCount(); j++) {
+						channels.push(device.getChannel(j));
+						columnNames.push(device.channelColumnName(j));
+						channelType.push("T");
+						if(device.isChannelHidden(j)) {
+							channelVisibility.push(false);
+						} else {
+							channelVisibility.push(true);
+							var indicator = new TemperatureDisplay;
+							temperatureDisplays.push(indicator);
+							var decorator = new WidgetDecorator(indicator, device.channelIndicatorText(j), 2);
+							device.getChannel(j).newData.connect(indicator.setValue);
+							indicatorPanel.addWidget(decorator);
+						}
+					}
+					device.start();
+					pdevices.push(device);
+				}
 				else if(driverReference.driver == "annotationbutton")
 				{
 					var button = new AnnotationButton(driverReference.buttontext);
@@ -598,20 +652,36 @@
 			{
 				dataqsdkdevices[i].deleteLater();
 			}
+			for(var i = 0; i < jsdevices.length; i++)
+			{
+				jsdevices[i].stop();
+				jsdevices[i].deleteLater();
+			}
+			for(var i = 0; i < pdevices.length; i++)
+			{
+				pdevices[i].stop();
+				pdevices[i].deleteLater();
+			}
 			delete nidevices;
 			delete modbusdevices;
 			delete dataqsdkdevices;
+			delete jsdevices;
+			delete pdevices;
             window.saveSizeAndPosition("window");
-            vsplit.saveState("script/mainSplitter");
-            isplit.saveState("script/instrumentSplitter");
-            lsplit.saveState("script/logSplitter");
+            vsplit.saveState("script/loggingView/" + roasterIndex + "/mainSplitter");
+			QSettings.setValue("script/loggingView/" + roasterIndex + "/instrumentCount", isplit.count());
+            isplit.saveState("script/loggingView/" + roasterIndex + "/instrumentSplitter");
+            lsplit.saveState("script/loggingView/" + roasterIndex + "/logSplitter");
             log.saveState("script/log", 7);
 			window.navigationWindow.loggingWindow = undefined;
+			Windows.loggingWindow = undefined;
         });
 		this.restoreSizeAndPosition('window');
-        vsplit.restoreState("script/mainSplitter");
-        isplit.restoreState("script/instrumentSplitter");
-        lsplit.restoreState("script/logSplitter");
+        vsplit.restoreState("script/loggingView/" + roasterIndex + "/mainSplitter");
+		if(QSettings.value("script/loggingView/" + roasterIndex + "/instrumentCount") == isplit.count()) {
+			isplit.restoreState("script/loggingView/" + roasterIndex + "/instrumentSplitter");
+		}
+        lsplit.restoreState("script/loggingView/" + roasterIndex + "/logSplitter");
 		log.restoreState("script/log", 7);
 		var offsets = new Array();
 		var zeroemitters = new Array();
@@ -851,7 +921,11 @@
                     QSettings.setValue("liveColumn", c + 1);
 					window.postLoadColumnSetup(c);
 				});
+				graph.updatesEnabled = false;
+				log.updatesEnabled = false;
                 input.input();
+				log.updatesEnabled = true;
+				graph.updatesEnabled = true;
                 window.windowTitle = 'Typica - [*]' + baseName(filename);
                 QSettings.setValue("script/lastDir", dir(filename));
 				log.newAnnotation("End", 1, lc);
@@ -948,6 +1022,7 @@
 			var bwindow = createWindow("sampleRoastingBatch");
 		});
 		window.postLoadColumnSetup(0);
+		Windows.loggingWindow = window;
 		]]>
     </program>
 </window>

config/Windows/profilehistory.xml

@@ -51,7 +51,7 @@
 		var currentProfileID;
 		setCurrent.clicked.connect(function() {
 			var query = new QSqlQuery();
-			query.prepare("INSERT INTO item_files VALUES('now', :coffee, :profile)");
+			query.prepare("INSERT INTO item_files (time, item, files) VALUES('now', :coffee, :profile)");
 			query.bind(":coffee", coffeelist.currentData());
 			query.bind(":profile", "{" + currentProfileID + "}");
 			query.exec();

config/Windows/purchase.xml

@@ -203,7 +203,7 @@
             var dateField = findChildObject(this, 'date');
             submitButton.clicked.connect(function() {
                 var query = new QSqlQuery;
-                var q = "INSERT INTO invoices VALUES (default, :invoice, :vendor, :date) RETURNING id";
+                var q = "INSERT INTO invoices (id, invoice, vendor, time) VALUES (default, :invoice, :vendor, :date) RETURNING id";
                 query.prepare(q);
                 query.bind(":invoice", invoiceField.text);
                 query.bind(":vendor", vendorField.currentText);
@@ -246,11 +246,11 @@
                     }
                     if(decafSelection.checked)
                     {
-                        q = "INSERT INTO decaf_coffees VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying, :decafMethod) RETURNING id";
+                        q = "INSERT INTO decaf_coffees (id, name, reference, unit, quantity, category, origin, region, producer, grade, milling, drying, decaf_method) VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying, :decafMethod) RETURNING id";
                     }
                     else
                     {
-                        q = "INSERT INTO coffees VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying) RETURNING id";
+                        q = "INSERT INTO coffees (id, name, reference, unit, quantity, category, origin, region, producer, grade, milling, drying) VALUES (default, :name, :reference, :unit, 0, 'Coffee: Unroasted', :origin, :region, :producer, :grade, :milling, :drying) RETURNING id";
                     }
                     query.prepare(q);
                     query.bind(":name", nameEntry.currentText);
@@ -317,7 +317,7 @@
                     query.exec();
                     query.next();
                     var item_id = query.value(0);
-                    q = "INSERT INTO purchase VALUES(:time, :item, :quantity, :cost, :vendor)";
+                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor) VALUES(:time, :item, :quantity, :cost, :vendor)";
                     query.prepare(q);
                     query.bind(":time", dateField.date);
                     query.bind(":item", item_id);
@@ -333,14 +333,14 @@
                     }
                     query.bind(":vendor", vendorField.currentText);
                     query.exec();
-                    q = "INSERT INTO lb_bag_conversion VALUES(:item, :conversion)";
+                    q = "INSERT INTO lb_bag_conversion (item, conversion) VALUES(:item, :conversion)";
                     query.prepare(q);
                     query.bind(":item", item_id);
                     var bagsEntry = findChildObject(current, 'bags');
                     var conversion = convertToPounds(parseFloat(quantityEntry.text), unitEntry.currentText) / Number(bagsEntry.text);
                     query.bind(":conversion", conversion);
                     query.exec();
-                    q = "INSERT INTO invoice_items VALUES(:id, 'PURCHASE', :item, :description, :cost)";
+                    q = "INSERT INTO invoice_items (invoice_id, record_type, item_id, description, cost) VALUES(:id, 'PURCHASE', :item, :description, :cost)";
                     query.prepare(q);
                     query.bind(":id", invoiceNumber);
                     query.bind(":item", item_id);
@@ -356,7 +356,7 @@
                     query.exec();
                     var certifications = findChildObject(current, 'certdisplay');
                     var certlist = certifications.text.split(",");
-                    q = "INSERT INTO certifications VALUES (:item, :certification)";
+                    q = "INSERT INTO certifications (item, certification) VALUES (:item, :certification)";
                     query.prepare(q);
                     query.bind(":item", item_id);
                     for(var j = 0; j < certlist.length; j++)
@@ -366,7 +366,7 @@
                     }
                 }
                 var descriptionArray = sqlToArray(feesTable.columnArray(0, 0));
-                var q = "INSERT INTO invoice_items VALUES (:id, 'FEE', NULL, :description, :cost)";
+                var q = "INSERT INTO invoice_items (invoice_id, record_type, item_id, description, cost) VALUES (:id, 'FEE', NULL, :description, :cost)";
                 query.prepare(q);
                 query.bind(":id", invoiceNumber);
                 if(descriptionArray.length > 0)

config/Windows/roastmanager.xml

@@ -46,7 +46,7 @@
                 window.displayStatus("Item removed.");
             });
             restoreButton.clicked.connect(function() {
-                var q = "INSERT INTO current_items VALUES (:id)";
+                var q = "INSERT INTO current_items (item) VALUES (:id)";
                 query = new QSqlQuery();
                 query.prepare(q);
                 query.bind(":id", drop2.currentData());
@@ -59,14 +59,14 @@
                 window.displayStatus("Item restored.");
             });
             newItemButton.clicked.connect(function() {
-                var q = "INSERT INTO items VALUES (default, :name, NULL, 'lb', 0, 'Coffee: Roasted') RETURNING id";
+                var q = "INSERT INTO items (id, name, reference, unit, quantity, category) VALUES (default, :name, NULL, 'lb', 0, 'Coffee: Roasted') RETURNING id";
                 query = new QSqlQuery();
                 query.prepare(q);
                 query.bind(":name", itemname.text);
                 query.exec();
                 query.next();
                 var i = query.value(0);
-                q = "INSERT INTO current_items VALUES(:id)";
+                q = "INSERT INTO current_items (item) VALUES(:id)";
                 query.prepare(q);
                 query.bind(":id", i);
                 query.exec();

config/config.xml

@@ -34,6 +34,8 @@
 	<include src="Windows/editbatchdetails.xml" />
 	<include src="Windows/newsamplebatch.xml" />
 	<program>
+		<![CDATA[
+		Windows = new Object();
 		var loggingWindow;
 		var currentBatchInfo;
 		var navwindow = createWindow("navwindow");
@@ -42,5 +44,6 @@
 		var azero;
 		var bzero;
 		navwindow.windowTitle = "Typica - Choose Your Path";
+		]]>
 	</program>
 </application>

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*222:*/
+/*260:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*223:*/
+/*261:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 5641 "./typica.w"
+#line 6340 "./typica.w"
 
-/*:223*/
+/*:261*/
 #line 36 "./abouttypica.w"
 
 
-/*:222*/
+/*:260*/

src/abouttypica.h

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

src/advancedsettings.w

@@ -0,0 +1,61 @@
+@* Advanced settings configuration.
+
+\noindent Sometimes a feature has a sensible default that should be used the
+vast majority of the time but sometimes requires some other setting to be
+available in a reasonably accessible way.
+
+@<Class declarations@>=
+class AdvancedSettingsWidget : public QWidget@/
+{@/
+	@[Q_OBJECT@]@;
+	public:@/
+		AdvancedSettingsWidget();
+	@[public slots:@]@/
+		void enableDiagnosticLogging(bool enabled);
+};
+
+@ At present the advanced settings consist only of an option to redirect
+diagnostic output to a file. This should normally be disabled as it supresses
+console output and there is no mechanism within \pn{} for periodically removing
+the files generated. It is, however, useful for producing a diagnostic file
+that can be attached to an email if someone is encountering an issue that they
+are not able to resolve on their own. It is especially useful on Microsoft
+Windows where this output is not otherwise available unless Typica is run from
+software development tools most people do not have installed.
+
+@<AdvancedSettingsWidget implementation@>=
+AdvancedSettingsWidget::AdvancedSettingsWidget() : QWidget(NULL)
+{
+	QSettings settings;
+	QFormLayout *layout = new QFormLayout;
+	QCheckBox *logDiagnostics = new QCheckBox;
+	logDiagnostics->setCheckState(
+		settings.value("settings/advanced/logging", false).toBool() ?
+		Qt::Checked : Qt::Unchecked);
+	connect(logDiagnostics, SIGNAL(toggled(bool)), this, SLOT(enableDiagnosticLogging(bool)));
+	layout->addRow(tr("Enable diagnostic logging"), logDiagnostics);
+	setLayout(layout);
+}
+
+@ Changes to this setting should take effect immediately. It should also be
+written to |QSettings| so the feature can be correctly enabled or not. 
+
+@<AdvancedSettingsWidget implementation@>=
+void AdvancedSettingsWidget::enableDiagnosticLogging(bool enabled)
+{
+	QSettings settings;
+	settings.setValue("settings/advanced/logging", enabled);
+	if(enabled)
+	{
+		qInstallMsgHandler(messageFileOutput);
+	}
+	else
+	{
+		qInstallMsgHandler(0);
+	}
+}
+
+@ Currently the implementation is brought into typica.cpp.
+
+@<Class implementations@>=
+@<AdvancedSettingsWidget implementation@>

src/dataqsdk.w

@@ -339,7 +339,7 @@ void DataqSdkDeviceImplementation::run()
 	sampleRate = di_sample_rate(sampleRate * channels * 40, &oversample,
 	                            &burstDivisor);
 	buffer = new qint16[(int)sampleRate];
-	di_inlist_struct inlist[16] = {{0}};
+	di_inlist_struct inlist[16] = {{0, 0, 0, 0, 0, 0, 0, 0}};
 	for(unsigned short i = 0; i < channels; i++)
 	{
 		inlist[i].chan = i;

src/daterangeselector.cpp

@@ -1,5 +1,5 @@
-/*603:*/
-#line 66 "./daterangeselector.w"
+/*650:*/
+#line 68 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
 #include <QPushButton> 
@@ -11,33 +11,8 @@
 
 #include "daterangeselector.h"
 
-/*604:*/
-#line 86 "./daterangeselector.w"
-
-class CustomDateRangePopup:public QWidget
-{
-Q_OBJECT
-public:
-CustomDateRangePopup(QWidget*parent= NULL);
-public slots:
-void applyRange();
-signals:
-void hidingPopup();
-protected:
-virtual void hideEvent(QHideEvent*event);
-private slots:
-void validateRange();
-private:
-QCalendarWidget*startDateSelector;
-QCalendarWidget*endDateSelector;
-QPushButton*applyButton;
-};
-
-/*:604*/
-#line 77 "./daterangeselector.w"
-
-/*605:*/
-#line 110 "./daterangeselector.w"
+/*652:*/
+#line 111 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
 QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
@@ -80,16 +55,16 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:605*//*606:*/
-#line 158 "./daterangeselector.w"
+/*:652*//*653:*/
+#line 159 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
 {
 emit hidingPopup();
 }
 
-/*:606*//*607:*/
-#line 167 "./daterangeselector.w"
+/*:653*//*654:*/
+#line 168 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
 {
@@ -103,8 +78,8 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:607*//*608:*/
-#line 184 "./daterangeselector.w"
+/*:654*//*655:*/
+#line 185 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
 {
@@ -118,11 +93,11 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:608*/
-#line 78 "./daterangeselector.w"
+/*:655*/
+#line 79 "./daterangeselector.w"
 
-/*609:*/
-#line 202 "./daterangeselector.w"
+/*656:*/
+#line 203 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
 QWidget(parent),quickSelector(new QComboBox(this)),
@@ -133,8 +108,8 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*610:*/
-#line 231 "./daterangeselector.w"
+/*657:*/
+#line 232 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
 currentDate.addDays(-1).toString(Qt::ISODate)));
@@ -213,8 +188,8 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:610*/
-#line 212 "./daterangeselector.w"
+/*:657*/
+#line 213 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
 customButton->setIcon(QIcon::fromTheme("office-calendar",
@@ -226,8 +201,8 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:609*//*611:*/
-#line 314 "./daterangeselector.w"
+/*:656*//*658:*/
+#line 315 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
 {
@@ -242,8 +217,8 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:611*//*612:*/
-#line 331 "./daterangeselector.w"
+/*:658*//*659:*/
+#line 332 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
 {
@@ -252,8 +227,8 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:612*//*613:*/
-#line 342 "./daterangeselector.w"
+/*:659*//*660:*/
+#line 343 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
 {
@@ -263,8 +238,8 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:613*//*614:*/
-#line 357 "./daterangeselector.w"
+/*:660*//*661:*/
+#line 358 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
 {
@@ -304,24 +279,24 @@ customRangeSelector= NULL;
 }
 }
 
-/*:614*//*615:*/
-#line 399 "./daterangeselector.w"
+/*:661*//*662:*/
+#line 400 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
 {
 return quickSelector->itemData(lastIndex);
 }
 
-/*:615*//*616:*/
-#line 407 "./daterangeselector.w"
+/*:662*//*663:*/
+#line 408 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
 {
 quickSelector->setCurrentIndex(index);
 }
 
-/*:616*//*617:*/
-#line 422 "./daterangeselector.w"
+/*:663*//*664:*/
+#line 423 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
 {
@@ -329,18 +304,18 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:617*//*618:*/
-#line 432 "./daterangeselector.w"
+/*:664*//*665:*/
+#line 433 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
 {
 quickSelector->removeItem(index);
 }
 
-/*:618*/
-#line 79 "./daterangeselector.w"
+/*:665*/
+#line 80 "./daterangeselector.w"
 
 
 #include "moc_daterangeselector.cpp"
 
-/*:603*/
+/*:650*/

src/daterangeselector.h

@@ -1,13 +1,39 @@
-/*602:*/
+/*649:*/
 #line 30 "./daterangeselector.w"
 
 
 #include <QComboBox> 
+#include <QPushButton> 
+#include <QCalendarWidget> 
 
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-class CustomDateRangePopup;
+/*651:*/
+#line 87 "./daterangeselector.w"
+
+class CustomDateRangePopup:public QWidget
+{
+Q_OBJECT
+public:
+CustomDateRangePopup(QWidget*parent= NULL);
+public slots:
+void applyRange();
+signals:
+void hidingPopup();
+protected:
+virtual void hideEvent(QHideEvent*event);
+private slots:
+void validateRange();
+private:
+QCalendarWidget*startDateSelector;
+QCalendarWidget*endDateSelector;
+QPushButton*applyButton;
+};
+
+/*:651*/
+#line 39 "./daterangeselector.w"
+
 
 class DateRangeSelector:public QWidget
 {
@@ -34,4 +60,4 @@ int lastIndex;
 
 #endif
 
-/*:602*/
+/*:649*/

src/daterangeselector.w

@@ -30,11 +30,13 @@ access to the ISO 8601 string representation of these dates is provided.
 @(daterangeselector.h@>=
 
 #include <QComboBox>
+#include <QPushButton>
+#include <QCalendarWidget>
 
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-class CustomDateRangePopup;
+@<CustomDateRangePopup declaration@>@;
 
 class DateRangeSelector : public QWidget
 {
@@ -74,7 +76,6 @@ class DateRangeSelector : public QWidget
 
 #include "daterangeselector.h"
 
-@<CustomDateRangePopup declaration@>
 @<CustomDateRangePopup implementation@>
 @<DateRangeSelector implementation@>
 

src/draglabel.cpp

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

src/draglabel.h

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

src/feedback.w

@@ -0,0 +1,127 @@
+@* The Feedback Wizard.
+
+\noindent While the About Typica window includes a link for sending email, this
+is not as obvious as a Send Feedback option from the Help menu. It also does
+not provide an adequate amount of prompting for feedback to be useful.
+
+This functionality is provided in the form of a |QWizard| and five
+|QWizardPage|s to guide people through the feedback process.
+
+@(feedback.h@>=
+#include <QWizard>
+#include <QComboBox>
+#include <QTextEdit>
+#include <QLabel>
+
+#ifndef FeedbackHeader
+#define FeedbackHeader
+
+class FeedbackWizard : public QWizard
+{
+	Q_OBJECT
+	public:
+		FeedbackWizard();
+	private slots:
+		void setCommentInstructions(int index);
+	private:
+		QComboBox *feedbackType;
+		QLabel *commentInstructions;
+		QTextEdit *comment;
+};
+
+#endif
+
+@ Implementation is in a separate file.
+
+@(feedback.cpp@>=
+#include "feedback.h"
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWizardPage>
+
+@<Feedback wizard implementation@>@;
+
+@ The feedback wizard constructor is responsible for setting up its appearance,
+adding pages, and ensuring connections for properly responding to input are set
+up.
+
+@<Feedback wizard implementation@>=
+FeedbackWizard::FeedbackWizard() : QWizard()
+{
+	@<Set wizard graphics@>@;
+	@<Set feedback wizard pages@>@;
+}
+
+@ At present we do not have any custom graphics for wizards. If we did, they
+would go here.
+
+@<Set wizard graphics@>=
+/* Nothing needs to be done here. */
+
+@ The first page presented is an introduction page where we would like to know
+what sort of feedback is going to be provided. This is selected in a
+|QComboBox| which wil be used to update information on later pages.
+
+@<Set feedback wizard pages@>=
+QWizardPage *introPage = new QWizardPage;
+introPage->setTitle(tr("Send Feedback"));
+introPage->setSubTitle("Select the type of feedback you wish to provide");
+setPixmap(QWizard::LogoPixmap, QPixmap(":/resources/icons/appicons/logo48.png"));
+QLabel *page1prompt = new QLabel(tr("What sort of feedback would you like to provide?"));
+feedbackType = new QComboBox;
+feedbackType->addItem(tr("Bug Report"));
+feedbackType->addItem(tr("Comment"));
+feedbackType->addItem(tr("Feature Request"));
+feedbackType->addItem(tr("Question"));
+QVBoxLayout *page1layout = new QVBoxLayout;
+page1layout->addStretch();
+page1layout->addWidget(page1prompt);
+page1layout->addWidget(feedbackType);
+page1layout->addStretch();
+introPage->setLayout(page1layout);
+addPage(introPage);
+connect(feedbackType, SIGNAL(currentIndexChanged(int)), this, SLOT(setCommentInstructions(int)));
+commentInstructions = new QLabel;
+commentInstructions->setWordWrap(true);
+setCommentInstructions(0);
+
+@ The selection on the first page influences the instructions provided on the
+second page.
+
+@<Feedback wizard implementation@>=
+void FeedbackWizard::setCommentInstructions(int index)
+{
+	switch(index)
+	{
+		case 0:
+			commentInstructions->setText(tr("Please provide as complete a description of the issue as possible. Useful information includes step by step instructions for replicating the issue, the resulting behavior, and what you expected."));
+			break;
+		case 1:
+			commentInstructions->setText(tr("If you would like action to occur based on your comment, please be specific."));
+			break;
+		case 2:
+			commentInstructions->setText(tr("Please try to be as clear as possible about what you want, where you believe this would fit in with what is already provided, and provide a description of why this would be useful."));
+			break;
+		case 3:
+			commentInstructions->setText(tr("Please be specific and provide any information that you think might be useful in answering your question."));
+			break;
+		default:
+			commentInstructions->setText("");
+			break;
+	}
+}
+
+@ The second page provides both guidance on writing feedback and an area for typing this.
+
+@<Set feedback wizard pages@>=
+QWizardPage *commentPage = new QWizardPage;
+commentPage->setTitle(tr("Send Feedback"));
+commentPage->setSubTitle(tr("Your feedback is appreciated"));
+comment = new QTextEdit;
+QVBoxLayout *page2layout = new QVBoxLayout;
+page2layout->addStretch();
+page2layout->addWidget(commentInstructions);
+page2layout->addWidget(comment);
+page2layout->addStretch();
+commentPage->setLayout(page2layout);
+addPage(commentPage);

src/helpmenu.cpp

@@ -1,10 +1,10 @@
-/*163:*/
+/*194:*/
 #line 35 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 
-/*164:*/
+/*195:*/
 #line 47 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -17,7 +17,7 @@ addAction(aboutTypicaAction);
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
 }
 
-/*:164*//*165:*/
+/*:195*//*196:*/
 #line 61 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -26,10 +26,11 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-#line 3946 "./typica.w"
+#line 4614 "./typica.w"
 
-/*:165*/
+#line 1 "./feedback.w"
+/*:196*/
 #line 39 "./helpmenu.w"
 
 
-/*:163*/
+/*:194*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*162:*/
+/*193:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -17,4 +17,4 @@ void displayAboutTypica();
 
 #endif
 
-/*:162*/
+/*:193*/

src/measurement.w

@@ -121,4 +121,75 @@ public default constructor (already defined above), a public copy constructor,
 and a public destructor. These latter two are default generated.
 
 @<Register meta-types@>=
-qRegisterMetaType<Measurement>("Measurement");
+qRegisterMetaType<Measurement>("Measurement");
+
+@ A little more is required to use |Measurement| objects in scripts.
+
+@<Class declarations@>=
+Q_DECLARE_METATYPE(Measurement)
+
+@ The only thing unusual here is the conversion to and from script values.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructMeasurement(QScriptContext *context, QScriptEngine *engine);
+void setMeasurementProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue Measurement_toScriptValue(QScriptEngine *engine, const Measurement &measurement);
+void Measurement_fromScriptValue(const QScriptValue &value, Measurement &measurement);
+
+@ This follows much the same pattern as other types not derived from |QObject|.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructMeasurement);
+engine->globalObject().setProperty("Measurement", constructor);
+qScriptRegisterMetaType(engine, Measurement_toScriptValue, Measurement_fromScriptValue);
+
+@ The constructor takes two or three arguments. If the third arguement is not
+supplied, we will assume that the measurements are in degrees Fahrenheit.
+
+@<Functions for scripting@>=
+QScriptValue constructMeasurement(QScriptContext *context, QScriptEngine *engine)
+{
+	QScriptValue object;
+	if(context->argumentCount() == 2 || context->argumentCount() == 3)
+	{
+		double measurement = argument<double>(0, context);
+		QTime timestamp = argument<QTime>(1, context);
+		Units::Unit unit = Units::Fahrenheit;
+		if(context->argumentCount() == 3)
+		{
+			unit = argument<Units::Unit>(2, context);
+		}
+		object = engine->toScriptValue<Measurement>(Measurement(measurement, timestamp, unit));
+		setMeasurementProperties(object, engine);
+	}
+	else
+	{
+		context->throwError("Incorrect number of arguments passed to "@|
+		                    "Measurement::Measurement(). This method takes two "@|
+		                    "or three arguments.");
+	}
+	return object;
+}
+
+@ No additional properties are currently needed, but if they were, they would go here.
+
+@<Functions for scripting@>=
+void setMeasurementProperties(QScriptValue, QScriptEngine *)
+{
+	/* Nothing needs to be done here. */
+}
+
+@ The script value conversions are reasonably straightforward.
+
+@<Functions for scripting@>=
+QScriptValue Measurement_toScriptValue(QScriptEngine *engine, const Measurement &measurement)
+{
+	QVariant var;
+	var.setValue(measurement);
+	return engine->newVariant(var);
+}
+
+void Measurement_fromScriptValue(const QScriptValue &value, Measurement &measurement)
+{
+	measurement = value.toVariant().value<Measurement>();
+}

src/moc_abouttypica.cpp

@@ -0,0 +1,80 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'abouttypica.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "abouttypica.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'abouttypica.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_AboutTypica[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_AboutTypica[] = {
+    "AboutTypica\0"
+};
+
+void AboutTypica::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData AboutTypica::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject AboutTypica::staticMetaObject = {
+    { &QMainWindow::staticMetaObject, qt_meta_stringdata_AboutTypica,
+      qt_meta_data_AboutTypica, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &AboutTypica::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *AboutTypica::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *AboutTypica::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_AboutTypica))
+        return static_cast<void*>(const_cast< AboutTypica*>(this));
+    return QMainWindow::qt_metacast(_clname);
+}
+
+int AboutTypica::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QMainWindow::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_daterangeselector.cpp

@@ -0,0 +1,210 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'daterangeselector.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "daterangeselector.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'daterangeselector.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_CustomDateRangePopup[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       3,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      22,   21,   21,   21, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      36,   21,   21,   21, 0x0a,
+      49,   21,   21,   21, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_CustomDateRangePopup[] = {
+    "CustomDateRangePopup\0\0hidingPopup()\0"
+    "applyRange()\0validateRange()\0"
+};
+
+void CustomDateRangePopup::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        CustomDateRangePopup *_t = static_cast<CustomDateRangePopup *>(_o);
+        switch (_id) {
+        case 0: _t->hidingPopup(); break;
+        case 1: _t->applyRange(); break;
+        case 2: _t->validateRange(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData CustomDateRangePopup::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject CustomDateRangePopup::staticMetaObject = {
+    { &QWidget::staticMetaObject, qt_meta_stringdata_CustomDateRangePopup,
+      qt_meta_data_CustomDateRangePopup, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &CustomDateRangePopup::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *CustomDateRangePopup::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *CustomDateRangePopup::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_CustomDateRangePopup))
+        return static_cast<void*>(const_cast< CustomDateRangePopup*>(this));
+    return QWidget::qt_metacast(_clname);
+}
+
+int CustomDateRangePopup::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QWidget::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 3)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 3;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void CustomDateRangePopup::hidingPopup()
+{
+    QMetaObject::activate(this, &staticMetaObject, 0, 0);
+}
+static const uint qt_meta_data_DateRangeSelector[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       8,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      19,   18,   18,   18, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      48,   42,   18,   18, 0x0a,
+      87,   69,   18,   18, 0x0a,
+     121,   42,   18,   18, 0x0a,
+     138,   18,   18,   18, 0x08,
+     153,   18,   18,   18, 0x08,
+     167,   42,   18,   18, 0x08,
+
+ // methods: signature, parameters, type, tag, flags
+     193,   18,  184,   18, 0x02,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_DateRangeSelector[] = {
+    "DateRangeSelector\0\0rangeUpdated(QVariant)\0"
+    "index\0setCurrentIndex(int)\0startDate,endDate\0"
+    "setLifetimeRange(QString,QString)\0"
+    "removeIndex(int)\0toggleCustom()\0"
+    "popupHidden()\0updateRange(int)\0QVariant\0"
+    "currentRange()\0"
+};
+
+void DateRangeSelector::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        DateRangeSelector *_t = static_cast<DateRangeSelector *>(_o);
+        switch (_id) {
+        case 0: _t->rangeUpdated((*reinterpret_cast< QVariant(*)>(_a[1]))); break;
+        case 1: _t->setCurrentIndex((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 2: _t->setLifetimeRange((*reinterpret_cast< QString(*)>(_a[1])),(*reinterpret_cast< QString(*)>(_a[2]))); break;
+        case 3: _t->removeIndex((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 4: _t->toggleCustom(); break;
+        case 5: _t->popupHidden(); break;
+        case 6: _t->updateRange((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 7: { QVariant _r = _t->currentRange();
+            if (_a[0]) *reinterpret_cast< QVariant*>(_a[0]) = _r; }  break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData DateRangeSelector::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject DateRangeSelector::staticMetaObject = {
+    { &QWidget::staticMetaObject, qt_meta_stringdata_DateRangeSelector,
+      qt_meta_data_DateRangeSelector, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &DateRangeSelector::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *DateRangeSelector::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *DateRangeSelector::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_DateRangeSelector))
+        return static_cast<void*>(const_cast< DateRangeSelector*>(this));
+    return QWidget::qt_metacast(_clname);
+}
+
+int DateRangeSelector::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QWidget::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 8)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 8;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void DateRangeSelector::rangeUpdated(QVariant _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE

src/moc_draglabel.cpp

@@ -0,0 +1,80 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'draglabel.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "draglabel.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'draglabel.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_DragLabel[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_DragLabel[] = {
+    "DragLabel\0"
+};
+
+void DragLabel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData DragLabel::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject DragLabel::staticMetaObject = {
+    { &QLabel::staticMetaObject, qt_meta_stringdata_DragLabel,
+      qt_meta_data_DragLabel, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &DragLabel::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *DragLabel::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *DragLabel::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_DragLabel))
+        return static_cast<void*>(const_cast< DragLabel*>(this));
+    return QLabel::qt_metacast(_clname);
+}
+
+int DragLabel::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QLabel::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_feedback.cpp

@@ -0,0 +1,92 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'feedback.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "feedback.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'feedback.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_FeedbackWizard[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      22,   16,   15,   15, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_FeedbackWizard[] = {
+    "FeedbackWizard\0\0index\0setCommentInstructions(int)\0"
+};
+
+void FeedbackWizard::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        FeedbackWizard *_t = static_cast<FeedbackWizard *>(_o);
+        switch (_id) {
+        case 0: _t->setCommentInstructions((*reinterpret_cast< int(*)>(_a[1]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData FeedbackWizard::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject FeedbackWizard::staticMetaObject = {
+    { &QWizard::staticMetaObject, qt_meta_stringdata_FeedbackWizard,
+      qt_meta_data_FeedbackWizard, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &FeedbackWizard::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *FeedbackWizard::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *FeedbackWizard::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_FeedbackWizard))
+        return static_cast<void*>(const_cast< FeedbackWizard*>(this));
+    return QWizard::qt_metacast(_clname);
+}
+
+int FeedbackWizard::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QWizard::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 1)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 1;
+    }
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_helpmenu.cpp

@@ -0,0 +1,93 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'helpmenu.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "helpmenu.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'helpmenu.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_HelpMenu[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      10,    9,    9,    9, 0x0a,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_HelpMenu[] = {
+    "HelpMenu\0\0displayAboutTypica()\0"
+};
+
+void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        HelpMenu *_t = static_cast<HelpMenu *>(_o);
+        switch (_id) {
+        case 0: _t->displayAboutTypica(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData HelpMenu::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject HelpMenu::staticMetaObject = {
+    { &QMenu::staticMetaObject, qt_meta_stringdata_HelpMenu,
+      qt_meta_data_HelpMenu, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &HelpMenu::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *HelpMenu::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *HelpMenu::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_HelpMenu))
+        return static_cast<void*>(const_cast< HelpMenu*>(this));
+    return QMenu::qt_metacast(_clname);
+}
+
+int HelpMenu::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QMenu::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 1)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 1;
+    }
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_qextserialenumerator.cpp

@@ -0,0 +1,111 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'qextserialenumerator.h'
+**
+** Created: Thu Jul 3 12:13:29 2014
+**      by: The Qt Meta Object Compiler version 63 (Qt 4.8.4)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "3rdparty/qextserialport/src/qextserialenumerator.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'qextserialenumerator.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.4. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_QextSerialEnumerator[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       2,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       2,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      27,   22,   21,   21, 0x05,
+      58,   22,   21,   21, 0x05,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_QextSerialEnumerator[] = {
+    "QextSerialEnumerator\0\0info\0"
+    "deviceDiscovered(QextPortInfo)\0"
+    "deviceRemoved(QextPortInfo)\0"
+};
+
+void QextSerialEnumerator::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        QextSerialEnumerator *_t = static_cast<QextSerialEnumerator *>(_o);
+        switch (_id) {
+        case 0: _t->deviceDiscovered((*reinterpret_cast< const QextPortInfo(*)>(_a[1]))); break;
+        case 1: _t->deviceRemoved((*reinterpret_cast< const QextPortInfo(*)>(_a[1]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData QextSerialEnumerator::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject QextSerialEnumerator::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_QextSerialEnumerator,
+      qt_meta_data_QextSerialEnumerator, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &QextSerialEnumerator::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *QextSerialEnumerator::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *QextSerialEnumerator::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_QextSerialEnumerator))
+        return static_cast<void*>(const_cast< QextSerialEnumerator*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int QextSerialEnumerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 2)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 2;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void QextSerialEnumerator::deviceDiscovered(const QextPortInfo & _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+
+// SIGNAL 1
+void QextSerialEnumerator::deviceRemoved(const QextPortInfo & _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 1, _a);
+}
+QT_END_MOC_NAMESPACE

src/moc_qextserialport.cpp

@@ -0,0 +1,176 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'qextserialport.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "3rdparty/qextserialport/src/qextserialport.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'qextserialport.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_QextSerialPort[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+      14,   14, // methods
+       2,   84, // properties
+       1,   90, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      23,   16,   15,   15, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      45,   40,   15,   15, 0x0a,
+      71,   66,   15,   15, 0x0a,
+      95,   15,   15,   15, 0x0a,
+     121,   15,   15,   15, 0x0a,
+     147,   15,   15,   15, 0x0a,
+     169,   15,   15,   15, 0x0a,
+     195,   15,   15,   15, 0x0a,
+     220,   15,   15,   15, 0x0a,
+     241,  237,   15,   15, 0x0a,
+     254,   15,   15,   15, 0x2a,
+     263,  237,   15,   15, 0x0a,
+     276,   15,   15,   15, 0x2a,
+     285,   15,   15,   15, 0x08,
+
+ // properties: name, type, flags
+     306,  298, 0x0a095103,
+     325,  315, 0x0009510b,
+
+ // enums: name, flags, count, data
+     315, 0x0,    2,   94,
+
+ // enum data: key, value
+     335, uint(QextSerialPort::Polling),
+     343, uint(QextSerialPort::EventDriven),
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_QextSerialPort[] = {
+    "QextSerialPort\0\0status\0dsrChanged(bool)\0"
+    "name\0setPortName(QString)\0mode\0"
+    "setQueryMode(QueryMode)\0"
+    "setBaudRate(BaudRateType)\0"
+    "setDataBits(DataBitsType)\0"
+    "setParity(ParityType)\0setStopBits(StopBitsType)\0"
+    "setFlowControl(FlowType)\0setTimeout(long)\0"
+    "set\0setDtr(bool)\0setDtr()\0setRts(bool)\0"
+    "setRts()\0_q_canRead()\0QString\0portName\0"
+    "QueryMode\0queryMode\0Polling\0EventDriven\0"
+};
+
+void QextSerialPort::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        QextSerialPort *_t = static_cast<QextSerialPort *>(_o);
+        switch (_id) {
+        case 0: _t->dsrChanged((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 1: _t->setPortName((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 2: _t->setQueryMode((*reinterpret_cast< QueryMode(*)>(_a[1]))); break;
+        case 3: _t->setBaudRate((*reinterpret_cast< BaudRateType(*)>(_a[1]))); break;
+        case 4: _t->setDataBits((*reinterpret_cast< DataBitsType(*)>(_a[1]))); break;
+        case 5: _t->setParity((*reinterpret_cast< ParityType(*)>(_a[1]))); break;
+        case 6: _t->setStopBits((*reinterpret_cast< StopBitsType(*)>(_a[1]))); break;
+        case 7: _t->setFlowControl((*reinterpret_cast< FlowType(*)>(_a[1]))); break;
+        case 8: _t->setTimeout((*reinterpret_cast< long(*)>(_a[1]))); break;
+        case 9: _t->setDtr((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 10: _t->setDtr(); break;
+        case 11: _t->setRts((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 12: _t->setRts(); break;
+        case 13: _t->d_func()->_q_canRead(); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData QextSerialPort::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject QextSerialPort::staticMetaObject = {
+    { &QIODevice::staticMetaObject, qt_meta_stringdata_QextSerialPort,
+      qt_meta_data_QextSerialPort, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &QextSerialPort::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *QextSerialPort::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *QextSerialPort::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_QextSerialPort))
+        return static_cast<void*>(const_cast< QextSerialPort*>(this));
+    return QIODevice::qt_metacast(_clname);
+}
+
+int QextSerialPort::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QIODevice::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 14)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 14;
+    }
+#ifndef QT_NO_PROPERTIES
+      else if (_c == QMetaObject::ReadProperty) {
+        void *_v = _a[0];
+        switch (_id) {
+        case 0: *reinterpret_cast< QString*>(_v) = portName(); break;
+        case 1: *reinterpret_cast< QueryMode*>(_v) = queryMode(); break;
+        }
+        _id -= 2;
+    } else if (_c == QMetaObject::WriteProperty) {
+        void *_v = _a[0];
+        switch (_id) {
+        case 0: setPortName(*reinterpret_cast< QString*>(_v)); break;
+        case 1: setQueryMode(*reinterpret_cast< QueryMode*>(_v)); break;
+        }
+        _id -= 2;
+    } else if (_c == QMetaObject::ResetProperty) {
+        _id -= 2;
+    } else if (_c == QMetaObject::QueryPropertyDesignable) {
+        _id -= 2;
+    } else if (_c == QMetaObject::QueryPropertyScriptable) {
+        _id -= 2;
+    } else if (_c == QMetaObject::QueryPropertyStored) {
+        _id -= 2;
+    } else if (_c == QMetaObject::QueryPropertyEditable) {
+        _id -= 2;
+    } else if (_c == QMetaObject::QueryPropertyUser) {
+        _id -= 2;
+    }
+#endif // QT_NO_PROPERTIES
+    return _id;
+}
+
+// SIGNAL 0
+void QextSerialPort::dsrChanged(bool _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE

src/moc_scale.cpp

@@ -0,0 +1,109 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'scale.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "scale.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'scale.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_SerialScale[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       4,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      25,   13,   12,   12, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      60,   12,   12,   12, 0x0a,
+      67,   12,   12,   12, 0x0a,
+      75,   12,   12,   12, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_SerialScale[] = {
+    "SerialScale\0\0weight,unit\0"
+    "newMeasurement(double,Units::Unit)\0"
+    "tare()\0weigh()\0dataAvailable()\0"
+};
+
+void SerialScale::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        SerialScale *_t = static_cast<SerialScale *>(_o);
+        switch (_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;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData SerialScale::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject SerialScale::staticMetaObject = {
+    { &QextSerialPort::staticMetaObject, qt_meta_stringdata_SerialScale,
+      qt_meta_data_SerialScale, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &SerialScale::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *SerialScale::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *SerialScale::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_SerialScale))
+        return static_cast<void*>(const_cast< SerialScale*>(this));
+    return QextSerialPort::qt_metacast(_clname);
+}
+
+int SerialScale::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QextSerialPort::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 4)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 4;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void SerialScale::newMeasurement(double _t1, Units::Unit _t2)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE

src/moc_units.cpp

@@ -0,0 +1,96 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'units.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "units.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'units.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_Units[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       1,   14, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // enums: name, flags, count, data
+       6, 0x0,    9,   18,
+
+ // enum data: key, value
+      11, uint(Units::Unitless),
+      20, uint(Units::Fahrenheit),
+      31, uint(Units::Celsius),
+      39, uint(Units::Kelvin),
+      46, uint(Units::Rankine),
+      54, uint(Units::Pound),
+      60, uint(Units::Kilogram),
+      69, uint(Units::Ounce),
+      75, uint(Units::Gram),
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_Units[] = {
+    "Units\0Unit\0Unitless\0Fahrenheit\0Celsius\0"
+    "Kelvin\0Rankine\0Pound\0Kilogram\0Ounce\0"
+    "Gram\0"
+};
+
+void Units::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    Q_UNUSED(_o);
+    Q_UNUSED(_id);
+    Q_UNUSED(_c);
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData Units::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject Units::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_Units,
+      qt_meta_data_Units, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &Units::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *Units::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *Units::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_Units))
+        return static_cast<void*>(const_cast< Units*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int Units::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_webelement.cpp

@@ -0,0 +1,113 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'webelement.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "webelement.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'webelement.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_TypicaWebElement[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       9,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // methods: signature, parameters, type, tag, flags
+      25,   18,   17,   17, 0x02,
+      47,   18,   17,   17, 0x02,
+      70,   18,   17,   17, 0x02,
+      93,   18,   17,   17, 0x02,
+     117,   17,   17,   17, 0x02,
+     138,   18,   17,   17, 0x02,
+     155,   18,   17,   17, 0x02,
+     176,   18,   17,   17, 0x02,
+     202,  197,   17,   17, 0x02,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_TypicaWebElement[] = {
+    "TypicaWebElement\0\0markup\0appendInside(QString)\0"
+    "appendOutside(QString)\0prependInside(QString)\0"
+    "prependOutside(QString)\0removeFromDocument()\0"
+    "replace(QString)\0setInnerXml(QString)\0"
+    "setOuterXml(QString)\0text\0"
+    "setPlainText(QString)\0"
+};
+
+void TypicaWebElement::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        TypicaWebElement *_t = static_cast<TypicaWebElement *>(_o);
+        switch (_id) {
+        case 0: _t->appendInside((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 1: _t->appendOutside((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 2: _t->prependInside((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->prependOutside((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: _t->removeFromDocument(); break;
+        case 5: _t->replace((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 6: _t->setInnerXml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 7: _t->setOuterXml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 8: _t->setPlainText((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData TypicaWebElement::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject TypicaWebElement::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_TypicaWebElement,
+      qt_meta_data_TypicaWebElement, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &TypicaWebElement::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *TypicaWebElement::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *TypicaWebElement::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_TypicaWebElement))
+        return static_cast<void*>(const_cast< TypicaWebElement*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int TypicaWebElement::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 9)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 9;
+    }
+    return _id;
+}
+QT_END_MOC_NAMESPACE

src/moc_webview.cpp

@@ -0,0 +1,130 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'webview.h'
+**
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "webview.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'webview.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 63
+#error "This file was generated using the moc from 4.8.6. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_TypicaWebView[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+      10,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      20,   15,   14,   14, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      51,   47,   14,   14, 0x08,
+
+ // methods: signature, parameters, type, tag, flags
+      70,   47,   14,   14, 0x02,
+      84,   14,   14,   14, 0x02,
+     105,   92,   14,   14, 0x02,
+     132,  127,   14,   14, 0x22,
+     156,  149,   14,   14, 0x02,
+     187,   14,  179,   14, 0x02,
+     209,   14,  197,   14, 0x02,
+     236,  227,  197,   14, 0x02,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_TypicaWebView[] = {
+    "TypicaWebView\0\0link\0scriptLinkClicked(QString)\0"
+    "url\0linkDelegate(QUrl)\0load(QString)\0"
+    "print()\0html,baseUrl\0setHtml(QString,QUrl)\0"
+    "html\0setHtml(QString)\0device\0"
+    "setContent(QIODevice*)\0QString\0saveXml()\0"
+    "QWebElement\0documentElement()\0selector\0"
+    "findFirstElement(QString)\0"
+};
+
+void TypicaWebView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        TypicaWebView *_t = static_cast<TypicaWebView *>(_o);
+        switch (_id) {
+        case 0: _t->scriptLinkClicked((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 1: _t->linkDelegate((*reinterpret_cast< const QUrl(*)>(_a[1]))); break;
+        case 2: _t->load((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->print(); break;
+        case 4: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QUrl(*)>(_a[2]))); break;
+        case 5: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 6: _t->setContent((*reinterpret_cast< QIODevice*(*)>(_a[1]))); break;
+        case 7: { QString _r = _t->saveXml();
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
+        case 8: { QWebElement _r = _t->documentElement();
+            if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
+        case 9: { QWebElement _r = _t->findFirstElement((*reinterpret_cast< const QString(*)>(_a[1])));
+            if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData TypicaWebView::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject TypicaWebView::staticMetaObject = {
+    { &QWebView::staticMetaObject, qt_meta_stringdata_TypicaWebView,
+      qt_meta_data_TypicaWebView, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &TypicaWebView::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *TypicaWebView::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *TypicaWebView::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_TypicaWebView))
+        return static_cast<void*>(const_cast< TypicaWebView*>(this));
+    return QWebView::qt_metacast(_clname);
+}
+
+int TypicaWebView::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QWebView::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 10)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 10;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void TypicaWebView::scriptLinkClicked(const QString & _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE

src/phidgets.w

@@ -0,0 +1,491 @@
+@** Phidgets 1048.
+
+\noindent Phidgets, Inc. has provided one of their four channel temperature
+sensor devices so that support could be added to \pn{}. This was originally
+planned for version 1.7, however early support was rushed in for the 1.6.3
+release. As a result, this support is not full featured, but it should still be
+adequate for the most common uses.
+
+Two configuration widgets are required. The first is for the device as a whole.
+
+@<Class declarations@>=
+class PhidgetsTemperatureSensorConfWidget : public BasicDeviceConfigurationWidget
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE PhidgetsTemperatureSensorConfWidget(DeviceTreeModel *model,
+                                                        const QModelIndex &index);
+	private slots:
+		void addChannel();
+		void updateRate(int ms);
+};
+
+@ This widget allows specification of a device wide sample rate and allows
+adding channels for the device to monitor. The device specifications indicate
+temperature updates happen up to 25 times per second, but this is generally
+excessive for \pn{} so a default rate is set to a multiple of this close to
+3 updates per second. There are other options for collecting measurements from
+this device and I have not yet had time to experiment with all of the options
+to determine the best approach suitable for coffee roasting applications.
+
+@<Phidgets implementation@>=
+PhidgetsTemperatureSensorConfWidget::PhidgetsTemperatureSensorConfWidget(DeviceTreeModel *model,
+                                                                         const QModelIndex &index)
+	: BasicDeviceConfigurationWidget(model, index)
+{
+	QFormLayout *layout = new QFormLayout;
+	QPushButton *addChannelButton = new QPushButton(tr("Add Channel"));
+	QSpinBox *sampleRate = new QSpinBox;
+	sampleRate->setMinimum(40);
+	sampleRate->setMaximum(600);
+	sampleRate->setSingleStep(40);
+	sampleRate->setValue(360);
+
+	@<Get device configuration data for current node@>@;
+	for(int i = 0; i < configData.size(); i++)
+	{
+		node = configData.at(i).toElement();
+		if(node.attribute("name") == "sampleRate")
+		{
+			sampleRate->setValue(node.attribute("value").toInt());
+		}
+	}
+	updateRate(sampleRate->value());
+
+	connect(sampleRate, SIGNAL(valueChanged(int)), this, SLOT(updateRate(int)));
+	connect(addChannelButton, SIGNAL(clicked()), this, SLOT(addChannel()));
+
+	layout->addRow(addChannelButton);
+	layout->addRow(tr("Sample rate:"), sampleRate);
+	setLayout(layout);
+}
+
+@ Adding another channel is handled in the usual way, with the channel
+configured in a separate widget.
+
+@<Phidgets implementation@>=
+void PhidgetsTemperatureSensorConfWidget::addChannel()
+{
+	insertChildNode(tr("Channel"), "phidgets1048channel");
+}
+
+@ Changes to the sample rate are saved as an attribute of the node as usual.
+
+@<Phidgets implementation@>=
+void PhidgetsTemperatureSensorConfWidget::updateRate(int ms)
+{
+	updateAttribute("sampleRate", QString("%1").arg(ms));
+}
+
+@ The other required configuration widget is for a single channel.
+
+@<Class declarations@>=
+class PhidgetTemperatureSensorChannelConfWidget : public BasicDeviceConfigurationWidget
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE PhidgetTemperatureSensorChannelConfWidget(DeviceTreeModel *model,
+                                                              const QModelIndex &index);
+	private slots:
+		void updateColumnName(const QString &value);
+		void updateHidden(bool hidden);
+		void updateTC(int index);
+		void updateChannel(int channel);
+	private:
+		QComboBox *tcType;
+};
+
+@ For each channel it is necessary to specify which channel of the device
+measurements will come in on. The thermocouple type should be set to match the
+type of the thermocouple attached to that channel. The column name and if the
+channel is hidden has the same meaning as in channels on other devices.
+
+@<Phidgets implementation@>=
+PhidgetTemperatureSensorChannelConfWidget::PhidgetTemperatureSensorChannelConfWidget(
+	DeviceTreeModel *model, const QModelIndex &index)
+	: BasicDeviceConfigurationWidget(model, index),
+	tcType(new QComboBox)
+{
+	QFormLayout *layout = new QFormLayout;
+	QLineEdit *columnName = new QLineEdit;
+	layout->addRow(tr("Column Name:"), columnName);
+	QCheckBox *hideSeries = new QCheckBox("Hide this channel");
+	layout->addRow(hideSeries);
+	layout->addRow(tr("Thermocouple Type:"), tcType);
+	tcType->addItem("Type K", "1");
+	tcType->addItem("Type J", "2");
+	tcType->addItem("Type E", "3");
+	tcType->addItem("Type T", "4");
+	QSpinBox *channel = new QSpinBox;
+	layout->addRow(tr("Channel:"), channel);
+	channel->setMinimum(0);
+	channel->setMaximum(3);
+	setLayout(layout);
+	@<Get device configuration data for current node@>@;
+	for(int i = 0; i < configData.size(); i++)
+	{
+		node = configData.at(i).toElement();
+		if(node.attribute("name") == "columnname")
+		{
+			columnName->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "hidden")
+		{
+			hideSeries->setChecked(node.attribute("value") == "true");
+		}
+		else if(node.attribute("name") == "tctype")
+		{
+			tcType->setCurrentIndex(tcType->findData(node.attribute("value")));
+		}
+		else if(node.attribute("name") == "channel")
+		{
+			channel->setValue(node.attribute("value").toInt());
+		}
+	}
+	updateColumnName(columnName->text());
+	updateHidden(hideSeries->isChecked());
+	updateTC(tcType->currentIndex());
+	updateChannel(channel->value());
+	connect(columnName, SIGNAL(textEdited(QString)), this, SLOT(updateColumnName(QString)));
+	connect(hideSeries, SIGNAL(toggled(bool)), this, SLOT(updateHidden(bool)));
+	connect(tcType, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTC(int)));
+	connect(channel, SIGNAL(valueChanged(int)), this, SLOT(updateChannel(int)));
+}
+
+@ Channel configuration settings are persisted as they are made.
+
+@<Phidgets implementation@>=
+void PhidgetTemperatureSensorChannelConfWidget::updateColumnName(const QString &value)
+{
+	updateAttribute("columnname", value);
+}
+
+void PhidgetTemperatureSensorChannelConfWidget::updateHidden(bool hidden)
+{
+	updateAttribute("hidden", hidden ? "true" : "false");
+}
+
+void PhidgetTemperatureSensorChannelConfWidget::updateTC(int index)
+{
+	updateAttribute("tctype", tcType->itemData(index).toString());
+}
+
+void PhidgetTemperatureSensorChannelConfWidget::updateChannel(int channel)
+{
+	updateAttribute("channel", QString("%1").arg(channel));
+}
+
+@ The configuration widgets need to be registered so they can be instantiated as
+appropriate.
+
+@<Register device configuration widgets@>=
+app.registerDeviceConfigurationWidget("phidgets1048",
+	PhidgetsTemperatureSensorConfWidget::staticMetaObject);
+app.registerDeviceConfigurationWidget("phidgets1048channel",
+	PhidgetTemperatureSensorChannelConfWidget::staticMetaObject);
+
+@ A |NodeInserter| for the device node is also required, but this should only
+be provided if the required library is installed.
+
+@<Register top level device configuration nodes@>=
+QLibrary phidgetsCheck("phidget21");
+if(phidgetsCheck.load())
+{
+	inserter = new NodeInserter(tr("Phidgets 1048"), tr("Phidgets 1048"),
+		"phidgets1048", NULL);
+	topLevelNodeInserters.append(inserter);
+	phidgetsCheck.unload();
+}
+else
+{
+	phidgetsCheck.setFileName("Phidget21.framework/Phidget21");
+	if(phidgetsCheck.load())
+	{
+		inserter = new NodeInserter(tr("Phidgets 1048"), tr("Phidgets 1048"),
+		"phidgets1048", NULL);
+		topLevelNodeInserters.append(inserter);
+		phidgetsCheck.unload();
+	}
+}
+
+@ As usual, a class representing the device is provided.
+
+@<Class declarations@>=
+class PhidgetsTemperatureSensor : public QObject
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE PhidgetsTemperatureSensor(const QModelIndex &deviceIndex);
+		Q_INVOKABLE int channelCount();
+		Channel* getChannel(int channel);
+		Q_INVOKABLE bool isChannelHidden(int channel);
+		Q_INVOKABLE QString channelColumnName(int channel);
+		Q_INVOKABLE QString channelIndicatorText(int channel);
+	public slots:
+		void start();
+		void stop();
+	private slots:
+		void getMeasurements();
+	private:
+		QList<int> channelIndices;
+		QList<int> tctypes;
+		QList<Channel*> channelList;
+		QMap<int, Channel*> channelMap;
+		QList<bool> hiddenState;
+		QList<QString> columnNames;
+		QList<QString> indicatorTexts;
+		QLibrary driver;
+		QTimer sampleTimer;
+		void *device;
+		@<Phidgets 1048 function pointers@>@;
+};
+
+@ The constructor uses the configuration data to set up the interface used for
+integration with the logging view.
+
+@<Phidgets implementation@>=
+PhidgetsTemperatureSensor::PhidgetsTemperatureSensor(const QModelIndex &index)
+	: QObject(NULL), driver("phidget21"), device(NULL)
+{
+	DeviceTreeModel *model = (DeviceTreeModel *)(index.model());
+	QDomElement deviceReferenceElement =
+		model->referenceElement(model->data(index, Qt::UserRole).toString());
+	QDomNodeList deviceConfigData = deviceReferenceElement.elementsByTagName("attribute");
+	QDomElement node;
+	for(int i = 0; i < deviceConfigData.size(); i++)
+	{
+		node = deviceConfigData.at(i).toElement();
+		if(node.attribute("name") == "sampleRate")
+		{
+			sampleTimer.setInterval(node.attribute("value").toInt());
+		}
+	}
+	if(model->hasChildren(index))
+	{
+		for(int i = 0; i < model->rowCount(index); i++)
+		{
+			QModelIndex channelIndex = model->index(i, 0, index);
+			QDomElement channelReference = model->referenceElement(model->data(channelIndex, 32).toString());
+			QDomElement channelReferenceElement = model->referenceElement(model->data(channelIndex, Qt::UserRole).toString());
+			QDomNodeList channelConfigData = channelReferenceElement.elementsByTagName("attribute");
+			for(int j = 0; j < channelConfigData.size(); j++)
+			{
+				node = channelConfigData.at(j).toElement();
+				if(node.attribute("name") == "channel")
+				{
+					int channelID = node.attribute("value").toInt();
+					channelIndices.append(channelID);
+					Channel* channel = new Channel;
+					channelList.append(channel);
+					channelMap.insert(channelID, channel);
+				}
+				else if(node.attribute("name") == "hidden")
+				{
+					hiddenState.append(node.attribute("value") == "true");
+				}
+				else if(node.attribute("name") == "columnname")
+				{
+					columnNames.append(node.attribute("value"));
+				}
+				else if(node.attribute("name") == "tctype")
+				{
+					tctypes.append(node.attribute("value").toInt());
+				}
+			}
+			indicatorTexts.append(model->data(channelIndex, Qt::DisplayRole).toString());
+		}
+	}
+}
+
+@ There is a distinction between logical and physical channels. Physical
+channels are specified as a configuration attribute and are used for
+communication with hardware. Logical channels are determined by the order of
+nodes in the configuration and are used for integrating device support with the
+rest of the program.
+
+@<Phidgets implementation@>=
+int PhidgetsTemperatureSensor::channelCount()
+{
+	return channelList.length();
+}
+
+Channel* PhidgetsTemperatureSensor::getChannel(int channel)
+{
+	return channelList.at(channel);
+}
+
+@ Some information is available about each channel.
+
+@<Phidgets implementation@>=
+bool PhidgetsTemperatureSensor::isChannelHidden(int channel)
+{
+	return hiddenState.at(channel);
+}
+
+QString PhidgetsTemperatureSensor::channelColumnName(int channel)
+{
+	if(channel >= 0 && channel < columnNames.length())
+	{
+		return columnNames.at(channel);
+	}
+	return QString();
+}
+
+QString PhidgetsTemperatureSensor::channelIndicatorText(int channel)
+{
+	if(channel >= 0 && channel < indicatorTexts.length())
+	{
+		return indicatorTexts.at(channel);
+	}
+	return QString();
+}
+
+@ To avoid introducing dependencies on a library that is only needed for
+hardware that may not exist, the phidget21 library is only loaded at runtime
+if it is needed. Some function pointers and associated types are, therefore,
+required. This approach also means the associated header does not need to
+exist at compile time.
+
+@<Phidgets 1048 function pointers@>=
+#ifdef _WIN32
+typedef int (__stdcall *PhidgetHandleOnly)(void *);
+typedef int (__stdcall *PhidgetHandleInt)(void *, int);
+typedef int (__stdcall *PhidgetHandleIntInt)(void *, int, int);
+typedef int (__stdcall *PhidgetHandleIntDoubleOut)(void *, int, double*);
+#else
+typedef int (*PhidgetHandleOnly)(void *);
+typedef int (*PhidgetHandleInt)(void *, int);
+typedef int (*PhidgetHandleIntInt)(void *, int, int);
+typedef int (*PhidgetHandleIntDoubleOut)(void *, int, double*);
+#endif
+PhidgetHandleOnly createDevice;
+PhidgetHandleInt openDevice;
+PhidgetHandleInt waitForOpen;
+PhidgetHandleIntInt setTCType;
+PhidgetHandleIntDoubleOut getTemperature;
+PhidgetHandleOnly closeDevice;
+PhidgetHandleOnly deleteDevice;
+
+@ Library loading is deferred until we are ready to open a device.
+
+@<Phidgets implementation@>=
+void PhidgetsTemperatureSensor::start()
+{
+	if(!driver.load())
+	{
+		driver.setFileName("Phidget21.framework/Phidget21");
+		if(!driver.load())
+		{
+			QMessageBox::critical(NULL, tr("Typica: Driver not found"),
+				tr("Failed to find phidget21. Please install it."));
+			return;
+		}
+	}
+	if((createDevice = (PhidgetHandleOnly) driver.resolve("CPhidgetTemperatureSensor_create")) == 0 || @|
+       (openDevice = (PhidgetHandleInt) driver.resolve("CPhidget_open")) == 0 || @|
+       (waitForOpen = (PhidgetHandleInt) driver.resolve("CPhidget_waitForAttachment")) == 0 || @|
+       (setTCType = (PhidgetHandleIntInt) driver.resolve("CPhidgetTemperatureSensor_setThermocoupleType")) == 0 || @|
+       (getTemperature = (PhidgetHandleIntDoubleOut) driver.resolve("CPhidgetTemperatureSensor_getTemperature")) == 0 || @|
+       (closeDevice = (PhidgetHandleOnly) driver.resolve("CPhidget_close")) == 0 || @|
+       (deleteDevice = (PhidgetHandleOnly) driver.resolve("CPhidget_delete")) == 0)
+	{
+		QMessageBox::critical(NULL, tr("Typica: Link error"),
+			tr("Failed to link a required symbol in phidget21."));
+		return;
+	}
+	createDevice(&device);
+	openDevice(device, -1);
+	int error;
+	if(error = waitForOpen(device, 10000))
+	{
+		closeDevice(device);
+		deleteDevice(device);
+		QMessageBox::critical(NULL, tr("Typica: Failed to Open Device"),
+			tr("CPhidget_waitForAttachment returns error %n", 0, error));
+		return;
+	}
+	for(int i = 0; i < channelIndices.length(); i++)
+	{
+		setTCType(device, channelIndices.at(i), tctypes.at(i));
+	}
+	connect(&sampleTimer, SIGNAL(timeout()), this, SLOT(getMeasurements()));
+	sampleTimer.start();
+}
+
+@ Once the device is started, we periodically request measurements and pass
+them to the appropriate |Channel|.
+
+@<Phidgets implementation@>=
+void PhidgetsTemperatureSensor::getMeasurements()
+{
+	double value = 0.0;
+	QTime time = QTime::currentTime();
+	foreach(int i, channelIndices)
+	{
+		getTemperature(device, i, &value);
+		Measurement measure(value * 9.0 / 5.0 + 32.0, time);
+		channelMap[i]->input(measure);
+	}
+}
+
+@ Some clean up is needed in the |stop()| method.
+
+@<Phidgets implementation@>=
+void PhidgetsTemperatureSensor::stop()
+{
+	sampleTimer.stop();
+	closeDevice(device);
+	deleteDevice(device);
+	driver.unload();
+}
+
+@ The implementation currently goes into typica.cpp.
+
+@<Class implementations@>=
+@<Phidgets implementation@>@;
+
+@ The |PhidgetsTemperatureSensor| needs to be available from the host
+environment. This detail is likely to change in the future.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructPhidgetsTemperatureSensor);
+value = engine->newQMetaObject(&PhidgetsTemperatureSensor::staticMetaObject, constructor);
+engine->globalObject().setProperty("PhidgetsTemperatureSensor", value);
+
+@ Two function prototypes are needed.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructPhidgetsTemperatureSensor(QScriptContext *context, QScriptEngine *engine);
+QScriptValue Phidgets_getChannel(QScriptContext *context, QScriptEngine *engine);
+
+@ The script constructor is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructPhidgetsTemperatureSensor(QScriptContext *context, QScriptEngine *engine)
+{
+	if(context->argumentCount() != 1)
+	{
+		context->throwError("Incorrect number of arguments passed to "@|
+                            "PhidgetsTemperatureSensor constructor. This takes "@|
+                            "a QModelIndex.");
+	}
+	QScriptValue object = engine->newQObject(new PhidgetsTemperatureSensor(argument<QModelIndex>(0, context)), QScriptEngine::ScriptOwnership);
+	setQObjectProperties(object, engine);
+	object.setProperty("getChannel", engine->newFunction(Phidgets_getChannel));
+	return object;
+}
+
+@ As usual, a wrapper is needed for getting channels.
+
+@<Functions for scripting@>=
+QScriptValue Phidgets_getChannel(QScriptContext *context, QScriptEngine *engine)
+{
+	PhidgetsTemperatureSensor *self = getself<PhidgetsTemperatureSensor *>(context);
+	QScriptValue object;
+	if(self)
+	{
+		object = engine->newQObject(self->getChannel(argument<int>(0, context)));
+		setChannelProperties(object, engine);
+	}
+	return object;
+}

src/resources.qrc

@@ -11,6 +11,7 @@
         <file>resources/icons/tango/scalable/actions/list-remove.svg</file>
         <file>resources/icons/tango/index.theme</file>
         <file>resources/icons/appicons/logo.svg</file>
+        <file>resources/icons/appicons/logo48.png</file>
         <file>resources/icons/appicons/logo96.png</file>
         <file>resources/html/about.html</file>
         <file>resources/html/style.css</file>

src/resources/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Typica 1.6.2</string>
+	<string>Typica 1.6.3</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.6.2</string>
+	<string>1.6.3</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.2</string>
+	<string>1.6.3</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2007–2014 Neal Wilson</string>
+	<string>© 2007–2015 Neal Wilson</string>
 </dict>
 </plist>

src/resources/html/about.html

@@ -10,10 +10,10 @@
 				<div id="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.6.2</h2>
+					<h2>Version 1.6.3</h2>
 				</div>
 			<div id="maintext">
-				<p>Copyright &copy; 2007&ndash;2014 Neal Evan Wilson
+				<p>Copyright &copy; 2007&ndash;2015 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="https://twitter.com/N3Roaster">&#62217;</a>
@@ -25,9 +25,14 @@
 				<h3>Special Thanks</h3>
 				<p>Ongoing development of Typica is made possible through the
 				generous financial contributions from the following:</p>
-
+				
+				<p>Water Street Coffee Roaster</p>
+				<p>La Cosecha Coffee Roasters</p>
 				<p>Anonymous Funders Through
-				<a href="https://www.gittip.com/N3Roaster/">Gittip</a></p>
+				<a href="https://www.gratipay.com/N3Roaster/">Gratipay</a></p>
+				
+				<p>Hardware for developing Phidgets 1048 support was provided
+				by Phidgets, Inc.</p>
 
 				<h3>Get Involved</h3>
 				<p>Typica has reached a point in its development where it can
@@ -84,7 +89,7 @@
 				so please indicate if you would like to be identified by your
 				name, your company name, or in some other way.</p>
 				<p>Anonymous funding can also be made through
-				<a href="https://www.gittip.com/N3Roaster/">Gittip</a>. While
+				<a href="https://www.gratipay.com/N3Roaster/">Gratipay</a>. While
 				it is not possible to verify and recognize those who help
 				provide funding in this way, the small weekly payments are
 				easier to plan around than larger one time contributions.</p>
@@ -142,6 +147,18 @@
 				<a href="http://tango.freedesktop.org">Tango Desktop Project</a>.</p>
 				<p>Entypo pictograms by Daniel Bruce &mdash;
 				<a href="http://www.entypo.com">www.entypo.com</a></p>
+				<p>Some charts are produced with the help of d3.js which is provided
+				with the following license:</p>
+				<p>Copyright &copy; 2010-2014, Michael Bostock</p>
+				<p>All rights reserved.</p>
+				<p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</p>
+				<ul>
+					<li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+					<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+					<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>
+
 			</div>
 		</div>
 	</body>

src/scale.cpp

@@ -1,4 +1,4 @@
-/*869:*/
+/*978:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:869*//*870:*/
+/*:978*//*979:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*871:*/
+/*980:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:871*/
+/*:980*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:870*//*872:*/
+/*:979*//*981:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
 write("!KP\x0D");
 }
 
-/*:872*/
+/*:981*/

src/scale.h

@@ -1,4 +1,4 @@
-/*868:*/
+/*977:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
 
 #endif
 
-/*:868*/
+/*:977*/

src/settings.w

@@ -31,6 +31,8 @@ SettingsWindow::SettingsWindow() : QMainWindow(NULL)
 	settingsTab->addTab(deviceSettings, tr("Roasters"));
 	GraphSettingsWidget *graphSettings = new GraphSettingsWidget;
 	settingsTab->addTab(graphSettings, tr("Graph"));
+	AdvancedSettingsWidget *advancedSettings = new AdvancedSettingsWidget;
+	settingsTab->addTab(advancedSettings, tr("Advanced"));
 	setCentralWidget(settingsTab);
 }
 
@@ -56,4 +58,6 @@ constructor = engine->newFunction(constructSettingsWindow);
 value = engine->newQMetaObject(&DeviceConfigurationWindow::staticMetaObject, constructor);
 engine->globalObject().setProperty("SettingsWindow", value);
 
-@i graphsettings.w
+@i graphsettings.w
+
+@i advancedsettings.w

src/typica.rc

@@ -1,7 +1,7 @@
 #include <winver.h>
 VS_VERSION_INFO	VERSIONINFO
-FILEVERSION 	1,6,2,0
-PRODUCTVERSION 	1,6,2,0
+FILEVERSION 	1,6,3,0
+PRODUCTVERSION 	1,6,3,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.6.2\0"
-			VALUE "FileVersion", "1.6.2\0"
+			VALUE "FileDescription", "Typica 1.6.3\0"
+			VALUE "FileVersion", "1.6.3\0"
 			VALUE "InternalName", "Typica\0"
-			VALUE "LegalCopyright", "Copyright 2007-2014 Neal Evan Wilson\0"
+			VALUE "LegalCopyright", "Copyright 2007-2015 Neal Evan Wilson\0"
 			VALUE "OriginalFilename", "Typica.exe\0"
 			VALUE "ProductName", "Typica\0"
-			VALUE "ProductVersion", "1.6.2\0"
+			VALUE "ProductVersion", "1.6.3\0"
 		END
 	END
 	BLOCK "VarFileInfo"

src/units.cpp

@@ -1,9 +1,9 @@
-/*226:*/
+/*264:*/
 #line 42 "./units.w"
 
 #include "units.h"
 
-/*:226*//*227:*/
+/*:264*//*265:*/
 #line 52 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -14,7 +14,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:227*//*228:*/
+/*:265*//*266:*/
 #line 70 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -100,7 +100,7 @@ break;
 return 0;
 }
 
-/*:228*//*229:*/
+/*:266*//*267:*/
 #line 156 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -198,7 +198,7 @@ break;
 return 0;
 }
 
-/*:229*//*230:*/
+/*:267*//*268:*/
 #line 254 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -303,4 +303,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:230*/
+/*:268*/

src/units.h

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

src/unsupportedserial.w

@@ -0,0 +1,736 @@
+@** Script Driven Devices.
+
+\noindent There are many data acquisition products that are reasonable to use
+with \pn which are not natively supported due to lack of available hardware
+for testing, lack of time or money to develop that support, or lack of
+documentation. It has also become relatively simple for hardware tinkerers to
+develop new devices matching this description as well. Vendors in this space
+tend to give inadequate consideration to interoperability and with some devices
+the communications protocol used changes significantly between firmware
+revisions. There are simply far too many devices like this to support
+everything. At the same time there are people with these devices who are
+capable of programming the basic communications handling but have difficulty
+with integrating that with \pn. By providing an in-program environment that
+handles much of the boilerplate and allowing people to write scripts
+implementing these protocols without the need to modify core \pn code or
+recompile the program, these people may find it easier to make their existing
+hardware work. Such scripts can also serve as prototypes for native support.
+
+Configuration widgets for these devices allow key value pairs to be specified
+both at the device level and on a per-channel basis. This is intentionally kept
+generic as it is impossible to know what configurable details may be required.
+Common configurations will have a device node representing a single logical
+device, usually a single physical device but this is not in any way enforced,
+and one child node per channel. These details are made available to the device
+script and are used to integrate with the logging view.
+
+Some of the naming conventions used here are legacy of the initial conception
+of this feature and should be changed before release if there is time to do so.
+While initial support will be focused on devices that present as a serial port,
+there is no reason this could not be extended to cover devices that are
+interfaced through USB HID, Bluetooth, COM, output piped from an external
+console program, devices interfaced through arbitrary libraries, or any other
+class of device not directly supported in the core code should there be an
+interest in any of these.
+
+@<Class declarations@>=
+class UnsupportedSerialDeviceConfWidget : public BasicDeviceConfigurationWidget
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE UnsupportedSerialDeviceConfWidget(DeviceTreeModel *model,
+		                                              const QModelIndex &index);
+	private slots:
+		void updateConfiguration();
+		void saveScript();
+		void addChannel();
+	private:
+		SaltModel *deviceSettingsModel;
+		QTextEdit *scriptEditor;
+};
+
+@ The device configuration widget consists of two tabs. One tab provides a
+button for adding channels and an area for entering device specific
+configuration details. The other provides an area for entering the device
+script. This may be extended later to provide better editing, testing, and
+debugging support, but the initial concern is simply having a working feature.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+UnsupportedSerialDeviceConfWidget::UnsupportedSerialDeviceConfWidget(DeviceTreeModel *model,
+                                                                     const QModelIndex &index)
+	: BasicDeviceConfigurationWidget(model, index),
+	deviceSettingsModel(new SaltModel(2)),
+	scriptEditor(new QTextEdit)
+{
+	scriptEditor->setTabStopWidth(20);
+	QVBoxLayout *dummyLayout = new QVBoxLayout;
+	QTabWidget *central = new QTabWidget;
+	QWidget *deviceConfigurationWidget = new QWidget;
+	QVBoxLayout *deviceConfigurationLayout = new QVBoxLayout;
+	QPushButton *addChannelButton = new QPushButton(tr("Add Channel"));
+	deviceConfigurationLayout->addWidget(addChannelButton);
+	connect(addChannelButton, SIGNAL(clicked()), this, SLOT(addChannel()));
+	QLabel *deviceSettingsLabel = new QLabel(tr("Device Settings:"));
+	deviceConfigurationLayout->addWidget(deviceSettingsLabel);
+	QTableView *deviceSettingsView = new QTableView;
+	deviceSettingsModel->setHeaderData(0, Qt::Horizontal, tr("Key"));
+	deviceSettingsModel->setHeaderData(1, Qt::Horizontal, tr("Value"));
+	deviceSettingsView->setModel(deviceSettingsModel);
+	deviceConfigurationLayout->addWidget(deviceSettingsView);
+	
+	deviceConfigurationWidget->setLayout(deviceConfigurationLayout);
+	central->addTab(deviceConfigurationWidget, tr("Configuration"));
+	central->addTab(scriptEditor, tr("Script"));
+	dummyLayout->addWidget(central);
+	
+	@<Get device configuration data for current node@>@;
+	for(int i = 0; i < configData.size(); i++)
+	{
+		node = configData.at(i).toElement();
+		if(node.attribute("name") == "keys" || node.attribute("name") == "values")
+		{
+			int column = 0;
+			if(node.attribute("name") == "values")
+			{
+				column = 1;
+			}
+			QString data = node.attribute("value");
+			if(data.length() > 3)
+			{
+				data.chop(2);
+				data = data.remove(0, 2);
+			}
+			QStringList keyList = data.split(", ");
+			for(int j = 0; j < keyList.size(); j++)
+			{
+				deviceSettingsModel->setData(deviceSettingsModel->index(j, column),
+				                             QVariant(keyList.at(j)),
+				                             Qt::EditRole);
+			}
+		}
+		else if(node.attribute("name") == "script")
+		{
+			scriptEditor->setPlainText(node.attribute("value"));
+		}
+	}
+	
+	connect(deviceSettingsModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+	        this, SLOT(updateConfiguration()));
+	connect(scriptEditor, SIGNAL(textChanged()), this, SLOT(saveScript()));
+	setLayout(dummyLayout);
+}
+
+@ Device configuration data is entered through an ordinary |QTableView| with a
+|SaltModel| backing. The original use case for that model does not apply here,
+but that model does ensure that additional blank rows are added as needed so
+that arbitrarily many key value pairs can be entered. When data changes in the
+model we write the full content of the model out. Note that commas may not be
+used in keys or values. For keys in which lists make sense, a different
+delimiter must be chosen.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+void UnsupportedSerialDeviceConfWidget::updateConfiguration()
+{
+	updateAttribute("keys", deviceSettingsModel->arrayLiteral(0, Qt::DisplayRole));
+	updateAttribute("values", deviceSettingsModel->arrayLiteral(1, Qt::DisplayRole));
+}
+
+@ Every time the script text is changed, the new version of the script is
+saved. My expectation is that scripts will either be small or that they will be
+pasted in from outside of \pn so that this decision will not cause usability
+issues, however if I am wrong about this there may be a need to handle this
+more intelligently.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+void UnsupportedSerialDeviceConfWidget::saveScript()
+{
+	updateAttribute("script", scriptEditor->toPlainText());
+}
+
+@ Typica requires channel nodes to simplify integration with other existing
+device code. Providing a new node type allows arbitrary attributes to be
+configured on a per-channel basis without resorting to strange conventions in
+the device configuration.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+void UnsupportedSerialDeviceConfWidget::addChannel()
+{
+	insertChildNode(tr("Channel"), "unsupporteddevicechannel");
+}
+
+@ Channel configuration for unsupported devices is like unsupported device
+configuration in that arbitrary key value pairs may be entered for use by the
+device script. Conventions common to all other channel node types are also
+present here.
+
+@<Class declarations@>=
+class UnsupportedDeviceChannelConfWidget : public BasicDeviceConfigurationWidget
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE UnsupportedDeviceChannelConfWidget(DeviceTreeModel *model,
+		                                               const QModelIndex &index);
+	private slots:
+		void updateColumnName(const QString &value);
+		void updateHidden(bool hidden);
+		void updateConfiguration();
+	private:
+		SaltModel *channelSettingsModel;
+};
+
+@ The constructor is typical for for channel node configuraion widgets.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+UnsupportedDeviceChannelConfWidget::UnsupportedDeviceChannelConfWidget(DeviceTreeModel *model,
+                                                                       const QModelIndex &index)
+	: BasicDeviceConfigurationWidget(model, index),
+	channelSettingsModel(new SaltModel(2))
+{
+	QFormLayout *layout = new QFormLayout;
+	QLineEdit *columnName = new QLineEdit;
+	layout->addRow(tr("Column Name:"), columnName);
+	QCheckBox *hideSeries = new QCheckBox("Hide this channel");
+	layout->addRow(hideSeries);
+	QTableView *channelSettings = new QTableView;
+	channelSettingsModel->setHeaderData(0, Qt::Horizontal, "Key");
+	channelSettingsModel->setHeaderData(1, Qt::Horizontal, "Value");
+	channelSettings->setModel(channelSettingsModel);
+	layout->addRow(channelSettings);
+	setLayout(layout);
+	@<Get device configuration data for current node@>@;
+	for(int i = 0; i < configData.size(); i++)
+	{
+		node = configData.at(i).toElement();
+		if(node.attribute("name") == "columnname")
+		{
+			columnName->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "hidden")
+		{
+			hideSeries->setChecked(node.attribute("value") == "true");
+		}
+		else if(node.attribute("name") == "keys" || node.attribute("name") == "values")
+		{
+			int column = 0;
+			if(node.attribute("name") == "values")
+			{
+				column = 1;
+			}
+			QString data = node.attribute("value");
+			if(data.length() > 3)
+			{
+				data.chop(2);
+				data = data.remove(0, 2);
+			}
+			QStringList keyList = data.split(", ");
+			for(int j = 0; j < keyList.size(); j++)
+			{
+				channelSettingsModel->setData(channelSettingsModel->index(j, column),
+				                              QVariant(keyList.at(j)),
+				                              Qt::EditRole);
+			}
+		}
+	}
+	connect(columnName, SIGNAL(textEdited(QString)), this, SLOT(updateColumnName(QString)));
+	connect(hideSeries, SIGNAL(toggled(bool)), this, SLOT(updateHidden(bool)));
+	connect(channelSettingsModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+	        this, SLOT(updateConfiguration()));
+}
+
+@ Arbitrary channel configuration data is handled in the same way as device
+level settings while the column name and hidden status is handled in the same
+way as they are in other channel nodes.
+
+@<UnsupportedSerialDeviceConfWidget implementation@>=
+void UnsupportedDeviceChannelConfWidget::updateColumnName(const QString &value)
+{
+	updateAttribute("columnname", value);
+}
+
+void UnsupportedDeviceChannelConfWidget::updateHidden(bool hidden)
+{
+	updateAttribute("hidden", hidden ? "true" : "false");
+}
+
+void UnsupportedDeviceChannelConfWidget::updateConfiguration()
+{
+	updateAttribute("keys", channelSettingsModel->arrayLiteral(0, Qt::DisplayRole));
+	updateAttribute("values", channelSettingsModel->arrayLiteral(1, Qt::DisplayRole));
+}
+
+@ The configuration widgets need to be registered so they can be instantiated
+as appropriate.
+
+@<Register device configuration widgets@>=
+app.registerDeviceConfigurationWidget("unsupporteddevicechannel",
+	UnsupportedDeviceChannelConfWidget::staticMetaObject);
+app.registerDeviceConfigurationWidget("unsupporteddevice",
+	UnsupportedSerialDeviceConfWidget::staticMetaObject);
+
+@ A |NodeInserter| for the device node is also provided.
+
+@<Register top level device configuration nodes@>=
+inserter = new NodeInserter(tr("Other Device"), tr("Other Device"),
+	"unsupporteddevice", NULL);
+topLevelNodeInserters.append(inserter);
+
+@ A device abstraction is not strictly required for this feature, however
+having one greatly simplifies integrating this feature. At some point I would
+like to revise other device abstraction classes so that a huge amount of
+boilerplate associated with these can be removed from configuration documents.
+
+This device abstraction includes features in a few particular categories. First
+there are methods that are required for integrating the device with the logging
+view. The logging view instantiates the device abstraction, passing in the
+configuration data required to properly set up the device. It then is able to
+query information about the measurement channels that have been configured for
+this device and can set up all of the relevant indicators. Some device classes
+may be able to produce annotations, so this class can be treated exactly the
+same as any other annotation source. Another requested feature includes the
+ability of a device to trigger the start and end of batches, so signals are
+provided for this capability. Finally, there are methods associated with
+starting and stopping the device. The |start()| method will be called when the
+logging view has finished making all of the signal connections. The |stop()|
+method will be called when the logging view is closed, giving script code the
+chance to cleanly release any resources that must be held for device
+communications.
+
+@<Class declarations@>=
+class JavaScriptDevice : public QObject
+{
+	Q_OBJECT
+	public:
+		Q_INVOKABLE JavaScriptDevice(const QModelIndex &deviceIndex,
+		                             QScriptEngine *engine);
+		Q_INVOKABLE int channelCount();
+		Channel* getChannel(int channel);
+		Q_INVOKABLE bool isChannelHidden(int channel);
+		Q_INVOKABLE Units::Unit expectedChannelUnit(int channel);
+		Q_INVOKABLE QString channelColumnName(int channel);
+		Q_INVOKABLE QString channelIndicatorText(int channel);
+	public slots:
+		void setTemperatureColumn(int tcol);
+		void setAnnotationColumn(int ncol);
+		void start();
+		void stop();
+	signals:
+		void annotation(QString note, int tcol, int ncol);
+		void triggerStartBatch();
+		void triggerStopBatch();
+		void deviceStopRequested();
+	private:
+		QVariantMap deviceSettings;
+		QString deviceScript;
+		QList<Channel *> channelList;
+		QList<bool> hiddenState;
+		QList<Units::Unit> channelUnits;
+		QList<QString> columnNames;
+		QList<QString> indicatorTexts;
+		QList<QVariantMap> channelSettings;
+		int annotationTemperatureColumn;
+		int annotationNoteColumn;
+		QScriptEngine *scriptengine;
+};
+
+@ The |JavaScriptDevice| instance provides two interfaces. Its invokable
+methods provide the information needed to integrate script driven devices with
+a generic logging view. Additional information is also exposed through the host
+environment running the device script. This means that the class requires
+knowledge of the host environment, which it obtains through a script function
+similar to what is done for window creation.
+
+The name of the function is generic so this may be easily extended later to
+create all device abstraction instances.
+
+@<Function prototypes for scripting@>=
+QScriptValue createDevice(QScriptContext *context, QScriptEngine *engine);
+
+@ That method is made available to the scripting engine.
+
+@<Set up the scripting engine@>=
+engine->globalObject().setProperty("createDevice",
+                                   engine->newFunction(createDevice));
+
+@ This function currently creates a |JavaScriptDevice| from a device
+configuration node which must be passed through as an argument.
+
+@<Functions for scripting@>=
+QScriptValue createDevice(QScriptContext *context, QScriptEngine *engine)@/
+{
+	QModelIndex deviceIndex = argument<QModelIndex>(0, context);
+	JavaScriptDevice *device = new JavaScriptDevice(deviceIndex, engine);
+	QScriptValue object = engine->newQObject(device);
+	setQObjectProperties(object, engine);
+	object.setProperty("getChannel", engine->newFunction(JavaScriptDevice_getChannel));
+	return object;
+}
+
+@ The |start()| method is responsible for preparing the host environment and
+executing the device script.
+
+@<JavaScriptDevice implementation@>=
+void JavaScriptDevice::start()
+{
+	QScriptValue object = scriptengine->newQObject(this);
+	@<Expose device settings as object property@>@;
+	@<Expose channels and channel settings to device script@>@;
+	QScriptContext *context = scriptengine->currentContext();
+	QScriptValue oldThis = context->thisObject();
+	context->setThisObject(object);
+	QScriptValue result = scriptengine->evaluate(deviceScript);
+	QScriptEngine *engine = scriptengine;
+	@<Report scripting errors@>@;
+	context->setThisObject(oldThis);
+}
+
+@ Device settings are only needed from the device script itself. As such, these
+are presented under a settings property available from the |this| object when
+the script is run.
+
+@<Expose device settings as object property@>=
+QScriptValue settingsObject = scriptengine->newObject();
+QVariantMap::const_iterator i = deviceSettings.constBegin();
+while(i != deviceSettings.constEnd())
+{
+	settingsObject.setProperty(i.key(), i.value().toString());
+	i++;
+}
+object.setProperty("settings", settingsObject);
+
+@ While channels are available to the device script through the same
+|getChannel()| interface used outside of the device script for integration
+purposes, it is more convenient to have an array of channels with channel
+specific settings as properties of the channel.
+
+@<Expose channels and channel settings to device script@>=
+QScriptValue channelsArray = scriptengine->newArray(channelCount());
+for(int i = 0; i < channelCount(); i++)
+{
+	QScriptValue channelObject = scriptengine->newQObject(getChannel(i));
+	QScriptValue channelSettingsObject = scriptengine->newObject();
+	QVariantMap::const_iterator j = channelSettings.at(i).constBegin();
+	while(j != channelSettings.at(i).constEnd())
+	{
+		channelSettingsObject.setProperty(j.key(), j.value().toString());
+		j++;
+	}
+	channelObject.setProperty("settings", channelSettingsObject);
+	channelsArray.setProperty(i, channelObject);
+}
+object.setProperty("channels", channelsArray);
+
+@ Currently we require wrapper functions to work with channels in the host
+environment.
+
+@<Function prototypes for scripting@>=
+QScriptValue JavaScriptDevice_getChannel(QScriptContext *context, QScriptEngine *engine);
+
+@ The implementation is trivial.
+
+@<Functions for scripting@>=
+QScriptValue JavaScriptDevice_getChannel(QScriptContext *context, QScriptEngine *engine)
+{
+	JavaScriptDevice *self = getself<JavaScriptDevice *>(context);
+	QScriptValue object;
+	if(self)
+	{
+		object = engine->newQObject(self->getChannel(argument<int>(0, context)));
+		setChannelProperties(object, engine);
+	}
+	return object;
+}
+
+@ The |stop()| method just fires off a signal that the script can hook into for
+any required cleanup.
+
+@<JavaScriptDevice implementation@>=
+void JavaScriptDevice::stop()
+{
+	emit deviceStopRequested();
+}
+
+@ The constructor is responsible for all boilerplate initialization required
+for integrating script defined devices with the logging view.
+
+Note: At present expected units are assumed to be Fahrenheit. The configuration
+widget must be updated to allow at least for control measurements and
+eventually support for runtime defined units should also be added.
+
+@<JavaScriptDevice implementation@>=
+JavaScriptDevice::JavaScriptDevice(const QModelIndex &index,
+                                   QScriptEngine *engine) :
+	QObject(NULL), scriptengine(engine)
+{
+	DeviceTreeModel *model = (DeviceTreeModel *)(index.model());
+	QDomElement deviceReferenceElement =
+		model->referenceElement(model->data(index, Qt::UserRole).toString());
+	QDomNodeList deviceConfigData = deviceReferenceElement.elementsByTagName("attribute");
+	QDomElement node;
+	QStringList deviceKeys;
+	QStringList deviceValues;
+	for(int i = 0; i < deviceConfigData.size(); i++)
+	{
+		node = deviceConfigData.at(i).toElement();
+		if(node.attribute("name") == "keys")
+		{
+			QString data = node.attribute("value");
+			if(data.length() > 3)
+			{
+				data.chop(2);
+				data = data.remove(0, 2);
+			}
+			deviceKeys = data.split(", ");
+		}
+		else if(node.attribute("name") == "values")
+		{
+			QString data = node.attribute("value");
+			if(data.length() > 3)
+			{
+				data.chop(2);
+				data = data.remove(0, 2);
+			}
+			deviceValues = data.split(", ");
+		}
+		else if(node.attribute("name") == "script")
+		{
+			deviceScript = node.attribute("value");
+		}
+		deviceSettings.insert(node.attribute("name"), node.attribute("value"));
+	}
+	for(int i = 0; i < qMin(deviceKeys.length(), deviceValues.length()); i++)
+	{
+		deviceSettings.insert(deviceKeys[i], deviceValues[i]);
+	}
+	if(model->hasChildren(index))
+	{
+		for(int i = 0; i < model->rowCount(index); i++)
+		{
+			QModelIndex channelIndex = model->index(i, 0, index);
+			QDomElement channelReference = model->referenceElement(model->data(channelIndex, 32).toString());
+			channelList.append(new Channel);
+			QDomElement channelReferenceElement =
+				model->referenceElement(model->data(channelIndex, Qt::UserRole).toString());
+			QDomNodeList channelConfigData =
+				channelReferenceElement.elementsByTagName("attribute");
+			QStringList channelKeys;
+			QStringList channelValues;
+			for(int j = 0; j < channelConfigData.size(); j++)
+			{
+				node = channelConfigData.at(j).toElement();
+				if(node.attribute("name") == "keys")
+				{
+					QString data = node.attribute("value");
+					if(data.length() > 3)
+					{
+						data.chop(2);
+						data = data.remove(0, 2);
+					}
+					channelKeys = data.split(", ");
+				}
+				else if(node.attribute("name") == "values")
+				{
+					QString data = node.attribute("value");
+					if(data.length() > 3)
+					{
+						data.chop(2);
+						data = data.remove(0, 2);
+					}
+					channelValues = data.split(", ");
+				}
+				else if(node.attribute("name") == "hidden")
+				{
+					hiddenState.append(node.attribute("value") == "true");
+				}
+				else if(node.attribute("name") == "columnname")
+				{
+					columnNames.append(node.attribute("value"));
+				}
+			}
+			QVariantMap cs;
+			for(int j = 0; j < qMin(channelKeys.length(), channelValues.length()); j++)
+			{
+				cs.insert(channelKeys[j], channelValues[j]);
+			}
+			channelSettings.append(cs);
+			indicatorTexts.append(model->data(channelIndex, Qt::DisplayRole).toString());
+			channelUnits.append(Units::Fahrenheit);
+		}
+	}
+}
+
+@ Several methods are available to query information about the configured
+channels.
+
+@<JavaScriptDevice implementation@>=
+int JavaScriptDevice::channelCount()
+{
+	return channelList.length();
+}
+
+Channel* JavaScriptDevice::getChannel(int channel)
+{
+	return channelList.at(channel);
+}
+
+bool JavaScriptDevice::isChannelHidden(int channel)
+{
+	return hiddenState.at(channel);
+}
+
+Units::Unit JavaScriptDevice::expectedChannelUnit(int channel)
+{
+	return channelUnits.at(channel);
+}
+
+QString JavaScriptDevice::channelColumnName(int channel)
+{
+	if(channel >= 0 && channel < columnNames.length())
+	{
+		return columnNames.at(channel);
+	}
+	return QString();
+}
+
+QString JavaScriptDevice::channelIndicatorText(int channel)
+{
+	return indicatorTexts.at(channel);
+}
+
+@ Two slots are provided for controlling the placement of annotations.
+
+@<JavaScriptDevice implementation@>=
+void JavaScriptDevice::setTemperatureColumn(int tcol)
+{
+	annotationTemperatureColumn = tcol;
+}
+
+void JavaScriptDevice::setAnnotationColumn(int ncol)
+{
+	annotationNoteColumn = ncol;
+}
+
+@ Device scripts must be able to produce measurements on a channel. To do this,
+a function is provided for obtaining a timestamp. The returned timestamp should
+not be examined as future changes may break assumptions about the content of
+the timestamp.
+
+@<Function prototypes for scripting@>=
+QScriptValue getMeasurementTimestamp(QScriptContext *context, QScriptEngine *engine);
+
+@ That method is made available to the scripting engine.
+
+@<Set up the scripting engine@>=
+engine->globalObject().setProperty("getMeasurementTimestamp",
+                                   engine->newFunction(getMeasurementTimestamp));
+
+@ At present this simply obtains the current system time. It is planned to
+switch to a better quality clock in the future, but this should be done for
+everything that uses |Measurement| objects at once.
+
+@<Functions for scripting@>=
+QScriptValue getMeasurementTimestamp(QScriptContext *, QScriptEngine *engine)@/
+{
+	return engine->toScriptValue<QTime>(QTime::currentTime());
+}
+
+@ At present, implementations are not broken out to a separate file. This
+should be changed at some point.
+
+@<Class implementations@>=
+@<UnsupportedSerialDeviceConfWidget implementation@>
+@<JavaScriptDevice implementation@>
+
+@* Serial Ports.
+
+\noindent The first use case for script driven devices was connecting to
+devices which present themselves as a serial port. This covers a broad range
+of data acquisition products. To provide this support, |QextSerialPort|, which
+was already used to support some other hardware options, is directly exposed to
+the host environment.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructSerialPort(QScriptContext *context, QScriptEngine *engine);
+void setSerialPortProperties(QScriptValue value, QScriptEngine *engine);
+QScriptValue SerialPort_flush(QScriptContext *context, QScriptEngine *engine);
+
+@ Our constructor is passed to the scripting engine.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructSerialPort);
+value = engine->newQMetaObject(&QextSerialPort::staticMetaObject, constructor);
+engine->globalObject().setProperty("SerialPort", value);
+
+@ At present we only support event driven communications and are not passing
+any port settings through the constructor. Such functionality may be added in
+the future, but it is not strictly necessary.
+
+@<Functions for scripting@>=
+QScriptValue constructSerialPort(QScriptContext *, QScriptEngine *engine)
+{
+	QScriptValue object = engine->newQObject(new QextSerialPort());
+	setSerialPortProperties(object, engine);
+	return object;
+}
+
+@ Some properties of |QIODevice| are brought in as usual for similar subclasses
+but we also add a wrapper around the |flush()| method.
+
+@<Functions for scripting@>=
+void setSerialPortProperties(QScriptValue value, QScriptEngine *engine)
+{
+	setQIODeviceProperties(value, engine);
+	value.setProperty("flush", engine->newFunction(SerialPort_flush));
+}
+
+@ The wrapper around |flush()| is trivial.
+
+@<Functions for scripting@>=
+QScriptValue SerialPort_flush(QScriptContext *context, QScriptEngine *)
+{
+	QextSerialPort *self = getself<QextSerialPort *>(context);
+	self->flush();
+	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/webelement.cpp

@@ -1,18 +1,18 @@
-/*513:*/
-#line 365 "./webview.w"
+/*557:*/
+#line 368 "./webview.w"
 
 #include "webelement.h"
 
-/*511:*/
-#line 308 "./webview.w"
+/*555:*/
+#line 311 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 {
 
 }
 
-/*:511*//*512:*/
-#line 317 "./webview.w"
+/*:555*//*556:*/
+#line 320 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 {
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:512*/
-#line 368 "./webview.w"
+/*:556*/
+#line 371 "./webview.w"
 
 
-/*:513*/
+/*:557*/

src/webelement.h

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

src/webview.cpp

@@ -1,10 +1,10 @@
-/*491:*/
-#line 49 "./webview.w"
+/*535:*/
+#line 50 "./webview.w"
 
 #include "webview.h"
 
-/*492:*/
-#line 56 "./webview.w"
+/*536:*/
+#line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
 {
@@ -12,16 +12,16 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:492*//*493:*/
-#line 72 "./webview.w"
+/*:536*//*537:*/
+#line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
 {
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*494:*/
-#line 90 "./webview.w"
+/*538:*/
+#line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
 {
@@ -29,11 +29,11 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:494*/
-#line 78 "./webview.w"
+/*:538*/
+#line 79 "./webview.w"
 
-/*495:*/
-#line 99 "./webview.w"
+/*539:*/
+#line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
 {
@@ -41,8 +41,8 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:495*/
-#line 79 "./webview.w"
+/*:539*/
+#line 80 "./webview.w"
 
 }
 else
@@ -51,8 +51,8 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:493*//*496:*/
-#line 111 "./webview.w"
+/*:537*//*540:*/
+#line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
 {
@@ -76,9 +76,11 @@ QWebView::setHtml(html,baseUrl);
 
 void TypicaWebView::setContent(QIODevice*device)
 {
+QSettings settings;
 device->reset();
 QByteArray content= device->readAll();
-QWebView::setContent(content,"application/xhtml+xml");
+QUrl baseDir= QUrl("file://"+settings.value("config").toString()+"/");
+QWebView::setContent(content,"application/xhtml+xml",baseDir);
 }
 
 QString TypicaWebView::saveXml()
@@ -86,8 +88,8 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:496*//*502:*/
-#line 202 "./webview.w"
+/*:540*//*546:*/
+#line 205 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 {
@@ -99,8 +101,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:502*/
-#line 52 "./webview.w"
+/*:546*/
+#line 53 "./webview.w"
 
 
-/*:491*/
+/*:535*/

src/webview.h

@@ -1,4 +1,4 @@
-/*490:*/
+/*534:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -9,6 +9,7 @@
 #include <QPrintDialog> 
 #include <QWebFrame> 
 #include <QWebElement> 
+#include <QSettings> 
 
 #ifndef TypicaWebViewHeader
 #define TypicaWebViewHeader
@@ -33,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:490*/
+/*:534*/

src/webview.w

@@ -20,6 +20,7 @@ In order to simplify the implementation of certain features, we subclass
 #include <QPrintDialog>
 #include <QWebFrame>
 #include <QWebElement>
+#include <QSettings>
 
 #ifndef TypicaWebViewHeader
 #define TypicaWebViewHeader
@@ -131,9 +132,11 @@ void TypicaWebView::setHtml(const QString &html, const QUrl &baseUrl)
 
 void TypicaWebView::setContent(QIODevice *device)
 {
+	QSettings settings;
 	device->reset();
 	QByteArray content = device->readAll();
-	QWebView::setContent(content, "application/xhtml+xml");
+	QUrl baseDir = QUrl("file://" + settings.value("config").toString() + "/");
+	QWebView::setContent(content, "application/xhtml+xml", baseDir);
 }
 
 QString TypicaWebView::saveXml()

typica.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.4.3
+Version=1.6.3
 Name=Typica
 GenericName=Coffee Roasting
 Comment=Data acquisition, reporting, and management for coffee roasters