WIP: Manual Log Entry

config/Windows/manuallogentry.xml

@@ -4,6 +4,17 @@
 		<separator />
 		<item id="quitItem" shortcut="ctrl+Q">Quit</item>
 	</menu>
+	<menu name="Log">
+        <item id="clear" shortcut="Ctrl+L">Clear Log</item>
+        <separator />
+        <item id="ms">Millisecond View</item>
+        <item id="1s">1 Second View</item>
+        <item id="5s">5 Second View</item>
+        <item id="10s">10 Second View</item>
+        <item id="15s">15 Second View</item>
+        <item id="30s">30 Second View</item>
+        <item id="1m">1 Minute View</item>
+    </menu>
 	<layout type="vertical">
 		<tabbar id="tabs"/>
 		<layout type="stack" id="pages">
@@ -27,7 +38,7 @@
 									</row>
 									<row>
 										<column><label>Weight:</label></column>
-										<column><line id="sampleGreenWeight" /></column>
+										<column><line id="sampleGreenWeight" validator="numeric">0.0</line></column>
 										<column><sqldrop id="sampleGreenUnit" /></column>
 									</row>
 									<row>
@@ -36,7 +47,7 @@
 									</row>
 									<row>
 										<column><label>Arrival Date:</label></column>
-										<column><line id="sampleGreenArrivalDate" /></column>
+										<column><calendar id="sampleGreenArrivalDate" /></column>
 									</row>
 								</layout>
 								<label>Additional Details:</label>
@@ -75,7 +86,7 @@
 						</row>
 						<row>
 							<column><label>Weight:</label></column>
-							<column><line id="roastedWeight" validator="numeric" /></column>
+							<column><line id="roastedWeight" validator="numeric">0.0</line></column>
 						</row>
 						<row>
 							<column><label>Time:</label></column>
@@ -94,15 +105,25 @@
 			</page>
 			<page>
 				<layout type="vertical">
+					<layout type="horizontal">
+						<label>Time Increment (s):</label>
+						<line id="timeincrement" validator="numeric">30</line>
+						<stretch />
+						<label>Time:</label>
+						<timeedit id="currenttime" />
+						<stretch />
+						<label>Temperature:</label>
+						<line id="currenttemperature" validator="numeric" />
+						<label>Note:</label>
+						<line id="currentnote" />
+						<button name="Add Measurement" id="addmeasurement" type="push" />
+					</layout>
 					<splitter type="horizontal" id="roastdatasplit">
 						<measurementtable id="log" />
 						<graph id="graph" />
 					</splitter>
 				</layout>
 			</page>
-			<page>
-				
-			</page>
 		</layout>
 		<layout type="horizontal">
 			<stretch />
