mctx.graph.dependent = null;
mctx.graph.independent = null;
mctx.graph.timer = null;
+mctx.graph.running = false;
+mctx.graph.chart = null;
/**
* Helper - Calculate pairs of (dependent, independent) values
* Appends each value pair to the result
* @returns result
*/
+/**
+ * Helper - Calculate pairs of (dependent, independent) values
+ * Given input as (time, value) pairs for dependent and independent
+ * Appends each value pair to the result
+ * @param {array[][]} dependent Dependent data to be correlated with independent
+ * @param {array[][]} independent Independent data
+ * @param {array[][]} result Storage location
+ * @returns {dataMerge.result}
+ */
function dataMerge(dependent, independent, result) {
var j = 0;
for (var i = 0; i < dependent.length-1; ++i) {
mctx.sensors = $.extend(mctx.sensors, data.sensors);
mctx.actuators = $.extend(mctx.actuators, data.actuators);
+ //Always set the 'time' option to be checked
+ $("#xaxis input").prop('checked', true);
$("#xaxis").deployDevices("radio", false, 'xaxis');
$("#yaxis").deployDevices("checkbox", true, 'yaxis');
$("#current_time").val(data.running_time);
+ //Add event listeners for when the
+ $(".change input").change(function () {
+ $("#graph").setGraph();
+ });
});
};
+function setGraphStatus(on, failText) {
+ if (on) {
+ mctx.graph.running = true;
+ $("#status-text").html(" ");
+ $("#graph-run").text("Pause");
+ } else {
+ mctx.graph.running = false;
+ if (failText) {
+ $("#status-text").text(failText).addClass("fail");
+ } else {
+ $("#status-text").text("Graph stopped").removeClass("fail");
+ }
+ $("#graph-run").text("Run");
+ }
+}
-/**
- * Sets the graphs to graph stuff.
- * @returns {$.fn}
- */
-$.fn.setGraph = function () {
- clearTimeout(mctx.graph.timer);
+function graphUpdater() {
var urls = {
'sensors' : mctx.graph.api.sensors,
'actuators' : mctx.graph.api.actuators
}
-
- var updateData = function(json, data) {
- for (var i = 0; i < json.data.length; ++i)
- data.push(json.data[i]);
- return data;
- };
- var graphdiv = this;
-
- // Determine which actuator/sensors to plot
-
- var xaxis = $("#xaxis input:checked");
- var yaxis = $("#yaxis input:checked");
- var start_time = $("#start_time").val();
- var end_time = $("#end_time").val();
- if (!$.isNumeric(start_time)) {
- start_time = null;
- }
- if (!$.isNumeric(end_time)) {
- end_time = null;
- }
-
- var devices = {};
- var populateDict = function () {
- var dict = {};
- dict['urltype'] = $(this).attr("class");
- dict['id'] = $(this).attr("value");
- dict['data'] = [];
- dict['start_time'] = start_time;
- dict['end_time'] = end_time;
- devices[$(this).attr("alt")] = dict;
- };
- xaxis.each(populateDict);
- yaxis.each(populateDict);
- /*
- yaxis.each(function() {
-
- devices[$(this).attr("alt")] = {};
- devices[$(this).attr("alt")]["url"] = mctx.api + $(this).attr("class");
- devices[$(this).attr("alt")]["data"] = [];
- devices[$(this).attr("alt")]["start_time"] = start_time;
- devices[$(this).attr("alt")]["end_time"] = end_time;
- });
- */
-
var updater = function () {
- var time_limit = 20;
var responses = [];
var ctime = $("#current_time");
+ var xaxis = mctx.graph.xaxis;
+ var yaxis = mctx.graph.yaxis;
+ var start_time = mctx.graph.start_time;
+ var end_time = mctx.graph.end_time;
+ var devices = mctx.graph.devices;
+
+ if (xaxis.size() < 1 || yaxis.size() < 1) {
+ setGraphStatus(false, "No x or y axis selected.");
+ return;
+ }
+
$.each(devices, function(key, val) {
- console.log(val);
if (val.urltype in urls) {
var parameters = {id : val.id};
- if (start_time != null) {
+ if (start_time !== null) {
parameters.start_time = start_time;
}
- if (end_time != null) {
+ if (end_time !== null) {
parameters.end_time = end_time;
}
responses.push($.ajax({url : urls[val.urltype], data : parameters})
}
});
- //... When the response is received, then() will happen (I think?) yup
+ //... When the response is received, then() will happen (I think?)
$.when.apply(this, responses).then(function () {
var plot_data = [];
yaxis.each(function() {
if (xaxis.attr("alt") === "time") {
//alert("Against time");
plot_data.push(devices[$(this).attr("alt")].data);
- }
- else {
+ } else {
var result = []
- dataMerge(devices[xaxis.attr("alt")].data, devices[$(this).attr("alt")].data, result);
- /*
- var astr = "[";
- for (var i = 0; i < result.length; ++i)
- astr += "[" + result[i][0] + "," + result[i][1] + "]" + ",";
- astr += "]";
- alert(astr);
- */
+ dataMerge(devices[xaxis.attr("alt")].data,
+ devices[$(this).attr("alt")].data, result);
plot_data.push(result);
}
});
- //alert(plot_data + "");
- //alert("Plot happened");
- $.plot("#graph", plot_data);
- mctx.graph.timer = setTimeout(updater, 1000);
- }, function () {alert("Graph crashed");});
+ //$.plot("#graph", plot_data);
+ if (mctx.graph.chart !== null) {
+ mctx.graph.chart.setData(plot_data);
+ mctx.graph.chart.setupGrid();
+ mctx.graph.chart.draw();
+ } else {
+ mctx.graph.chart = $.plot("#graph", plot_data);
+ }
+ if (mctx.graph.running) {
+ mctx.graph.timer = setTimeout(updater, 1000);
+ }
+ }, function () {
+ setGraphStatus("Connection issue - graph stopped.");
+ //This will always happen when a user closes the page
+ //alert("Graph crashed");
+ });
};
+ setGraphStatus(true);
updater();
+ return this;
+}
+
+/**
+ * Sets the graphs to graph stuff.
+ * @returns {$.fn}
+ */
+$.fn.setGraph = function () {
+ // Determine which actuator/sensors to plot
+ var xaxis = $("#xaxis input[name=xaxis]:checked");
+ var yaxis = $("#yaxis input[name=yaxis]:checked");
+ if (xaxis.size() < 1 || yaxis.size() < 1) {
+ //nothing to plot...
+ setGraphStatus(false, "No x or y axis selected.");
+ return;
+ }
+
+ var start_time = $("#start_time").val();
+ var end_time = $("#end_time").val();
+ if (!$.isNumeric(start_time)) {
+ start_time = null;
+ }
+ if (!$.isNumeric(end_time)) {
+ end_time = null;
+ }
+
+ var devices = {};
+ var populateDict = function () {
+ var dict = {};
+ dict['urltype'] = $(this).attr("class");
+ dict['id'] = $(this).attr("value");
+ dict['data'] = [];
+ dict['start_time'] = start_time;
+ dict['end_time'] = end_time;
+ devices[$(this).attr("alt")] = dict;
+ };
+ xaxis.each(populateDict);
+ yaxis.each(populateDict);
+
+ mctx.graph.xaxis = xaxis;
+ mctx.graph.yaxis = yaxis;
+ mctx.graph.start_time = start_time;
+ mctx.graph.end_time = end_time;
+ mctx.graph.devices = devices;
+
+ if (!mctx.graph.running) {
+ $("#graph-run").val("Pause");
+ $("#status-text").text("")
+ graphUpdater();
+ }
+
return this;
};
$.fn.runButton = function() {
- //alert($(this).val());
- if ($(this).val() === "Run") {
- $("#graph").setGraph();
- $(this).val("Pause");
- }
- else {
+ if (mctx.graph.running) {
+ setGraphStatus(false);
clearTimeout(mctx.graph.timer);
- $(this).val("Run");
+ } else {
+ $("#graph").setGraph();
}
};
git.ucc.asn.au / matches / MCTX3420.git / blobdiff
UCC git Repository :: git.ucc.asn.au