diff --git a/server.py b/server.py
index 6b45af2..5388221 100755
--- a/server.py
+++ b/server.py
@@ -328,9 +328,13 @@ class EventMessage():
if self.name == 'Attribute':
self.feed = jsonMsg['log']
self.feed = LogItem(self.feed, filters).get_row()
+ if (self.feed[2]):
+ self.feed[2]['data'] = json.dumps(self.feed[2]['data'])
elif self.name == 'ObjectAttribute':
self.feed = jsonMsg['log']
self.feed = LogItem(self.feed, filters).get_row()
+ if (self.feed[2]):
+ self.feed[2]['data'] = json.dumps(self.feed[2]['data'])
else:
self.feed = jsonMsg['log']
diff --git a/static/js/index/index.js b/static/js/index/index.js
index ca63f63..d318e61 100644
--- a/static/js/index/index.js
+++ b/static/js/index/index.js
@@ -174,7 +174,7 @@ $(document).ready(function () {
livelog = new $.livelog($("#divLogTable"), {
pollingFrequency: 5000,
tableHeader: head,
- tableMaxEntries: 50,
+ tableMaxEntries: 300,
// animate: false,
preDataURL: urlForLogs,
endpoint: urlForLogs
@@ -194,9 +194,9 @@ function updateLogTable(name, log, zmqName, ignoreLed) {
ledmanager.updateKeepAlive(zmqName);
}
- // only add row for attribute
- if (name == "Attribute" ) {
- var categName = log[toPlotLocationLog];
+ // add row for attribute and Object attribute
+ if (name == "Attribute" || name == "ObjectAttribute") {
+ var categName = log[3];
sources.addIfNotPresent(categName);
sources.incCountOnSource(categName);
sources.incCountOnSource('global');
@@ -209,6 +209,7 @@ function updateLogTable(name, log, zmqName, ignoreLed) {
}
+
function slideAndMax(orig, newData) {
var slided = [];
var max = newData;
@@ -335,7 +336,8 @@ function createHead(callback) {
var $toRet;
if (typeof data === 'object') {
$toRet = $('');
- data.data.forEach(function(cur, i) {
+ let tagList = JSON.parse(data.data);
+ tagList.forEach(function(cur, i) {
switch (data.name) {
case 'Tag':
var $tag = $('');
@@ -841,7 +843,7 @@ $(document).ready(function() {
$panel.removeClass('liveLogFullScreen');
$this.data('isfullscreen', false);
$panel.find('#divLogTable').css({'overflow': 'hidden'});
- livelog.changeOptions({tableMaxEntries: 50});
+ livelog.changeOptions({tableMaxEntries: 300});
}
});
diff --git a/static/js/index/index_lineChart.js b/static/js/index/index_lineChart.js
index b505635..6406b50 100644
--- a/static/js/index/index_lineChart.js
+++ b/static/js/index/index_lineChart.js
@@ -1,5 +1,5 @@
var updateIntervalDirect = 1000*2; // 2s
-var updateInterval = 1000*60*60*graph_log_refresh_rate; // 1h
+var updateInterval = 1000*60*60*graph_log_refresh_rate; // 1 hour
var maxNumPoint = hours_spanned+1;
var optionsLineChart = {
@@ -8,7 +8,7 @@ var optionsLineChart = {
lines: {
fill: true,
fillColor: {
- colors: [ { opacity: 1 }, { opacity: 0.1 } ]
+ colors: [ { opacity: 0.1 }, { opacity: 0.1 } ]
}
}
},
@@ -17,14 +17,15 @@ var optionsLineChart = {
xaxis: { min: 0, max: maxNumPoint },
ticks: maxNumPoint+1,
points: { show: true },
- lines: { show: true, fill: true },
+ lines: { show: true, fill: true, lineDashType: "dash"},
grid: {
tickColor: "#dddddd",
borderWidth: 0
},
legend: {
show: true,
- position: "nw"
+ position: "nw",
+ dockInsidePlotArea: true
}
};
@@ -51,7 +52,8 @@ function updateChartDirect() {
plotLineChart.getOptions().yaxes[0].max = sources.getGlobalMax();
plotLineChart.setupGrid();
plotLineChart.draw();
- //setTimeout(updateChartDirect, updateIntervalDirect);
+ setTimeout(updateChartDirect, updateIntervalDirect);
+
}
updateChartDirect()