|
@@ -17,14 +17,10 @@
|
17
|
17
|
var compare = findChildObject(this, 'compare');
|
18
|
18
|
var edit = findChildObject(this, 'edit');
|
19
|
19
|
edit.enabled = false;
|
20
|
|
- if(typeof(navigationwindow) == "undefined") {
|
21
|
|
- compare.enabled = false;
|
22
|
|
- target.enabled = false;
|
23
|
|
- } else if(typeof(navigationwindow.loggingWindow) == "undefined") {
|
|
20
|
+ if(typeof(Windows.loggingWindow) == "undefined") {
|
24
|
21
|
compare.enabled = false;
|
25
|
22
|
target.enabled = false;
|
26
|
23
|
}
|
27
|
|
-
|
28
|
24
|
var tableReference;
|
29
|
25
|
var rowReference;
|
30
|
26
|
var batchTime;
|
|
@@ -48,7 +44,7 @@
|
48
|
44
|
var nextSeries = startSeries + 2;
|
49
|
45
|
QSettings.setValue('cseries', nextSeries);
|
50
|
46
|
var input = new XMLInput(buffer, startSeries);
|
51
|
|
- var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
|
|
47
|
+ var graph = findChildObject(Windows.loggingWindow, 'graph');
|
52
|
48
|
input.measure.connect(graph.newMeasurement);
|
53
|
49
|
input.input();
|
54
|
50
|
query = query.invalidate();
|
|
@@ -63,13 +59,13 @@
|
63
|
59
|
var pname = query.value(1);
|
64
|
60
|
query = query.invalidate();
|
65
|
61
|
var input = new XMLInput(buffer, 1);
|
66
|
|
- var graph = findChildObject(navigationwindow.loggingWindow, 'graph');
|
67
|
|
- var log = findChildObject(navigationwindow.loggingWindow, 'log');
|
|
62
|
+ var graph = findChildObject(Windows.loggingWindow, 'graph');
|
|
63
|
+ var log = findChildObject(Windows.loggingWindow, 'log');
|
68
|
64
|
log.clear();
|
69
|
65
|
graph.clear();
|
70
|
66
|
input.newTemperatureColumn.connect(log.setHeaderData);
|
71
|
67
|
input.newTemperatureColumn.connect(function(col, text) {
|
72
|
|
- if(text == navigationwindow.loggingWindow.targetcolumnname)
|
|
68
|
+ if(text == Windows.loggingWindow.targetcolumnname)
|
73
|
69
|
{
|
74
|
70
|
targetseries = col;
|
75
|
71
|
}
|
|
@@ -87,7 +83,7 @@
|
87
|
83
|
input.lastColumn.connect(function(c) {
|
88
|
84
|
lc = c;
|
89
|
85
|
QSettings.setValue("liveColumn", c + 1);
|
90
|
|
- navigationwindow.loggingWindow.postLoadColumnSetup(c);
|
|
86
|
+ Windows.loggingWindow.postLoadColumnSetup(c);
|
91
|
87
|
});
|
92
|
88
|
input.annotation.connect(log.newAnnotation);
|
93
|
89
|
input.annotation.connect(function(note, tcol, ncol) {
|
|
@@ -95,9 +91,9 @@
|
95
|
91
|
log.newAnnotation(note, i, ncol);
|
96
|
92
|
}
|
97
|
93
|
});
|
98
|
|
- navigationwindow.loggingWindow.windowTitle = "Typica - " + pname;
|
99
|
|
- navigationwindow.loggingWindow.raise();
|
100
|
|
- navigationwindow.loggingWindow.activateWindow();
|
|
94
|
+ Windows.loggingWindow.windowTitle = "Typica - " + pname;
|
|
95
|
+ Windows.loggingWindow.raise();
|
|
96
|
+ Windows.loggingWindow.activateWindow();
|
101
|
97
|
input.input();
|
102
|
98
|
log.newAnnotation("End", 1, lc);
|
103
|
99
|
query = query.invalidate();
|