git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stuff
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
static
/
mctx.graph.js
diff --git
a/testing/MCTXWeb/public_html/static/mctx.graph.js
b/testing/MCTXWeb/public_html/static/mctx.graph.js
index
22d14d7
..
fd475ad
100644
(file)
--- a/
testing/MCTXWeb/public_html/static/mctx.graph.js
+++ b/
testing/MCTXWeb/public_html/static/mctx.graph.js
@@
-11,6
+11,8
@@
mctx.graph.api.sensors = mctx.api + "sensors";
mctx.graph.api.actuators = mctx.api + "actuators";
mctx.sensors = {};
mctx.actuators = {};
mctx.graph.api.actuators = mctx.api + "actuators";
mctx.sensors = {};
mctx.actuators = {};
+
+mctx.graph.devices = {};
mctx.graph.dependent = null;
mctx.graph.independent = null;
mctx.graph.timer = null;
mctx.graph.dependent = null;
mctx.graph.independent = null;
mctx.graph.timer = null;
@@
-65,12
+67,13
@@
$.fn.deployDevices = function(input_type, check_first, group) {
var apply = function(dict, prefix) {
$.each(dict, function(key, val) {
var attributes = {
var apply = function(dict, prefix) {
$.each(dict, function(key, val) {
var attributes = {
- 'type' : input_type, 'value' : key, 'alt' : val,
+ 'type' : input_type, 'value' : key, 'alt' : val
.name
,
'class' : prefix, 'name' : group,
'class' : prefix, 'name' : group,
- 'id' : prefix + '_' + val //Unique id (name mangling)
+ 'id' : prefix + '_' + val
.name
//Unique id (name mangling)
};
};
+
var entry = $("<input/>", attributes);
var entry = $("<input/>", attributes);
- var label = $("<label/>", {'for' : prefix + '_' + val
, 'text' : val
});
+ var label = $("<label/>", {'for' : prefix + '_' + val
.name, 'text' : val.name
});
entry.prop("checked", check_first);
check_first = false;
container.append(entry).append(label);
entry.prop("checked", check_first);
check_first = false;
container.append(entry).append(label);
@@
-178,16
+181,20
@@
function graphUpdater() {
var plot_data = [];
yaxis.each(function() {
var plot_data = [];
yaxis.each(function() {
+ var series = {};
+ series.label = $(this).attr("alt");
+
//alert("Add " + $(this).val() + " to plot");
if (xaxis.attr("alt") === "time") {
//alert("Against time");
//alert("Add " + $(this).val() + " to plot");
if (xaxis.attr("alt") === "time") {
//alert("Against time");
-
plot_data.push(devices[$(this).attr("alt")].data)
;
+
series.data = devices[$(this).attr("alt")].data
;
} else {
var result = []
dataMerge(devices[xaxis.attr("alt")].data,
devices[$(this).attr("alt")].data, result);
} else {
var result = []
dataMerge(devices[xaxis.attr("alt")].data,
devices[$(this).attr("alt")].data, result);
-
plot_data.push(result)
;
+
series.data = result
;
}
}
+ plot_data.push(series);
});
if (mctx.graph.chart !== null) {
});
if (mctx.graph.chart !== null) {
@@
-195,7
+202,12
@@
function graphUpdater() {
mctx.graph.chart.setupGrid();
mctx.graph.chart.draw();
} else {
mctx.graph.chart.setupGrid();
mctx.graph.chart.draw();
} else {
- mctx.graph.chart = $.plot("#graph", plot_data);
+ var options = {
+ legend : {
+ container : "#graph-legend"
+ }
+ };
+ mctx.graph.chart = $.plot("#graph", plot_data, options);
}
mctx.graph.timer = setTimeout(updater, 1000);
}
}
mctx.graph.timer = setTimeout(updater, 1000);
}
UCC
git Repository :: git.ucc.asn.au