From 9575281ce7c930d14e51b2af8357ae5183f6f20e Mon Sep 17 00:00:00 2001 From: Michael Joyce Date: Wed, 2 May 2018 10:37:00 -0700 Subject: [PATCH] Issue #25 - Update Plot time label and Search time handling Update the plot x-axis label to `Time` instead of `Time (UTC)`. This field isn't necessarily UTC since users can specify a custom field in their telemetry that indicates time. The more generic label should help avoid confusion here. Update time handling in MnemonicSearch to explicitly use UTC time instead of the default (which was changed in #3). In the future we should attempt to update the handling of this so that the Clock mode dictates which time format is used. --- bliss/gui/static/js/bliss/gui/Plot.js | 2 +- bliss/gui/static/js/bliss/gui/Search.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bliss/gui/static/js/bliss/gui/Plot.js b/bliss/gui/static/js/bliss/gui/Plot.js index 2eedad10..9a77a754 100644 --- a/bliss/gui/static/js/bliss/gui/Plot.js +++ b/bliss/gui/static/js/bliss/gui/Plot.js @@ -58,7 +58,7 @@ class DygraphsBackend return { drawPoints: true, connectSeparatedPoints: true, - xlabel: 'Time (UTC)', + xlabel: 'Time', labels: ['Time'], height: 500, width: 800, diff --git a/bliss/gui/static/js/bliss/gui/Search.js b/bliss/gui/static/js/bliss/gui/Search.js index 014abad8..6dcd85de 100644 --- a/bliss/gui/static/js/bliss/gui/Search.js +++ b/bliss/gui/static/js/bliss/gui/Search.js @@ -93,7 +93,7 @@ const MnemonicSearch = { let val = 'N/A' let raw = 'N/A' - let curTime = format.datetime(new Date()) + let curTime = format.datetime(new Date(), {utc: true, gps: false}) let curPacket = (bliss.packets[this._packet] ? bliss.packets[this._packet].get(0) : null