@@ -113,12 +134,21 @@
 	<![CDATA[
 		var window = this;
 		this.windowTitle = "Typica - Manual Log Entry";
+		window.windowReady.connect(function() {
+			if(machineModel.rowCount() == 0) {
+				displayError(TTR("manualLogEntry", "Configuration Required"),
+				TTR("manualLogEntry", "Please configure a roaster."));
+				window.close();
+			}
+		});
 		quitItem = findChildObject(this, 'quitItem');
 		quitItem.triggered.connect(function() {
 			Application.quit();
 		});
 		pluginContext = {};
 		pluginContext.table = findChildObject(this, 'log');
+		pluginContext.table.setHeaderData(1, "Temp");
+		pluginContext.table.setHeaderData(2, "Note");
 		pluginContext.graph = findChildObject(this, 'graph');
 		pluginContext.preRun = function() {
 			var filename = QFileDialog.getOpenFileName(window, TTR("manualLogEntry", "Import"), QSettings.value('script/lastDir', '') + '/');
@@ -145,7 +175,6 @@
 		tabs = findChildObject(this, 'tabs');
 		tabs.addTab("Batch Data");
 		tabs.addTab("Roast Data");
-		tabs.addTab("Roast Data Configuration");
 		pages = findChildObject(this, 'pages');
 		tabs.currentChanged.connect(function(index) {
 			pages.setCurrentIndex(index);
@@ -188,6 +217,117 @@
 			QSettings.setValue("script/manual_unit", greenUnitIndex);
 			sampleGreenUnit.setCurrentIndex(greenUnitIndex);
 		});
+		timeincrement = findChildObject(this, 'timeincrement');
+		currenttime = findChildObject(this, 'currenttime');
+		currenttemperature = findChildObject(this, 'currenttemperature');
+		currentnote = findChildObject(this, 'currentnote');
+		addmeasurement = findChildObject(this, 'addmeasurement');
+		addmeasurement.clicked.connect(function() {
+			pluginContext.newMeasurement(new Measurement(Number(currenttemperature.text), currenttime.time), 1);
+			if(currentnote.text.length > 0) {
+				pluginContext.table.newAnnotation(currentnote.text, 1, 2);
+			}
+			currentnote.text = "";
+			var t = QTime();
+			t = t.fromString(currenttime.time, "hh:mm:ss");
+			t = t.addSecs(30);
+			currenttime.time = t;
+			currenttemperature.text = "";
+		});
+		currenttemperature.returnPressed.connect(addmeasurement.clicked);
+		currentnote.returnPressed.connect(addmeasurement.clicked);
+		var v1 = findChildObject(this, 'ms');
+        v1.triggered.connect(pluginContext.table.LOD_ms);
+        var v2 = findChildObject(this, '1s');
+        v2.triggered.connect(pluginContext.table.LOD_1s);
+        var v3 = findChildObject(this, '5s');
+        v3.triggered.connect(pluginContext.table.LOD_5s);
+        var v4 = findChildObject(this, '10s');
+        v4.triggered.connect(pluginContext.table.LOD_10s);
+        var v5 = findChildObject(this, '15s');
+        v5.triggered.connect(pluginContext.table.LOD_15s);
+        var v6 = findChildObject(this, '30s');
+        v6.triggered.connect(pluginContext.table.LOD_30s);
+        var v7 = findChildObject(this, '1m');
+        v7.triggered.connect(pluginContext.table.LOD_1m);
+		var clear = findChildObject(this, 'clear');
+        clear.triggered.connect(pluginContext.table.clear);
+        clear.triggered.connect(pluginContext.graph.clear);
+		clear.triggered.connect(function() {
+			currenttime.time = QTime(0, 0, 0, 0);
+			currenttemperature.text = "";
+			currentnote.text = "";
+		});
+		var sampleGreenName = findChildObject(this, 'sampleGreenName');
+		var sampleGreenWeight = findChildObject(this, 'sampleGreenWeight');
+		var productionGreenTable = findChildObject(this, 'productionGreenTable');
+		var greenModel = productionGreenTable.model();
+		var greenTotal = 0.0;
+		var updateGreenTable = function() {
+			var deleteRow = -1;
+			while((deleteRow = productionGreenTable.findData("delete", 0)) > -1) {
+				if(productionGreenTable.data(deleteRow, 0, 0) == "Delete") {
+					productionGreenTable.removeRow(productionGreenTable.findData("delete", 0));
+				} else {
+					break;
+				}
+			}
+			greenTotal = productionGreenTable.columnSum(1, 0);
+			productionGreenTable.resizeColumnToContents(0);
+		};
+		greenModel.dataChanged.connect(updateGreenTable);
+		var validateInputs = function() {
+			if(batchType.currentIndex == 0) {
+				/* Sample batch */
+				if(sampleGreenName.text.length == 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Please enter a green coffee name."));
+					return false;
+				}
+				if(Number(sampleGreenWeight.text) <= 0 || isNaN(sampleGreenWeight.text)) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Green coffee weight must be a number greater than 0."));
+					return false;
+				}
+			} else {
+				/* Production batch */
+				var itemArray = productionGreenTable.columnArray(0, 32).split("\\s*,\\s*");
+				var weightArray = productionGreenTable.columnArray(1, 0).split("\\s*,\\s*");
+				if((itemArray.length != weightArray.length) || (itemArray.length == 0)) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "Data Entry Error"),
+					TTR("manualLogEntry", "Please check that at least one green coffee has been selected and each green coffee has a valid weight"));
+					return false;
+				}
+				if(Number(greenTotal) <= 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "DataEntryError"),
+					TTR("manualLogEntry", "Total green coffee weight must be a number greater than 0."));
+					return false;
+				}
+				if(roastedItem.currentIndex == 0) {
+					tabs.setCurrentIndex(0);
+					displayError(TTR("manualLogEntry", "DataEntryError"),
+					TTR("manualLogEntry", "Please select a roasted coffee item."));
+					return false;
+				}
+			}
+			return true;
+		};
+		var roastDataExists = function() {
+			return (pluginContext.table.rowCount() > 0);
+		}
+		var doSubmit = function() {
+			window.close();
+		}
+		var submit = findChildObject(this, 'submit');
+		submit.clicked.connect(function() {
+			if(validateInputs()) {
+				doSubmit();
+			}
+		});
 	]]>
 	</program>
 </window>

config/config.xml

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

src/graphsettings.w

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

src/typica.w

@@ -1039,6 +1039,15 @@ considered depreciated.
 Version 1.6 adds a new property for handling the |windowModified| property
 such that an appropriate prompt is provided to confirm or cancel close events.
 
