Fix regression in defining new sample roast profiles

config/Windows/newsamplebatch.xml

@@ -199,10 +199,12 @@
                 if(proceed) {
                     doRoast();
                 }
-                });
-                var doRoast = function() {
+            });
+            var doRoast = function() {
 				var lc = 1;
 				currentBatchInfo = batch;
+                var targetseries = -1;
+                navigationwindow.loggingWindow.clearLog();
 				query = new QSqlQuery();
 				var q = "SELECT file FROM sample_roast_profiles WHERE profile_name = :name AND time = (SELECT max(time) FROM sample_roast_profiles WHERE profile_name = :again)";
 				query.prepare(q);
@@ -217,13 +219,10 @@
 					query.exec();
 					if(query.next())
 					{
-						var targetseries = -1;
 						var buffer = new QBuffer(query.value(0));
 						var input = new XMLInput(buffer, 1);
 						var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
 						var log = findChildObject(navigationwindow.loggingWindow, 'log');
-						log.clear();
-						graph.clear();
 						input.newTemperatureColumn.connect(function(col, text) {
 							log.setHeaderData(col, text);
 							if(text == navigationwindow.loggingWindow.targetcolumnname)
@@ -235,8 +234,7 @@
 						input.measure.connect(graph.newMeasurement);
 						input.measure.connect(log.newMeasurement);
 						input.measure.connect(function(data, series) {
-							if(series == targetseries)
-							{
+							if(series == targetseries) {
 								targetDetector.newMeasurement(data);
 							}
 						});
@@ -246,8 +244,6 @@
 							QSettings.setValue("liveColumn", c+1);
 							navigationwindow.loggingWindow.postLoadColumnSetup(c);
 						});
-						navigationwindow.loggingWindow.raise();
-						navigationwindow.loggingWindow.activateWindow();
 						log.updatesEnabled = false;
 						graph.updatesEnabled = false;
 						input.input();
@@ -256,6 +252,8 @@
 						log.newAnnotation(TTR("sampleRoastingBatch", "End"), 1, lc);
 					}
 				}
+                navigationwindow.loggingWindow.raise();
+                navigationwindow.loggingWindow.activateWindow();
 				query = query.invalidate();
 				var t = TTR("sampleRoastingBatch", "Typica - Sample Roasting: [*]") + name.text;
 				if(profileName.currentText != '')

config/Windows/productionroaster.xml

@@ -1163,10 +1163,30 @@
 		if(QSettings.value("temperatureUnit", "F") == "C") {
 			showC.trigger();
 		}
+        window.postLoadColumnSetup = function(c) {
+			for(var i = 0; i < adapters.length; i++) {
+				adapters[i].setColumn(c + i + 1);
+				zeroemitters[i].setColumn(c + i + 1);
+				log.setHeaderData(c + i + 1, columnName(i));
+			}
+			log.setHeaderData(c + columnNames.length + 1 - channelSkip, TTR("basicWindow", "Note"));
+            stop.setTemperatureColumn(c + 1);
+			stop.setAnnotationColumn(c + columnNames.length + 1 - channelSkip);
+			for(var i = 0; i < annotationButtons.length; i++) {
+				annotationButtons[i].setTemperatureColumn(c + 1);
+				annotationButtons[i].setAnnotationColumn(c + columnNames.length + 1 - channelSkip);
+			}
+			log.clearCurrentColumnSet();
+			for(var i = 0; i < channels.length - channelSkip; i++) {
+				log.addToCurrentColumnSet(c + i + 1);
+			}
+			window.firstTempColumn = c + 1;
+			window.annotationColumn = c + columnNames.length - channelSkip + 1;
+		}
 		var clear = findChildObject(this, 'clear');
-        clear.triggered.connect(log.clear);
-        clear.triggered.connect(graph.clear);
-        clear.triggered.connect(function() {
+        window.clearLog = function() {
+            log.clear();
+            graph.clear();
             window.windowTitle = "Typica [*]";
 			log.setHeaderData(0, "Time");
             QSettings.setValue("liveColumn", 1);
@@ -1176,7 +1196,8 @@
 			}
 			resetTranslation.enabled = false;
 			setTranslation.enabled = false;
-        });
+        };
+        clear.triggered.connect(window.clearLog);
 		var openMenu = findChildObject(this, 'open');
         var compareMenu = findChildObject(this, 'compare');
         compareMenu.triggered.connect(function() {
@@ -1252,26 +1273,6 @@
 			}
 			return "";
 		};
-		window.postLoadColumnSetup = function(c) {
-			for(var i = 0; i < adapters.length; i++) {
-				adapters[i].setColumn(c + i + 1);
-				zeroemitters[i].setColumn(c + i + 1);
-				log.setHeaderData(c + i + 1, columnName(i));
-			}
-			log.setHeaderData(c + columnNames.length + 1 - channelSkip, TTR("basicWindow", "Note"));
-            stop.setTemperatureColumn(c + 1);
-			stop.setAnnotationColumn(c + columnNames.length + 1 - channelSkip);
-			for(var i = 0; i < annotationButtons.length; i++) {
-				annotationButtons[i].setTemperatureColumn(c + 1);
-				annotationButtons[i].setAnnotationColumn(c + columnNames.length + 1 - channelSkip);
-			}
-			log.clearCurrentColumnSet();
-			for(var i = 0; i < channels.length - channelSkip; i++) {
-				log.addToCurrentColumnSet(c + i + 1);
-			}
-			window.firstTempColumn = c + 1;
-			window.annotationColumn = c + columnNames.length - channelSkip + 1;
-		}
 		var saveMenu = findChildObject(this, 'save');
         saveMenu.triggered.connect(function() {
             var filename = QFileDialog.getSaveFileName(window, TTR("basicWindow", "Save Log As..."), QSettings.value("script/lastDir", "") + "/");