ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 22:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1505 from nasa/conductor-unpleasantness

Browse Source 
[Time Conductor] Removed caching of UTC Time System defaults
This commit is contained in:
Pete Richards 2017-04-04 16:03:32 -07:00 committed by GitHub
commit 3ce954c68c
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
View File

@ -48,7 +48,6 @@ define([
this.fmts = ['utc']; this.fmts = ['utc'];
this.sources = [new LocalClock($timeout, DEFAULT_PERIOD)]; this.sources = [new LocalClock($timeout, DEFAULT_PERIOD)];
this.defaultValues = undefined;
} }
UTCTimeSystem.prototype = Object.create(TimeSystem.prototype); UTCTimeSystem.prototype = Object.create(TimeSystem.prototype);
@ -65,25 +64,18 @@ define([
return this.sources; return this.sources;
}; };
UTCTimeSystem.prototype.defaults = function (defaults) { UTCTimeSystem.prototype.defaults = function () {
if (arguments.length > 0) {
this.defaultValues = defaults;
}
if (this.defaultValues === undefined) {
var now = Math.ceil(Date.now() / 1000) * 1000; var now = Math.ceil(Date.now() / 1000) * 1000;
var ONE_MINUTE = 60 * 1 * 1000; var ONE_MINUTE = 60 * 1 * 1000;
var FIFTY_YEARS = 50 * 365 * 24 * 60 * 60 * 1000; var FIFTY_YEARS = 50 * 365 * 24 * 60 * 60 * 1000;
this.defaultValues = { return {
key: 'utc-default', key: 'utc-default',
name: 'UTC time system defaults', name: 'UTC time system defaults',
deltas: {start: FIFTEEN_MINUTES, end: 0}, deltas: {start: FIFTEEN_MINUTES, end: 0},
bounds: {start: now - FIFTEEN_MINUTES, end: now}, bounds: {start: now - FIFTEEN_MINUTES, end: now},
zoom: {min: FIFTY_YEARS, max: ONE_MINUTE} zoom: {min: FIFTY_YEARS, max: ONE_MINUTE}
}; };
}
return this.defaultValues;
}; };
return UTCTimeSystem; return UTCTimeSystem;

8
src/plugins/plugins.js
View File

@ -68,14 +68,6 @@ define([
return ts.metadata.key === options.defaultTimeSystem; return ts.metadata.key === options.defaultTimeSystem;
}); });
if (timeSystem !== undefined) { if (timeSystem !== undefined) {
defaults = timeSystem.defaults();
if (options.defaultTimespan !== undefined) {
defaults.deltas.start = options.defaultTimespan;
defaults.bounds.start = defaults.bounds.end - options.defaultTimespan;
timeSystem.defaults(defaults);
}
openmct.conductor.timeSystem(timeSystem, defaults.bounds); openmct.conductor.timeSystem(timeSystem, defaults.bounds);
} }
} }