+Version 1.8 adds a new |setupFinished()| slot which is called after the
+initial |show()| at the end of window creation. This emits a |windowReady()|
+signal. Scripts can connect to this signal to perform tasks that must happen
+after the window has fully finished opening. The initial use for this is
+validating that all required configuration has been performed for a given
+window to be useful and, if not, immediately closing that. Without this, a
+call to |close()| in the script is reversed when the function creating the
+window calls |show()|.
+
 @<Class declarations@>=
 class ScriptQMainWindow : public QMainWindow@/
 {@t\1@>@/
@@ -1052,12 +1061,14 @@ class ScriptQMainWindow : public QMainWindow@/
         void saveSizeAndPosition(const QString &key);
         void restoreSizeAndPosition(const QString &key);
         void displayStatus(const QString &message = QString());
-        void setClosePrompt(QString prompt);@/
+        void setClosePrompt(QString prompt);
+        void setupFinished();@/
+    signals:@/
+        void aboutToClose(void);
+        void windowReady(void);@/
     protected:@/
         void closeEvent(QCloseEvent *event);
         void showEvent(QShowEvent *event);@/
-    signals:@/
-        void aboutToClose(void);@/
     private:@/
         QString cprompt;@t\2@>@/
 }@t\kern-3pt@>;
@@ -1118,6 +1129,11 @@ void ScriptQMainWindow::show()
     QMainWindow::show();
 }
 
+void ScriptQMainWindow::setupFinished()
+{
+	emit windowReady();
+}
+
 @ When a close event occurs, we check the |windowModified| property to
 determine if closing the window could result in loss of data. If this is
 true, we allow the event to be cancelled. Otherwise, a signal is emitted which
@@ -4706,6 +4722,7 @@ if(element.hasChildNodes())
 }
 @<Insert help menu@>@;
 window->show();
+window->setupFinished();
 
 @ Three element types make sense as top level children of a {\tt <window>}
 element. An element representing a layout element can be used to apply that
@@ -9158,6 +9175,9 @@ space, but it is very fast and simple to code.
 Starting in version 1.4, column sizes are persisted automatically using the
 same method as described in the section on |SqlQueryView|.
 
+Starting in version 1.8, |rowCount()| is |Q_INVOKABLE|. This allows the manual
+log entry interface to easily determine if any roasting data exists to save.
+
 @<Class declarations@>=
 class MeasurementModel;@/
 class ZoomLog : public QTableView@/
@@ -9172,7 +9192,7 @@ class ZoomLog : public QTableView@/
     public:@/
         ZoomLog();
         QVariant data(int row, int column) const;
-        int rowCount();
+        @[Q_INVOKABLE@,@, int rowCount();
         bool saveXML(QIODevice *device);
         bool saveCSV(QIODevice *device);
         QString lastTime(int series);
@@ -9304,11 +9324,11 @@ annotation associated with it. The solution in this case is to synthesize
 measurements so that the |ZoomLog| thinks it gets at least one measurement
 every second.
 
-The current approach simply replicates the last measurement every second until
-the time for the most recent measurement is reached, however it would likely be
-better to interpolate values between the two most recent real measurements as
-this would match the graphic representation rather than altering it when later
-reviewing the batch.
+Prior to version 1.8 this simply replicated the last measurement every second
+until the time for the most recent measurement was reached, however this yields
+problematic results when loading saved data or attempting to use this view for
+manual data entry. The current behavior performs a linear interpolation which
+will match the graph.
 
 @<Synthesize measurements for slow hardware@>=
 if(lastMeasurement.contains(tempcolumn))
@@ -9316,14 +9336,23 @@ if(lastMeasurement.contains(tempcolumn))
     if(lastMeasurement[tempcolumn].time() < measure.time())
     {
         QList<QTime> timelist;
+        QList<double> templist;
+        QTime z = QTime(0, 0, 0, 0);
+        double ptime = (double)(z.secsTo(lastMeasurement[tempcolumn].time()));
+        double ptemp = lastMeasurement[tempcolumn].temperature();
+        double ctime = (double)(z.secsTo(measure.time()));
+        double ctemp = measure.temperature();
         for(QTime i = lastMeasurement.value(tempcolumn).time().addSecs(1); i < measure.time(); i = i.addSecs(1))
         {
             timelist.append(i);
+            double v = ((ptemp * (ctime - z.secsTo(i))) + (ctemp * (z.secsTo(i) - ptime))) / (ctime - ptime);
+            templist.append(v);
         }
         for(int i = 0; i < timelist.size(); i++)
         {
             Measurement synthesized = measure;
             synthesized.setTime(timelist[i]);
+            synthesized.setTemperature(templist[i]);
             newMeasurement(synthesized, tempcolumn);
         }
     }
@@ -15536,7 +15565,7 @@ class DeviceTreeModel : public QAbstractItemModel@/
         QModelIndex index(int row, int column,
                           const QModelIndex &parent = QModelIndex()) const;
         QModelIndex parent(const QModelIndex &child) const;
-        int rowCount(const QModelIndex &parent = QModelIndex()) const;
+        Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
         int columnCount(const QModelIndex &parent = QModelIndex()) const;
         bool setData(const QModelIndex &index, const QVariant &value,
                      int role);