ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-22 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issue with wrong deltas being applied

Browse Source
This commit is contained in:
Henry 2016-08-04 10:41:58 -07:00
parent f3fd386e3b
commit 0e0ad64830
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/localTimeSystem/src/LocalTimeSystem.js
View File

@ -27,6 +27,7 @@ define([
], function (TimeSystem, LocalClock, LADTickSource) { ], function (TimeSystem, LocalClock, LADTickSource) {
var FIFTEEN_MINUTES = 15 * 60 * 1000, var FIFTEEN_MINUTES = 15 * 60 * 1000,
THIRTY_MINUTES = 30 * 60 * 1000, THIRTY_MINUTES = 30 * 60 * 1000,
ONE_HOUR = 60 * 60 * 1000,
DEFAULT_PERIOD = 1000; DEFAULT_PERIOD = 1000;
/** /**
@ -73,8 +74,7 @@ define([
key: 'local-default', key: 'local-default',
name: 'Local 12 hour time system defaults', name: 'Local 12 hour time system defaults',
mode: 'fixed', mode: 'fixed',
deltas: {start: FIFTEEN_MINUTES, end: 0}, bounds: {start: now - ONE_HOUR, end: now}
bounds: {start: now - FIFTEEN_MINUTES, end: now}
}, },
{ {
key: 'local-default', key: 'local-default',

1
main.js
View File

@ -106,6 +106,7 @@ define([
'./platform/search/bundle', './platform/search/bundle',
'./platform/status/bundle', './platform/status/bundle',
'./platform/commonUI/regions/bundle' './platform/commonUI/regions/bundle'
//'./example/localTimeSystem/bundle'
], function (Main, legacyRegistry) { ], function (Main, legacyRegistry) {
return { return {

15
platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
View File

@ -261,6 +261,8 @@ define(
break; break;
} }
newMode.initialize(); newMode.initialize();
this.setDeltasFromDefaults(newMode.defaults());
this.conductorService.mode(newMode); this.conductorService.mode(newMode);
//Synchronize scope with time system on mode //Synchronize scope with time system on mode
@ -275,8 +277,7 @@ define(
/** /**
* @private * @private
*/ */
TimeConductorController.prototype.setDeltasFromMode = function (mode) { TimeConductorController.prototype.setDeltasFromDefaults = function (defaults) {
var defaults = mode.defaults();
var deltas = defaults.deltas; var deltas = defaults.deltas;
/* /*
@ -312,12 +313,16 @@ define(
*/ */
TimeConductorController.prototype.setTimeSystem = function (newTimeSystem) { TimeConductorController.prototype.setTimeSystem = function (newTimeSystem) {
if (newTimeSystem && newTimeSystem !== this.$scope.timeSystemModel.selected) { if (newTimeSystem && newTimeSystem !== this.$scope.timeSystemModel.selected) {
var mode = this.conductorService.mode();
mode.timeSystem(newTimeSystem);
var defaults = mode.defaults();
this.$scope.timeSystemModel.selected = newTimeSystem; this.$scope.timeSystemModel.selected = newTimeSystem;
this.$scope.timeSystemModel.format = newTimeSystem.formats()[0]; this.$scope.timeSystemModel.format = newTimeSystem.formats()[0];
this.$scope.timeSystemModel.deltaFormat = newTimeSystem.deltaFormat(); this.$scope.timeSystemModel.deltaFormat = newTimeSystem.deltaFormat();
var mode = this.conductorService.mode();
mode.timeSystem(newTimeSystem); this.setDeltasFromDefaults(defaults);
this.setDeltasFromMode(mode);
// If current mode supports ticking, set an appropriate tick // If current mode supports ticking, set an appropriate tick
// source from the new time system // source from the new time system

1
platform/features/conductor-v2/utcTimeSystem/src/UTCTimeSystem.js
View File

@ -78,7 +78,6 @@ define([
key: 'utc-default', key: 'utc-default',
name: 'UTC time system defaults', name: 'UTC time system defaults',
mode: 'fixed', mode: 'fixed',
deltas: {start: FIFTEEN_MINUTES, end: 0},
bounds: {start: now - FIFTEEN_MINUTES, end: now} bounds: {start: now - FIFTEEN_MINUTES, end: now}
} }
]; ];