Merge branch 'release-1.6.2'

config/Reports/auco.xml

@@ -65,7 +65,7 @@
                 output.writeStartElement("thead");
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "5");
+                output.writeAttribute("colspan", "8");
                 output.writeCharacters("Regular Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
@@ -75,6 +75,9 @@
                 output.writeTextElement("th", "Avg. Cost");
 				output.writeTextElement("th", "Last Cost");
 				output.writeTextElement("th", "Last Purchase Date");
+				output.writeTextElement("th", "Bag Size (min)");
+				output.writeTextElement("th", "Bag Size (max)");
+				output.writeTextElement("th", "Bag Size (mean)");
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tbody");
@@ -105,10 +108,13 @@
 						orderClause = "cost DESC";
 						break;
 				}
-				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY " + orderClause);
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin)), (SELECT min(conversion)/:conversion4 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS minbag, (SELECT max(conversion)/:conversion5 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS maxbag, (SELECT avg(conversion)/:conversion6 FROM lb_bag_conversion WHERE item IN (SELECT id FROM regular_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS meanbag FROM coffee_history WHERE id IN (SELECT id FROM regular_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
 				query.bind(":conversion3", conversion);
+				query.bind(":conversion4", conversion);
+				query.bind(":conversion5", conversion);
+				query.bind(":conversion6", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -118,18 +124,24 @@
                     output.writeTextElement("td", query.value(2));
 					output.writeTextElement("td", query.value(3));
 					output.writeTextElement("td", query.value(4));
+					output.writeTextElement("td", query.value(5));
+					output.writeTextElement("td", query.value(6));
+					output.writeTextElement("td", query.value(7));
                     output.writeEndElement();
                 }
                 output.writeStartElement("tr");
                 output.writeStartElement("th");
-                output.writeAttribute("colspan", "5");
+                output.writeAttribute("colspan", "8");
                 output.writeCharacters("Decaffeinated Coffees");
                 output.writeEndElement();
                 output.writeEndElement();
-				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin)) FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY " + orderClause);
+				query.prepare("SELECT DISTINCT origin, (avg(rate)/:conversion)::numeric(10,2) AS rate, (SELECT avg(cost)*:conversion2 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS cost, (SELECT avg(cost)*:conversion3 FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin) AND time = (SELECT max(time) FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))), (SELECT max(time)::date FROM purchase WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin)), (SELECT min(conversion)/:conversion4 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS minbag, (SELECT max(conversion)/:conversion5 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS maxbag, (SELECT avg(conversion)/:conversion6 FROM lb_bag_conversion WHERE item IN (SELECT id FROM decaf_coffees WHERE origin = coffee_history.origin))::numeric(10,2) AS meanbag FROM coffee_history WHERE id IN (SELECT id FROM decaf_coffees) GROUP BY origin ORDER BY " + orderClause);
 				query.bind(":conversion", conversion);
 				query.bind(":conversion2", conversion);
 				query.bind(":conversion3", conversion);
+				query.bind(":conversion4", conversion);
+				query.bind(":conversion5", conversion);
+				query.bind(":conversion6", conversion);
 				query.exec();
                 while(query.next())
                 {
@@ -139,6 +151,9 @@
                     output.writeTextElement("td", query.value(2));
 					output.writeTextElement("td", query.value(3));
 					output.writeTextElement("td", query.value(4));
+					output.writeTextElement("td", query.value(5));
+					output.writeTextElement("td", query.value(6));
+					output.writeTextElement("td", query.value(7));
                     output.writeEndElement();
                 }
 				query = query.invalidate();

config/Reports/chart.xml

@@ -2,10 +2,7 @@
 	<reporttitle>Production:->Previous Year Production Comparison</reporttitle>
     <layout type="vertical">
         <layout type="horizontal">
-            <label>Start Date:</label>
-            <calendar id="startdate" />
-            <label>End Date:</label>
-            <calendar id="enddate" />
+			<daterange id="dates" initial="19" /><!-- Current Year to Date -->
             <label>Days to Average</label>
             <line validator="integer" id="days">7</line>
 			<label>Weight Unit:</label>
@@ -20,9 +17,8 @@
     <program>
         <![CDATA[
             this.windowTitle = "Typica - Previous Year Production Comparison";
-            var startDateField = findChildObject(this, 'startdate');
-            startDateField.setDate(startDateField.year(), 1, 1);
-            var endDateField = findChildObject(this, 'enddate');
+			var dateSelect = findChildObject(this, 'dates');
+			dateSelect.removeIndex(23); // Remove Lifetime range
             var view = findChildObject(this, 'report');
             var printMenu = findChildObject(this, 'print');
             printMenu.triggered.connect(function() {
@@ -79,10 +75,12 @@
                 output.writeStartElement("tbody");
                 var query = new QSqlQuery();
                 query.exec("START TRANSACTION");
-                var curStartDate = "'"+startDateField.year()+"-"+startDateField.month()+"-"+startDateField.day()+"'";
-                query.exec("SELECT "+curStartDate+"::date - interval '1 year', '"+endDateField.year()+"-"+endDateField.month()+"-"+endDateField.day()+"'::date - interval '1 year' + interval '1 day', '"+endDateField.year()+"-"+endDateField.month()+"-"+endDateField.day()+"'::date + interval '1 day'");
-                query.next();
-                var curEndDate = "'"+query.value(2)+"'";
+				var dateRange = dateSelect.currentRange();
+				var curStartDate = "'"+dateRange[0]+"'";
+				var curEndDate = "'"+dateRange[dateRange.length - 1]+"'";
+                query.exec("SELECT "+curStartDate+"::date - interval '1 year', "+curEndDate+"::date - interval '1 year' + interval '1 day', "+curEndDate+"::date + interval '1 day'");
+				query.next();
+                curEndDate = "'"+query.value(2)+"'";
                 var prevStartDate = "'"+query.value(0)+"'";
                 var prevEndDate = "'"+query.value(1)+"'";
                 var q = "CREATE TEMPORARY TABLE previous ON COMMIT DROP AS SELECT roasted_id, sum(roasted_quantity) AS p FROM roasting_log WHERE time > "+prevStartDate+" AND time < "+prevEndDate+" AND roasted_id IS NOT NULL GROUP BY roasted_id";
@@ -501,12 +499,9 @@
                 buffer.close();
             }
             refresh();
-            startDateField.dateChanged.connect(function() {
-                refresh();
-            });
-            endDateField.dateChanged.connect(function() {
-                refresh();
-            });
+			dateSelect.rangeUpdated.connect(function() {
+				refresh();
+			});
 			avgField.editingFinished.connect(function() {
 				refresh();
 			});

config/Reports/fypurchase.xml

@@ -2,10 +2,7 @@
 	<reporttitle>Purchase:->Coffee Purchase Previous Years Comparison</reporttitle>
 	<layout type="vertical">
 		<layout type="horizontal">
-			<label>Start Date:</label>
-			<calendar id="startdate" />
-			<label>End Date:</label>
-			<calendar id="enddate" />
+			<daterange id = "dates" initial="23" /><!--Lifetime-->
 			<label>Weight Unit:</label>
 			<sqldrop id="unit" />
 			<stretch />
@@ -18,16 +15,16 @@
 	<program>
 		<![CDATA[
 			this.windowTitle = "Typica - Coffee Purchase Previous Years Comparison";
-			/* Set starting year to the first year on record. */
-			var startDateField = findChildObject(this, 'startdate');
+			/* Set Lifetime range. */
+			var dateSelect = findChildObject(this, 'dates');
 			var query = new QSqlQuery();
-			query.exec("SELECT EXTRACT(YEAR FROM time) FROM purchase WHERE time = (SELECT min(time) FROM purchase)");
+			query.exec("SELECT concat(EXTRACT(YEAR FROM time::date), '-01-01') FROM purchase WHERE time = (SELECT min(time) FROM purchase) UNION SELECT concat(EXTRACT(YEAR FROM 'now'::date), '-12-31')");
 			query.next();
-			startDateField.setDate(query.value(0), 1, 1);
+			var lifetimeStartDate = query.value(0);
+			query.next();
+			var lifetimeEndDate = query.value(0);
+			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
 			query = query.invalidate();
-			/* Set ending year to the current year. */
-			var endDateField = findChildObject(this, 'enddate');
-			endDateField.setDate(endDateField.year(), 12, 31);
 			/* Enable printing */
 			var view = findChildObject(this, 'report');
 			var printMenu = findChildObject(this, 'print');
@@ -81,7 +78,10 @@
 				var unittotal = 0;
 				var costtotal = 0;
 				var query = new QSqlQuery();
-				for(var i = startDateField.year(); i <= endDateField.year(); i++)
+				var dateRange = dateSelect.currentRange();
+				var startYear = Number(dateRange[0].substr(0, 4));
+				var endYear = Number(dateRange[dateRange.length - 1].substr(0, 4));
+				for(var i = startYear; i <= endYear; i++)
 				{
 					output.writeStartElement("tr");
 					output.writeAttribute("id", "y"+i);
@@ -121,10 +121,7 @@
 			}
 			refresh();
 			/* Update report as needed. */
-			startDateField.dateChanged.connect(function() {
-				refresh();
-			});
-			endDateField.dateChanged.connect(function() {
+			dateSelect.rangeUpdated.connect(function() {
 				refresh();
 			});
 			/* Expand year data */

config/Reports/invchange.xml

@@ -2,10 +2,7 @@
 	<reporttitle>Inventory:->Inventory Change Summary</reporttitle>
 	<layout type="vertical">
 		<layout type="horizontal">
-			<label>Start Date:</label>
-			<calendar id="startdate" />
-			<label>End Date:</label>
-			<calendar id="enddate" />
+			<daterange id="dates" initial="19" /><!-- Current Year to Date-->
 			<label>Weight Unit:</label>
 			<sqldrop id="unit" />
 			<stretch />
@@ -18,9 +15,19 @@
 	<program>
 		<![CDATA[
 			this.windowTitle = "Typica - Inventory Change Summary";
-			var startDateField = findChildObject(this, 'startdate');
-			startDateField.setDate(startDateField.year(), 1, 1);
-			var endDateField = findChildObject(this, 'enddate');
+			var dateSelect = findChildObject(this, 'dates');
+			var dateQuery = new QSqlQuery();
+			dateQuery.exec("SELECT time::date FROM transactions WHERE time = (SELECT min(time) FROM transactions) OR time = (SELECT max(time) FROM transactions) ORDER BY time ASC");
+			dateQuery.next();
+			var lifetimeStartDate = dateQuery.value(0);
+			var lifetimeEndDate;
+			if(dateQuery.next()) {
+				lifetimeEndDate = dateQuery.value(0);
+			} else {
+				lifetimeEndDate = lifetimeStartDate;
+			}
+			dateSelect.setLifetimeRange(lifetimeStartDate, lifetimeEndDate);
+			dateQuery = dateQuery.invalidate();
 			var unitBox = findChildObject(this, 'unit');
 			unitBox.addItem("Kg");
 			unitBox.addItem("Lb");
@@ -46,8 +53,9 @@
 				output.writeTextElement("title", "Inventory Change Summary");
 				output.writeEndElement();
 				output.writeStartElement("body");
-				var startDate = "" + startDateField.year() + "-" + startDateField.month() + "-" + startDateField.day();
-				var endDate = "" + endDateField.year() + "-" + endDateField.month() + "-" + endDateField.day();
+				var dateRange = dateSelect.currentRange();
+				var startDate = dateRange[0];
+				var endDate = dateRange[dateRange.length - 1];
 				output.writeTextElement("h1", "Inventory Change Summary: " + startDate + " – " + endDate);
 				var conversion = 1;
 				if(unitBox.currentIndex == 0) {
@@ -58,7 +66,7 @@
 					unitText = "Kg";
 				}
 				var query = new QSqlQuery();
-					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id)*:c6 AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity)/:c7 AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost FROM q ORDER BY name";
+					var q = "WITH q AS (SELECT id, name, reference, COALESCE((SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :sd1)), 0)/:c1 AS starting_balance, COALESCE((SELECT sum(quantity) FROM purchase WHERE item = id AND time >= :sd2 AND time < :ed1 ::date + interval '1 day'), 0)/:c2 AS purchase, COALESCE((SELECT sum(quantity) FROM use WHERE item = id AND time >= :sd3 AND time < :ed2 ::date + interval '1 day'), 0)/:c3 AS use, COALESCE((SELECT sum(quantity) FROM sale WHERE item = id AND time >= :sd4 AND time < :ed3 ::date + interval '1 day'), 0)/:c4 AS sale, (SElECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed4 ::date + interval '1 day'))/:c5 AS quantity, (SELECT sum(cost * quantity) / sum(quantity) FROM purchase WHERE item = id) AS unit_cost FROM coffees WHERE id IN (SELECT item FROM purchase WHERE time >= :sd6 AND time < :ed5 ::date + interval '1 day') OR id IN (SELECT id FROM items WHERE (SELECT balance FROM item_history(id) WHERE time = (SELECT max(time) FROM item_history(id) WHERE time < :ed6 ::date + interval '1 day')) > 0) OR id IN (SELECT DISTINCT item FROM all_transactions WHERE time > :sd7 AND time < :ed7 ::date + interval '1 day')) SELECT *, (starting_balance + purchase - use - sale - quantity)/:c7 AS adjustment, starting_balance * unit_cost * :c8 AS starting_cost, purchase * unit_cost * :c9 AS purchase_cost, use * unit_cost * :c10 AS use_cost, sale * unit_cost * :c11 AS sale_cost, quantity * unit_cost * :c12 AS quantity_cost, (starting_balance + purchase - use - sale - quantity) * unit_cost * :c13 AS adjustment_cost, (SELECT sum(quantity)/:c6 FROM purchase WHERE item = id) AS total_purchase FROM q ORDER BY name";
 				query.prepare(q);
 				query.bind(":sd1", startDate);
 				query.bind(":sd2", startDate);
@@ -133,17 +141,35 @@
 					output.writeEndElement();
 					output.writeTextElement("td", query.value(1)); //Coffee
 					output.writeTextElement("td", query.value(2)); //Reference
-					output.writeTextElement("td", parseFloat(query.value(3)).toFixed(2)); //Starting Wt
+					output.writeStartElement("td"); //Starting Wt
+					output.writeAttribute("title", (parseFloat(query.value(3))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(3)).toFixed(2));
+					output.writeEndElement(); //End of Starting Wt.
 					output.writeTextElement("td", parseFloat(query.value(10)).toFixed(2)); //Starting Cost
-					output.writeTextElement("td", parseFloat(query.value(4)).toFixed(2)); //Purchase Wt
+					output.writeStartElement("td"); //Purchase Wt
+					output.writeAttribute("title", (parseFloat(query.value(4))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(4)).toFixed(2));
+					output.writeEndElement(); //End of Purchase Wt
 					output.writeTextElement("td", parseFloat(query.value(11)).toFixed(2)); //Purchase Cost
-					output.writeTextElement("td", parseFloat(query.value(5)).toFixed(2)); //Use Wt
+					output.writeStartElement("td"); //Use Wt
+					output.writeAttribute("title", (parseFloat(query.value(5))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(5)).toFixed(2));
+					output.writeEndElement(); //End of Use Wt
 					output.writeTextElement("td", parseFloat(query.value(12)).toFixed(2)); //Use Cost
-					output.writeTextElement("td", parseFloat(query.value(6)).toFixed(2)); //Sale Wt
+					output.writeStartElement("td"); //Sale Wt
+					output.writeAttribute("title", (parseFloat(query.value(6))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(6)).toFixed(2));
+					output.writeEndElement(); //End of Sale Wt
 					output.writeTextElement("td", parseFloat(query.value(13)).toFixed(2)); //Sale Cost
-					output.writeTextElement("td", parseFloat(query.value(9)).toFixed(2)); //Adjustment Wt
+					output.writeStartElement("td"); //Adjustment Wt
+					output.writeAttribute("title", (parseFloat(query.value(9))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(9)).toFixed(2));
+					output.writeEndElement(); //Adjustment Wt
 					output.writeTextElement("td", parseFloat(query.value(15)).toFixed(2)); //Adjustment Cost
-					output.writeTextElement("td", parseFloat(query.value(7)).toFixed(2)); //Ending Wt
+					output.writeStartElement("td"); //Ending Wt
+					output.writeAttribute("title", (parseFloat(query.value(7))/parseFloat(query.value(16)) * 100).toFixed(0) + "%");
+					output.writeCDATA(parseFloat(query.value(7)).toFixed(2));
+					output.writeEndElement(); //End of Ending Wt
 					output.writeTextElement("td", parseFloat(query.value(14)).toFixed(2)); //Ending Cost
 					output.writeEndElement();
 					sum3 += parseFloat(query.value(3));
@@ -188,10 +214,7 @@
 				query = query.invalidate();
 			}
 			refresh();
-			startDateField.dateChanged.connect(function() {
-				refresh();
-			});
-			endDateField.dateChanged.connect(function() {
+			dateSelect.rangeUpdated.connect(function() {
 				refresh();
 			});
 			view.scriptLinkClicked.connect(function(url) {

config/Windows/greensales.xml

@@ -27,6 +27,10 @@
 			unitBox.addItem("Kg");
 			unitBox.addItem("oz");
 			unitBox.addItem("lb");
+			unitBox.currentIndex = (QSettings.value("script/greensales_unit", unitBox.findText("lb")));
+			unitBox['currentIndexChanged(int)'].connect(function() {
+				QSettings.setValue("script/greensales_unit", unitBox.currentIndex);
+			});
 			var convertToPounds = function(w, u) {
 				switch(u)
 				{

src/Typica.pro

@@ -23,7 +23,8 @@ HEADERS += moc_typica.cpp \
     webview.h \
     webelement.h \
     scale.h \
-    draglabel.h
+    draglabel.h \
+    daterangeselector.h
 SOURCES += typica.cpp \
     helpmenu.cpp \
     abouttypica.cpp \
@@ -31,7 +32,8 @@ SOURCES += typica.cpp \
     webview.cpp \
     webelement.cpp \
     scale.cpp \
-    draglabel.cpp
+    draglabel.cpp \
+    daterangeselector.cpp
 
 RESOURCES += \
     resources.qrc

src/abouttypica.cpp

@@ -17,7 +17,7 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 5640 "./typica.w"
+#line 5641 "./typica.w"
 
 /*:223*/
 #line 36 "./abouttypica.w"

src/clock.cpp

@@ -0,0 +1,43 @@
+/*244:*/
+#line 52 "./clock.w"
+
+#include "clock.h"
+
+/*245:*/
+#line 61 "./clock.w"
+
+Clock::Clock():QObject(NULL)
+{
+reference.start();
+}
+
+Clock::~Clock()
+{
+
+}
+
+/*:245*//*246:*/
+#line 79 "./clock.w"
+
+qint64 Clock::timestamp()
+{
+guard.lock();
+qint64 retval= reference.elapsed();
+guard.unlock();
+emit newTime(retval);
+return retval;
+}
+
+void Clock::setEpoch()
+{
+guard.lock();
+reference.restart();
+guard.unlock();
+emit newTime(0);
+}
+
+/*:246*/
+#line 55 "./clock.w"
+
+
+/*:244*/

src/clock.h

@@ -0,0 +1,29 @@
+/*243:*/
+#line 24 "./clock.w"
+
+#include <QElapsedTimer> 
+#include <QMutex> 
+#include <QObject> 
+
+#ifndef ClockHeader
+#define ClockHeader
+
+class Clock:public QObject
+{
+Q_OBJECT
+public:
+Clock();
+~Clock();
+qint64 timestamp();
+public slots:
+void setEpoch();
+signals:
+void newTime(qint64 time);
+private:
+QElapsedTimer reference;
+QMutex guard;
+};
+
+#endif
+
+/*:243*/

src/dataqsdk.w

@@ -496,7 +496,7 @@ DataqSdkDevice::DataqSdkDevice(QString device) : imp(new DataqSdkDeviceImplement
 	int rstart = finalizedPort.indexOf("COM");
 	finalizedPort.remove(0, rstart + 3);
 	bool chopFinished = false;
-	int finalizedPortNumber;
+	int finalizedPortNumber = 0;
 	while(finalizedPort.size() > 0 && !chopFinished)
 	{
 		finalizedPortNumber = finalizedPort.toInt(&chopFinished);
@@ -1098,7 +1098,7 @@ in.
 @<DATAQ SDK device settings@>=
 bool autoSelect;
 QString deviceID;
-int channelOfInterest;
+unsigned int channelOfInterest;
 
 @ This information is accessed through the reference element associated with
 the parent node of the current configuration and from the row number of the
@@ -1141,7 +1141,7 @@ void DataqSdkChannelConfWidget::startCalibration()
 	resetButton->setEnabled(true);
 	calibrationDevice = new DataqSdkDevice(deviceID);
 	Channel *channel;
-	for(int i = 0; i <= channelOfInterest; i++)
+	for(unsigned int i = 0; i <= channelOfInterest; i++)
 	{
 		channel = calibrationDevice->newChannel(Units::Unitless);
 	}

src/daterangeselector.cpp

@@ -0,0 +1,346 @@
+/*603:*/
+#line 66 "./daterangeselector.w"
+
+#include <QCalendarWidget> 
+#include <QPushButton> 
+#include <QBoxLayout> 
+#include <QLabel> 
+#include <QToolButton> 
+#include <QApplication> 
+#include <QDesktopWidget> 
+
+#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"
+
+CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
+QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
+endDateSelector(new QCalendarWidget),applyButton(new QPushButton(tr("Apply")))
+{
+setAttribute(Qt::WA_WindowPropagation);
+
+QVBoxLayout*outerLayout= new QVBoxLayout;
+QHBoxLayout*calendarsLayout= new QHBoxLayout;
+QVBoxLayout*startDateLayout= new QVBoxLayout;
+QVBoxLayout*endDateLayout= new QVBoxLayout;
+QHBoxLayout*buttonLayout= new QHBoxLayout;
+QLabel*startDateLabel= new QLabel(tr("From"));
+QLabel*endDateLabel= new QLabel(tr("To"));
+startDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+endDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+DateRangeSelector*selector= qobject_cast<DateRangeSelector*> (parent);
+if(parent){
+QStringList range= selector->currentRange().toStringList();
+startDateSelector->setSelectedDate(QDate::fromString(range.first(),Qt::ISODate));
+endDateSelector->setSelectedDate(QDate::fromString(range.last(),Qt::ISODate));
+}
+connect(startDateSelector,SIGNAL(selectionChanged()),this,SLOT(validateRange()));
+connect(endDateSelector,SIGNAL(selectionChanged()),this,SLOT(validateRange()));
+
+startDateLayout->addWidget(startDateLabel);
+startDateLayout->addWidget(startDateSelector);
+endDateLayout->addWidget(endDateLabel);
+endDateLayout->addWidget(endDateSelector);
+
+connect(applyButton,SIGNAL(clicked()),this,SLOT(applyRange()));
+
+buttonLayout->addStretch();
+buttonLayout->addWidget(applyButton);
+
+calendarsLayout->addLayout(startDateLayout);
+calendarsLayout->addLayout(endDateLayout);
+outerLayout->addLayout(calendarsLayout);
+outerLayout->addLayout(buttonLayout);
+setLayout(outerLayout);
+}
+
+/*:605*//*606:*/
+#line 158 "./daterangeselector.w"
+
+void CustomDateRangePopup::hideEvent(QHideEvent*)
+{
+emit hidingPopup();
+}
+
+/*:606*//*607:*/
+#line 167 "./daterangeselector.w"
+
+void CustomDateRangePopup::applyRange()
+{
+DateRangeSelector*selector= qobject_cast<DateRangeSelector*> (parentWidget());
+if(selector)
+{
+selector->setCustomRange(QVariant(QStringList()<<
+startDateSelector->selectedDate().toString(Qt::ISODate)<<
+endDateSelector->selectedDate().toString(Qt::ISODate)));
+}
+hide();
+}
+
+/*:607*//*608:*/
+#line 184 "./daterangeselector.w"
+
+void CustomDateRangePopup::validateRange()
+{
+if(startDateSelector->selectedDate()> endDateSelector->selectedDate())
+{
+applyButton->setEnabled(false);
+}
+else
+{
+applyButton->setEnabled(true);
+}
+}
+
+/*:608*/
+#line 78 "./daterangeselector.w"
+
+/*609:*/
+#line 202 "./daterangeselector.w"
+
+DateRangeSelector::DateRangeSelector(QWidget*parent):
+QWidget(parent),quickSelector(new QComboBox(this)),
+customRangeSelector(NULL),lastIndex(0)
+{
+connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int)));
+
+QDate currentDate= QDate::currentDate();
+
+QHBoxLayout*layout= new QHBoxLayout;
+/*610:*/
+#line 231 "./daterangeselector.w"
+
+quickSelector->addItem("Yesterday",QVariant(QStringList()<<
+currentDate.addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Today",QVariant(QStringList()<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Week",QVariant(QStringList()<<
+(currentDate.dayOfWeek()%7?
+currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate):
+currentDate.toString(Qt::ISODate))<<
+currentDate.addDays(6-(currentDate.dayOfWeek()%7)).toString(Qt::ISODate)));
+quickSelector->addItem("This Week to Date",currentDate.dayOfWeek()%7?
+QVariant(QStringList()<<
+currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Week",QVariant(QStringList()<<
+currentDate.addDays(-(currentDate.dayOfWeek()%7)-7).toString(Qt::ISODate)<<
+currentDate.addDays(-(currentDate.dayOfWeek()%7)-1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 7 Days",QVariant(QStringList()<<
+currentDate.addDays(-6).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Month",QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month(),1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),currentDate.month(),
+currentDate.daysInMonth()).toString(Qt::ISODate)));
+quickSelector->addItem("This Month to Date",(currentDate.day()==1?
+(QVariant(QStringList()<<currentDate.toString(Qt::ISODate))):
+(QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month(),1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)))));
+quickSelector->addItem("Last Four Weeks",QVariant(QStringList()<<
+currentDate.addDays(-27).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last 30 Days",QVariant(QStringList()<<
+currentDate.addDays(-29).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Quarter",QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).toString(Qt::ISODate)<<
+(currentDate.month()> 9?
+QDate(currentDate.year(),12,31).toString(Qt::ISODate):
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3)+3,1).addDays(-1).toString(Qt::ISODate))));
+quickSelector->addItem("This Quarter to Date",
+(currentDate.day()==1&&(currentDate.month()-1)%3==0)?
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Quarter",currentDate.month()<4?
+QVariant(QStringList()<<
+QDate(currentDate.year()-1,10,1).toString(Qt::ISODate)<<
+QDate(currentDate.year()-1,12,31).toString(Qt::ISODate)):
+QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3)-3,1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 90 Days",QVariant(QStringList()<<
+currentDate.addDays(-89).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Year",QVariant(QStringList()<<
+QDate(currentDate.year(),1,1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),12,31).toString(Qt::ISODate)));
+quickSelector->addItem("This Year to Date",(currentDate.dayOfYear()==1)?
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<QDate(currentDate.year(),1,1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Year",QVariant(QStringList()<<
+QDate(currentDate.year()-1,1,1).toString(Qt::ISODate)<<
+QDate(currentDate.year()-1,12,31).toString(Qt::ISODate)));
+quickSelector->addItem("Last 365 Days",QVariant(QStringList()<<
+currentDate.addDays(-364).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("Lifetime");
+quickSelector->addItem("Custom");
+
+/*:610*/
+#line 212 "./daterangeselector.w"
+
+QToolButton*customButton= new QToolButton;
+customButton->setIcon(QIcon::fromTheme("office-calendar",
+QIcon(":/resources/icons/tango/scalable/apps/office-calendar.svg")));
+layout->addWidget(quickSelector);
+layout->addWidget(customButton);
+setLayout(layout);
+
+connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
+}
+
+/*:609*//*611:*/
+#line 314 "./daterangeselector.w"
+
+void DateRangeSelector::updateRange(int index)
+{
+if(index!=lastIndex&&index==quickSelector->count()-1)
+{
+toggleCustom();
+}
+else
+{
+lastIndex= index;
+emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
+}
+}
+
+/*:611*//*612:*/
+#line 331 "./daterangeselector.w"
+
+void DateRangeSelector::popupHidden()
+{
+customRangeSelector->deleteLater();
+customRangeSelector= NULL;
+quickSelector->setCurrentIndex(lastIndex);
+}
+
+/*:612*//*613:*/
+#line 342 "./daterangeselector.w"
+
+void DateRangeSelector::setCustomRange(QVariant range)
+{
+quickSelector->setItemData(quickSelector->count()-1,range);
+emit rangeUpdated(range);
+lastIndex= quickSelector->count()-1;
+quickSelector->setCurrentIndex(lastIndex);
+}
+
+/*:613*//*614:*/
+#line 357 "./daterangeselector.w"
+
+void DateRangeSelector::toggleCustom()
+{
+if(!customRangeSelector){
+customRangeSelector= new CustomDateRangePopup(this);
+QPoint pos= rect().bottomLeft();
+QPoint pos2= rect().topLeft();
+pos= mapToGlobal(pos);
+pos2= mapToGlobal(pos2);
+QSize size= customRangeSelector->sizeHint();
+QRect screen= QApplication::desktop()->availableGeometry(pos);
+if(pos.x()+size.width()> screen.right()){
+pos.setX(screen.right()-size.width());
+}
+pos.setX(qMax(pos.x(),screen.left()));
+if(pos.y()+size.height()> screen.bottom()){
+pos.setY(pos2.y()-size.height());
+}else if(pos.y()<screen.top()){
+pos.setY(screen.top());
+}
+if(pos.y()<screen.top()){
+pos.setY(screen.top());
+}
+if(pos.y()+size.height()> screen.bottom()){
+pos.setY(screen.bottom()-size.height());
+}
+customRangeSelector->move(pos);
+customRangeSelector->show();
+connect(customRangeSelector,SIGNAL(hidingPopup()),
+this,SLOT(popupHidden()));
+}
+else
+{
+customRangeSelector->close();
+customRangeSelector->deleteLater();
+customRangeSelector= NULL;
+}
+}
+
+/*:614*//*615:*/
+#line 399 "./daterangeselector.w"
+
+QVariant DateRangeSelector::currentRange()
+{
+return quickSelector->itemData(lastIndex);
+}
+
+/*:615*//*616:*/
+#line 407 "./daterangeselector.w"
+
+void DateRangeSelector::setCurrentIndex(int index)
+{
+quickSelector->setCurrentIndex(index);
+}
+
+/*:616*//*617:*/
+#line 422 "./daterangeselector.w"
+
+void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
+{
+quickSelector->setItemData(quickSelector->count()-2,
+QVariant(QStringList()<<startDate<<endDate));
+}
+
+/*:617*//*618:*/
+#line 432 "./daterangeselector.w"
+
+void DateRangeSelector::removeIndex(int index)
+{
+quickSelector->removeItem(index);
+}
+
+/*:618*/
+#line 79 "./daterangeselector.w"
+
+
+#include "moc_daterangeselector.cpp"
+
+/*:603*/

src/daterangeselector.h

@@ -0,0 +1,37 @@
+/*602:*/
+#line 30 "./daterangeselector.w"
+
+
+#include <QComboBox> 
+
+#ifndef TypicaDateRangeSelectorHeader
+#define TypicaDateRangeSelectorHeader
+
+class CustomDateRangePopup;
+
+class DateRangeSelector:public QWidget
+{
+Q_OBJECT
+public:
+DateRangeSelector(QWidget*parent= NULL);
+void setCustomRange(QVariant range);
+Q_INVOKABLE QVariant currentRange();
+public slots:
+void setCurrentIndex(int index);
+void setLifetimeRange(QString startDate,QString endDate);
+void removeIndex(int index);
+signals:
+void rangeUpdated(QVariant);
+private slots:
+void toggleCustom();
+void popupHidden();
+void updateRange(int index);
+private:
+QComboBox*quickSelector;
+CustomDateRangePopup*customRangeSelector;
+int lastIndex;
+};
+
+#endif
+
+/*:602*/

src/daterangeselector.w

@@ -0,0 +1,478 @@
+@** A Widget for Selecting Date Ranges.
+
+\noindent Many of the reports in Typica operate over a range of dates. In these
+cases it should generally be possible to set that range to any arbitrary start
+or end, however there are some ranges that are commonly useful where it may be
+convenient to provide easy access to that range. While Qt provides a widget
+for selecting a single date, it does not provide a widget that allows two dates
+to be conveniently selected. One approach which Typica has previously taken is
+to simply use two |QDateEdit| widgets. This works, however validation that the
+range is valid must then be performed in every report that uses such an
+approach. Another down side to this is that changing either side of the date
+range is either going to result in a database query to obtain results in the
+new range or another button must be introduced to make setting a new range
+explicit. One typically wants to adjust both sides of the range at the same
+time and only have one trip to the database for the new data and increasing the
+number of controls required for each filter quickly creates a mess.
+
+The solution to this is the introduction of a new composite widget for
+selecting date ranges. The main widget consists of two parts. First there is a
+|QComboBox| which contains many common date ranges. A |QToolButton| is also
+provided for convenient one click access to the Custom range. Whether selected
+from the |QComboBox| or the |QToolButton|, selecting Custom creates a new pop
+up widget containing two |QCalendarWidget|s and a button to explicitly set the
+range. This button will not be available unless the selected ending date is not
+before the selected starting date.
+
+As the common use for the selected date is database operations, convenient
+access to the ISO 8601 string representation of these dates is provided.
+
+@(daterangeselector.h@>=
+
+#include <QComboBox>
+
+#ifndef TypicaDateRangeSelectorHeader
+#define TypicaDateRangeSelectorHeader
+
+class CustomDateRangePopup;
+
+class DateRangeSelector : public QWidget
+{
+	@[Q_OBJECT@]@;
+	public:@/
+		DateRangeSelector(QWidget *parent = NULL);
+		void setCustomRange(QVariant range);
+		Q_INVOKABLE QVariant currentRange();@/
+	@[public slots@]:@/
+		void setCurrentIndex(int index);
+		void setLifetimeRange(QString startDate, QString endDate);
+		void removeIndex(int index);@/
+	@[signals@]:@/
+		void rangeUpdated(QVariant);
+	@[private slots@]:@/
+		void toggleCustom();
+		void popupHidden();
+		void updateRange(int index);@/
+	private:@/
+		QComboBox *quickSelector;
+		CustomDateRangePopup *customRangeSelector;
+		int lastIndex;
+};
+
+#endif
+
+@ Implementation details are in a different file.
+
+@(daterangeselector.cpp@>=
+#include <QCalendarWidget>
+#include <QPushButton>
+#include <QBoxLayout>
+#include <QLabel>
+#include <QToolButton>
+#include <QApplication>
+#include <QDesktopWidget>
+
+#include "daterangeselector.h"
+
+@<CustomDateRangePopup declaration@>
+@<CustomDateRangePopup implementation@>
+@<DateRangeSelector implementation@>
+
+#include "moc_daterangeselector.cpp"
+
+@ The custom range pop up is represented as a separate class which is not to be
+instantiated except by |DateRangeSelector|.
+
+@<CustomDateRangePopup declaration@>=
+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;
+};
+
+@ The pop up constructor is responsible for laying out the component widgets,
+setting the dates selected in each calendar to match the currently selected
+range, and connecting the appropriate signal handlers.
+
+@<CustomDateRangePopup implementation@>=
+CustomDateRangePopup::CustomDateRangePopup(QWidget *parent) :
+	QWidget(parent, Qt::Popup), startDateSelector(new QCalendarWidget),
+	endDateSelector(new QCalendarWidget), applyButton(new QPushButton(tr("Apply")))
+{
+	setAttribute(Qt::WA_WindowPropagation);
+
+	QVBoxLayout *outerLayout = new QVBoxLayout;
+	QHBoxLayout *calendarsLayout = new QHBoxLayout;
+	QVBoxLayout *startDateLayout = new QVBoxLayout;
+	QVBoxLayout *endDateLayout = new QVBoxLayout;
+	QHBoxLayout *buttonLayout = new QHBoxLayout;
+	QLabel *startDateLabel = new QLabel(tr("From"));
+	QLabel *endDateLabel = new QLabel(tr("To"));
+	startDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+	endDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+	DateRangeSelector *selector = qobject_cast<DateRangeSelector *>(parent);
+	if(parent) {
+		QStringList range = selector->currentRange().toStringList();
+		startDateSelector->setSelectedDate(QDate::fromString(range.first(), Qt::ISODate));
+		endDateSelector->setSelectedDate(QDate::fromString(range.last(), Qt::ISODate));
+	}
+	connect(startDateSelector, SIGNAL(selectionChanged()), this, SLOT(validateRange()));
+	connect(endDateSelector, SIGNAL(selectionChanged()), this, SLOT(validateRange()));
+
+	startDateLayout->addWidget(startDateLabel);
+	startDateLayout->addWidget(startDateSelector);
+	endDateLayout->addWidget(endDateLabel);
+	endDateLayout->addWidget(endDateSelector);
+
+	connect(applyButton, SIGNAL(clicked()), this, SLOT(applyRange()));
+
+	buttonLayout->addStretch();
+	buttonLayout->addWidget(applyButton);
+
+	calendarsLayout->addLayout(startDateLayout);
+	calendarsLayout->addLayout(endDateLayout);
+	outerLayout->addLayout(calendarsLayout);
+	outerLayout->addLayout(buttonLayout);
+	setLayout(outerLayout);
+}
+
+@ The pop up can be hidden in two ways. Clicking anywhere outside of the widget
+will hide the pop up. Clicking the Apply button will also hide the pop up. In
+the former case, we must inform the parent widget that it is fine to destroy
+the pop up widget, which we do by emitting a signal. Note that clicking outside
+of the widget will cause the |QHideEvent| to be posted automatically.
+
+@<CustomDateRangePopup implementation@>=
+void CustomDateRangePopup::hideEvent(QHideEvent *)
+{
+	emit hidingPopup();
+}
+
+@ Clicking the Apply button requires setting the Custom date range to the
+currently selected range and then hiding the pop up manually.
+
+@<CustomDateRangePopup implementation@>=
+void CustomDateRangePopup::applyRange()
+{
+	DateRangeSelector *selector = qobject_cast<DateRangeSelector *>(parentWidget());
+	if(selector)
+	{
+		selector->setCustomRange(QVariant(QStringList() <<
+			startDateSelector->selectedDate().toString(Qt::ISODate) <<
+			endDateSelector->selectedDate().toString(Qt::ISODate)));
+	}
+	hide();
+}
+
+@ The Apply button is enabled or disabled depending on if the currently
+selected dates form a valid range in which the end date does not occur before
+the start date.
+
+@<CustomDateRangePopup implementation@>=
+void CustomDateRangePopup::validateRange()
+{
+	if(startDateSelector->selectedDate() > endDateSelector->selectedDate())
+	{
+		applyButton->setEnabled(false);
+	}
+	else
+	{
+		applyButton->setEnabled(true);
+	}
+}
+
+@ The |DateRangeSelector| constructor is responsible for setting up the layout
+of the |QComboBox| and the |QToolButton|, adding appropriate items to the
+|QComboBox|, and connecting the signals required to handle the pop up
+correctly.
+
+@<DateRangeSelector implementation@>=
+DateRangeSelector::DateRangeSelector(QWidget *parent) :
+	QWidget(parent), quickSelector(new QComboBox(this)),
+	customRangeSelector(NULL), lastIndex(0)
+{
+	connect(quickSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(updateRange(int)));
+
+	QDate currentDate = QDate::currentDate();
+
+	QHBoxLayout *layout = new QHBoxLayout;
+	@<Set common date ranges to quick selector@>@;
+	QToolButton *customButton = new QToolButton;
+	customButton->setIcon(QIcon::fromTheme("office-calendar",
+		QIcon(":/resources/icons/tango/scalable/apps/office-calendar.svg")));
+	layout->addWidget(quickSelector);
+	layout->addWidget(customButton);
+	setLayout(layout);
+
+	connect(customButton, SIGNAL(clicked()), this, SLOT(toggleCustom()));
+}
+
+@ The |QComboBox| provides a mechanism for associating additional data with an
+item. Several possible representations were considered, but what was ultimately
+selected was a |QVariant| containing a |QStringList| in which the first entry
+in the list is the starting date of the range and the last entry in the list is
+the ending date of the range. Note that the list may contain only one item in
+cases where the range only covers a single date, however one should not assume
+that a range covering a single date will only have a single list entry.
+
+@<Set common date ranges to quick selector@>=
+quickSelector->addItem("Yesterday", QVariant(QStringList() <<
+	currentDate.addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Today", QVariant(QStringList() <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Week", QVariant(QStringList() <<
+	(currentDate.dayOfWeek() % 7 ?
+		currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate) :
+		currentDate.toString(Qt::ISODate)) <<
+			currentDate.addDays(6 - (currentDate.dayOfWeek() % 7)).toString(Qt::ISODate)));
+quickSelector->addItem("This Week to Date", currentDate.dayOfWeek() % 7 ?
+	QVariant(QStringList() <<
+	currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)) :
+	QVariant(QStringList() << currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Week", QVariant(QStringList() <<
+	currentDate.addDays(-(currentDate.dayOfWeek() % 7) - 7).toString(Qt::ISODate) <<
+	currentDate.addDays(-(currentDate.dayOfWeek() % 7) - 1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 7 Days", QVariant(QStringList() <<
+	currentDate.addDays(-6).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Month", QVariant(QStringList() <<
+	QDate(currentDate.year(), currentDate.month(), 1).toString(Qt::ISODate) <<
+	QDate(currentDate.year(), currentDate.month(),
+		currentDate.daysInMonth()).toString(Qt::ISODate)));
+quickSelector->addItem("This Month to Date", (currentDate.day() == 1 ?
+	(QVariant(QStringList() << currentDate.toString(Qt::ISODate))) :
+	(QVariant(QStringList() <<
+	QDate(currentDate.year(), currentDate.month(), 1).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)))));
+quickSelector->addItem("Last Four Weeks", QVariant(QStringList() <<
+	currentDate.addDays(-27).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last 30 Days", QVariant(QStringList() <<
+	currentDate.addDays(-29).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Quarter", QVariant(QStringList() <<
+	QDate(currentDate.year(), currentDate.month() - ((currentDate.month() - 1) % 3), 1).toString(Qt::ISODate) <<
+	(currentDate.month() > 9 ?
+		QDate(currentDate.year(), 12, 31).toString(Qt::ISODate) :
+		QDate(currentDate.year(), currentDate.month() - ((currentDate.month() - 1) % 3) + 3, 1).addDays(-1).toString(Qt::ISODate))));
+quickSelector->addItem("This Quarter to Date",
+	(currentDate.day() == 1 && (currentDate.month() - 1) % 3 == 0) ?
+		QVariant(QStringList() << currentDate.toString(Qt::ISODate)) :
+		QVariant(QStringList() <<
+		QDate(currentDate.year(), currentDate.month() - ((currentDate.month() - 1) % 3), 1).toString(Qt::ISODate) <<
+		currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Quarter", currentDate.month() < 4 ?
+	QVariant(QStringList() <<
+		QDate(currentDate.year() - 1, 10, 1).toString(Qt::ISODate) <<
+		QDate(currentDate.year() - 1, 12, 31).toString(Qt::ISODate)) :
+	QVariant(QStringList() <<
+		QDate(currentDate.year(), currentDate.month() - ((currentDate.month() - 1) % 3) - 3, 1).toString(Qt::ISODate) <<
+		QDate(currentDate.year(), currentDate.month() - ((currentDate.month() - 1) % 3), 1).addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 90 Days", QVariant(QStringList() <<
+	currentDate.addDays(-89).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Year", QVariant(QStringList() <<
+	QDate(currentDate.year(), 1, 1).toString(Qt::ISODate) <<
+	QDate(currentDate.year(), 12, 31).toString(Qt::ISODate)));
+quickSelector->addItem("This Year to Date", (currentDate.dayOfYear() == 1) ?
+	QVariant(QStringList() << currentDate.toString(Qt::ISODate)) :
+	QVariant(QStringList() << QDate(currentDate.year(), 1, 1).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Year", QVariant(QStringList() <<
+	QDate(currentDate.year() - 1, 1, 1).toString(Qt::ISODate) <<
+	QDate(currentDate.year() - 1, 12, 31).toString(Qt::ISODate)));
+quickSelector->addItem("Last 365 Days", QVariant(QStringList() <<
+	currentDate.addDays(-364).toString(Qt::ISODate) <<
+	currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("Lifetime");
+quickSelector->addItem("Custom");
+
+@ Special handling of the Custom range is required because it is possible to
+select this from the |QComboBox| and then not set a range. This should result
+in the selection changing back to the most recent valid selection. Creating the
+pop up in this way is handled in |updateRange()|.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::updateRange(int index)
+{
+	if(index != lastIndex && index == quickSelector->count() - 1)
+	{
+		toggleCustom();
+	}
+	else
+	{
+		lastIndex = index;
+		emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
+	}
+}
+
+@ Resetting the range to the most recent valid selection is handled in
+|popupHidden()|.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::popupHidden()
+{
+	customRangeSelector->deleteLater();
+	customRangeSelector = NULL;
+	quickSelector->setCurrentIndex(lastIndex);
+}
+
+@ If Custom is set to a new valid range, |lastIndex| will have been set to
+point to the appropriate item by a call to |setCustomRange()|.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::setCustomRange(QVariant range)
+{
+	quickSelector->setItemData(quickSelector->count() - 1, range);
+	emit rangeUpdated(range);
+	lastIndex = quickSelector->count() - 1;
+	quickSelector->setCurrentIndex(lastIndex);
+}
+
+@ When creating the pop up, it should ideally be placed such that the left of
+the pop up is aligned with the left of the widget that is normally shown and
+immediately under it, however if this would result in part of the pop up not
+fitting on the same screen, it should be moved to make a best effort at full
+visibility.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::toggleCustom()
+{
+	if(!customRangeSelector) {
+		customRangeSelector = new CustomDateRangePopup(this);
+		QPoint pos = rect().bottomLeft();
+		QPoint pos2 = rect().topLeft();
+		pos = mapToGlobal(pos);
+		pos2 = mapToGlobal(pos2);
+		QSize size = customRangeSelector->sizeHint();
+		QRect screen = QApplication::desktop()->availableGeometry(pos);
+		if(pos.x()+size.width() > screen.right()) {
+			pos.setX(screen.right()-size.width());
+		}
+		pos.setX(qMax(pos.x(), screen.left()));
+		if(pos.y() + size.height() > screen.bottom()) {
+			pos.setY(pos2.y() - size.height());
+		} else if (pos.y() < screen.top()){
+			pos.setY(screen.top());
+		}
+		if(pos.y() < screen.top()) {
+			pos.setY(screen.top());
+		}
+		if(pos.y()+size.height() > screen.bottom()) {
+			pos.setY(screen.bottom()-size.height());
+		}
+		customRangeSelector->move(pos);
+		customRangeSelector->show();
+		connect(customRangeSelector, SIGNAL(hidingPopup()),
+				this, SLOT(popupHidden()));
+    }
+	else
+	{
+		customRangeSelector->close();
+		customRangeSelector->deleteLater();
+		customRangeSelector = NULL;
+	}
+}
+
+@ While a signal is emitted when the selected range changes, it is frequently
+convenient to have a way to request the currently selected range at any time.
+
+@<DateRangeSelector implementation@>=
+QVariant DateRangeSelector::currentRange()
+{
+	return quickSelector->itemData(lastIndex);
+}
+
+@ Similarly, a method is provided to set the current index of the combo box.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::setCurrentIndex(int index)
+{
+	quickSelector->setCurrentIndex(index);
+}
+
+@ The Lifetime range is handled somewhat differently from other ranges as there
+is no general way to know what that range should be without making unsafe
+assumptions. As such, reports are expected to remove the option, provide a
+sensible range for it, or handle this selection in a special case. The expected
+source of the lifetime date range is the result of a database query so a method
+is provided that accepts string representations of the dates. Note that this
+method must not be called if the Lifetime option is no longer the second to
+last option in the combo box.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::setLifetimeRange(QString startDate, QString endDate)
+{
+	quickSelector->setItemData(quickSelector->count() - 2,
+		QVariant(QStringList() << startDate << endDate));
+}
+
+@ The |removeIndex()| method is intended for removing the Lifetime option in
+cases where this is not supported. Use of this method is strongly discouraged.
+
+@<DateRangeSelector implementation@>=
+void DateRangeSelector::removeIndex(int index)
+{
+	quickSelector->removeItem(index);
+}
+
+@ To use this new control in Typica, we should provide a way to create it from
+the XML description of a window.
+
+@<Additional box layout elements@>=
+else if(currentElement.tagName() == "daterange")
+{
+	addDateRangeToLayout(currentElement, widgetStack, layoutStack);
+}
+
+@ The method for adding a date range selector to a layout is currently trivial.
+The |"id"| attribute is supported as usual, as is an |"initial"| attribute for
+setting the combo box index.
+
+@<Functions for scripting@>=
+void addDateRangeToLayout(QDomElement element, QStack<QWidget *> *,@|
+                          QStack<QLayout *> *layoutStack)
+{
+	DateRangeSelector *widget = new DateRangeSelector;
+	if(element.hasAttribute("id"))
+	{
+		widget->setObjectName(element.attribute("id"));
+	}
+	if(element.hasAttribute("initial"))
+	{
+		widget->setCurrentIndex(element.attribute("initial").toInt());
+	}
+	QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
+	layout->addWidget(widget);
+}
+
+@ The prototype needs to be specified.
+
+@<Function prototypes for scripting@>=
+void addDateRangeToLayout(QDomElement element,
+                          QStack<QWidget *> *widgetStack,
+                          QStack<QLayout *> *layoutStack);
+
+@ Our header is also required.
+
+@<Header files to include@>=
+#include "daterangeselector.h"

src/draglabel.cpp

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

src/draglabel.h

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

src/rate.w

@@ -29,7 +29,6 @@ class RateOfChange : public QObject
 		int ct;
 		int st;
 		QList<Measurement> cache;
-		QMap<double,double> smoothCache;
 };
 
 @ The interesting part of this class is in the |newMeasurement()| method. This
@@ -88,51 +87,33 @@ if(cache.size() > 2)
 	}
 }
 
-@ The calculation method here is subject to change as this is still noisier
-than I would like. What we are doing here is calculating the rate of change
-between each pair of adjacent measurements in the cache and averaging them to
-produce something that is a little less noisy than just using the first and
-last measurements in the cache. Other techniques may be useful for reducing the
-noise further.
+@ Rather than work directly with changes from one measurement to the next and
+attempting to filter out the noise, we instead calculate the slope of a simple
+linear regression on the current window of data.
 
 The measurement will carry the fact that it is a relative measurement.
 
 @<Calculate rate of change@>=
-QList<double> rates;
-for(int i = 1; i < cache.size(); i++)
+int N = cache.size();
+double SXY = 0;
+double SX = 0;
+double SXX = 0;
+double SY = 0;
+double y;
+double x;
+for(int i = 0; i < N; i++)
 {
-	double mdiff = cache.at(i).temperature() - cache.at(i-1).temperature();
-	double tdiff = (double)(cache.at(i-1).time().msecsTo(cache.at(i).time())) / 1000.0;
-	rates.append(mdiff/tdiff);
+	y = cache.at(i).temperature();
+	SY += y;
+	x = cache.at(0).time().msecsTo(cache.at(i).time()) / 1000.0;
+	SX += x;
+	SXX += (x*x);
+	SXY += (x*y);
 }
-double acc = 0.0;
-for(int i = 0; i < rates.size(); i++)
-{
-	acc += rates.at(i);
-}
-double pavg = acc /= rates.size();
-double v2 = pavg * st;
-double refm = cache.back().temperature() - cache.front().temperature();
-double reft = (double)(cache.front().time().msecsTo(cache.back().time())) / 1000.0;
-double ref = refm/reft;
-Measurement value(v2, cache.back().time(), cache.back().scale());
+double M = ((N * SXY) - (SX * SY)) / ((N * SXX) - (SX * SX));
+Measurement value(M * st, cache.back().time(), cache.back().scale());
 value.insert("relative", true);
 emit newData(value);
-double calcdiff = ref - pavg;
-if(calcdiff < 0)
-{
-	calcdiff = -calcdiff;
-}
-if(pavg < 0)
-{
-	pavg = -pavg;
-}
-if(calcdiff > (pavg * 0.2))
-{
-	Measurement save = cache.back();
-	cache.clear();
-	cache.append(save);
-}
 
 @ The rest of the class implementation is trivial.
 

src/resources.qrc

@@ -23,5 +23,9 @@
         <file>resources/icons/tango/22x22/categories/applications-graphics.png</file>
         <file>resources/icons/tango/32x32/categories/applications-graphics.png</file>
         <file>resources/icons/tango/scalable/categories/applications-graphics.svg</file>
+        <file>resources/icons/tango/16x16/apps/office-calendar.png</file>
+        <file>resources/icons/tango/22x22/apps/office-calendar.png</file>
+        <file>resources/icons/tango/32x32/apps/office-calendar.png</file>
+        <file>resources/icons/tango/scalable/apps/office-calendar.svg</file>
     </qresource>
 </RCC>

src/resources/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Typica 1.6.1</string>
+	<string>Typica 1.6.2</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.1</string>
+	<string>1.6.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.6.1</string>
+	<string>1.6.2</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© 2007–2013 Neal Wilson</string>
+	<string>© 2007–2014 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.1</h2>
+					<h2>Version 1.6.2</h2>
 				</div>
 			<div id="maintext">
-				<p>Copyright &copy; 2007&ndash;2013 Neal Evan Wilson
+				<p>Copyright &copy; 2007&ndash;2014 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>
@@ -26,7 +26,6 @@
 				<p>Ongoing development of Typica is made possible through the
 				generous financial contributions from the following:</p>
 
-				<p>Pinnacle Coffee Roasting</p>
 				<p>Anonymous Funders Through
 				<a href="https://www.gittip.com/N3Roaster/">Gittip</a></p>
 

src/scale.cpp

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

src/scale.h

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

src/typica.rc

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

src/typica.w

@@ -22,8 +22,8 @@
 \mark{\noexpand\nullsec0{A Note on Notation}}
 \def\pn{Typica}
 \def\filebase{typica}
-\def\version{1.6.1 \number\year-\number\month-\number\day}
-\def\years{2007--2013}
+\def\version{1.6.2 \number\year-\number\month-\number\day}
+\def\years{2007--2014}
 \def\title{\pn{} (Version \version)}
 \newskip\dangerskipb
 \newskip\dangerskip
@@ -4263,6 +4263,7 @@ void populateBoxLayout(QDomElement element, QStack<QWidget *> *widgetStack,
 				QBoxLayout *layout = qobject_cast<QBoxLayout *>(layoutStack->top());
 				layout->addStretch();
 			}
+			@<Additional box layout elements@>@;
 		}
 	}
 }
@@ -13268,6 +13269,8 @@ void setQTextEditProperties(QScriptValue value, QScriptEngine *engine)
 	value.setProperty("print", engine->newFunction(QTextEdit_print));
 }
 
+@i daterangeselector.w
+
 @** An area for repeated user interface elements.
 
 \noindent There are multiple use cases in which it is useful to specify a

src/units.w

@@ -386,7 +386,7 @@ engine->globalObject().setProperty("Units", value);
 @ The implementation of these functions is trivial.
 
 @<Functions for scripting@>=
-QScriptValue Units_convertTemperature(QScriptContext *context, QScriptEngine *engine)
+QScriptValue Units_convertTemperature(QScriptContext *context, QScriptEngine *)
 {
 	return QScriptValue(Units::convertTemperature(argument<double>(0, context),
 	                                              argument<Units::Unit>(1, context),
@@ -394,7 +394,7 @@ QScriptValue Units_convertTemperature(QScriptContext *context, QScriptEngine *en
 }
 
 QScriptValue Units_convertRelativeTemperature(QScriptContext *context,
-                                              QScriptEngine *engine)
+                                              QScriptEngine *)
 {
 	return QScriptValue(Units::convertRelativeTemperature(
 	                         argument<double>(0, context),
@@ -402,19 +402,19 @@ QScriptValue Units_convertRelativeTemperature(QScriptContext *context,
 	                         argument<Units::Unit>(2, context)));
 }
 
-QScriptValue Units_isTemperatureUnit(QScriptContext *context, QScriptEngine *engine)
+QScriptValue Units_isTemperatureUnit(QScriptContext *context, QScriptEngine *)
 {
 	return QScriptValue(Units::isTemperatureUnit(argument<Units::Unit>(0, context)));
 }
 
-QScriptValue Units_convertWeight(QScriptContext *context, QScriptEngine *engine)
+QScriptValue Units_convertWeight(QScriptContext *context, QScriptEngine *)
 {
 	return QScriptValue(Units::convertWeight(argument<double>(0, context),
 	                                         argument<Units::Unit>(1, context),
 	                                         argument<Units::Unit>(2, context)));
 }
 
-QScriptValue Units_isWeightUnit(QScriptContext *context, QScriptEngine *engine)
+QScriptValue Units_isWeightUnit(QScriptContext *context, QScriptEngine *)
 {
 	return QScriptValue(Units::isWeightUnit(argument<Units::Unit>(0, context)));
 }

src/valueannotation.w

@@ -276,7 +276,7 @@ engine->globalObject().setProperty("ValueAnnotation", value);
 @ The implementation of the functions also proceeds as usual.
 
 @<Functions for scripting@>=
-QScriptValue constructValueAnnotation(QScriptContext *context, QScriptEngine *engine)
+QScriptValue constructValueAnnotation(QScriptContext *, QScriptEngine *engine)
 {
 	QScriptValue object = engine->newQObject(new ValueAnnotation);
 	setValueAnnotationProperties(object, engine);