Refactor profile loading

config/Windows/batchdetailsnew.xml

@@ -163,48 +163,7 @@
                 var buffer = new QBuffer(query.value(0));
                 var pname = query.value(1);
                 query = query.invalidate();
-                var input = new XMLInput(buffer, 1);
-                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 == Windows.loggingWindow.targetcolumnname) {
-                        targetseries = col;
-                    }
-                });
-                input.newAnnotationColumn.connect(log.setHeaderData);
-                input.measure.connect(graph.newMeasurement);
-                input.measure.connect(log.newMeasurement);
-				var targetDetector = Windows.loggingWindow.targetDetector;
-                input.measure.connect(function(data, series) {
-                    if(series == targetseries) {
-                        targetDetector.newMeasurement(data);
-                    }
-                });
-                var lc;
-                input.lastColumn.connect(function(c) {
-                    lc = c;
-                    QSettings.setValue("liveColumn", c + 1);
-                    Windows.loggingWindow.postLoadColumnSetup(c);
-                });
-                input.annotation.connect(log.newAnnotation);
-                input.annotation.connect(function(note, tcol, ncol) {
-                    for(var i = tcol; i < ncol; i++) {
-                        log.newAnnotation(note, i, ncol);
-                    }
-                });
-                Windows.loggingWindow.windowTitle = "Typica - " + pname;
-                Windows.loggingWindow.raise();
-                Windows.loggingWindow.activateWindow();
-                graph.updatesEnabled = false;
-                log.updatesEnabled = false;
-                input.input();
-                log.updatesEnabled = true;
-                graph.updatesEnabled = true;
-                log.newAnnotation(TTR("batchDetails", "End"), 1, lc);
-                query = query.invalidate();
+				Windows.loggingWindow.loadPlan(buffer, pname);
             });
             var approvalButton = findChildObject(this, 'approval');
             var annotationField = findChildObject(this, 'annotation');

config/Windows/newbatch.xml

@@ -578,8 +578,6 @@
                 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);
@@ -591,53 +589,12 @@
                     query.exec(q);
                     if(query.next())
                     {
-                        var targetseries = -1;
                         var buffer = new QBuffer(query.value(0));
                         var pname = query.value(1);
-                        var input = new XMLInput(buffer, 1);
-                        graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-                        log = findChildObject(navigationwindow.loggingWindow, 'log');
-                        log.clear();
-                        graph.clear();
-                        input.newTemperatureColumn.connect(log.setHeaderData);
-                        input.newTemperatureColumn.connect(function(col, text) {
-                            if(text == navigationwindow.loggingWindow.targetcolumnname)
-                            {
-                                targetseries = col;
-                            }
-                        });
-                        input.newAnnotationColumn.connect(log.setHeaderData);
-                        input.measure.connect(graph.newMeasurement);
-                        input.measure.connect(log.newMeasurement);
-                        input.measure.connect(function(data, series) {
-                            if(series == targetseries)
-                            {
-                                targetDetector.newMeasurement(data);
-                            }
-                        });
-                        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);
-                            }
-                        });
+						Windows.loggingWindow.loadPlan(buffer, pname);
                     }
                 }
                 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(TTR("batchWindow", "End"), 1, lc);
             }
             var noprofilebutton = findChildObject(this, 'noprofile');
             noprofilebutton.clicked.connect(function() {
@@ -659,6 +616,7 @@
             var doNoProfile = function() {
                 batch.windowModified = true;
                 currentBatchInfo = batch;
+				navigationwindow.loggingWindow.clearLog();
                 navigationwindow.loggingWindow.raise();
                 navigationwindow.loggingWindow.activateWindow();
                 if(scheduledID > 0) {

config/Windows/productionroaster.xml

@@ -1222,48 +1222,54 @@
             exportWindow.windowTitle = TTR("basicWindow", "Typica - Export XHTML+SVG");
             exportWindow.log = log;
         });
+		window.loadPlan = function(device, name) {
+			window.clearLog();
+			var input = new XMLInput(device, 1);
+			targetseries = -1;
+            input.newTemperatureColumn.connect(log.setHeaderData);
+			input.newTemperatureColumn.connect(function(col, text) {
+				if(text == window.targetcolumnname) {
+					targetseries = col;
+				}
+			});
+            input.newAnnotationColumn.connect(log.setHeaderData);
+            input.measure.connect(graph.newMeasurement);
+            input.measure.connect(log.newMeasurement);
+			input.measure.connect(function(data, series) {
+				if(series == targetseries) {
+					targetDetector.newMeasurement(data);
+				}
+			});
+			resetTranslation.enabled = false;
+			setTranslation.enabled = false;
+            input.annotation.connect(log.newAnnotation);
+			input.annotation.connect(function(note, tcol, ncol) {
+				for(var i = tcol; i < ncol; i++) {
+					log.newAnnotation(note, i, ncol);
+				}
+			});
+			var lc;
+            input.lastColumn.connect(function(c) {
+				lc = c;
+                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 - [*]' + name;
+			log.newAnnotation(TTR("basicWindow", "End"), 1, lc);
+			window.raise();
+			window.activateWindow();
+		}
         openMenu.triggered.connect(function() {
             var filename = QFileDialog.getOpenFileName(window, TTR("basicWindow", "Open Log..."), QSettings.value('script/lastDir', '') + '/');
             if(filename != '') {
                 var file = new QFile(filename);
-                var input = new XMLInput(file, 1);
-				targetseries = -1;
-                input.newTemperatureColumn.connect(log.setHeaderData);
-				input.newTemperatureColumn.connect(function(col, text) {
-					if(text == window.targetcolumnname) {
-						targetseries = col;
-					}
-				});
-                input.newAnnotationColumn.connect(log.setHeaderData);
-                input.measure.connect(graph.newMeasurement);
-                input.measure.connect(log.newMeasurement);
-				input.measure.connect(function(data, series) {
-					if(series == targetseries) {
-						targetDetector.newMeasurement(data);
-					}
-				});
-				resetTranslation.enabled = false;
-				setTranslation.enabled = false;
-                input.annotation.connect(log.newAnnotation);
-				input.annotation.connect(function(note, tcol, ncol) {
-					for(var i = tcol; i < ncol; i++) {
-						log.newAnnotation(note, i, ncol);
-					}
-				});
-				var lc;
-                input.lastColumn.connect(function(c) {
-					lc = c;
-                    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);
+				window.loadPlan(file, baseName(filename));
                 QSettings.setValue("script/lastDir", dir(filename));
-				log.newAnnotation(TTR("basicWindow", "End"), 1, lc);
             }
         });
 		var columnName = function(c) {