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

[Tables] Default UTC time system if available and none others defined

Browse Source
This commit is contained in:
Henry 2017-01-25 15:41:08 -08:00
parent 6cd99efbb9
commit ef8efbd53d
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform/features/conductor/utcTimeSystem/bundle.js
View File

@ -22,7 +22,8 @@
define([ define([
"./src/UTCTimeSystem", "./src/UTCTimeSystem",
'legacyRegistry' 'legacyRegistry',
'openmct'
], function ( ], function (
UTCTimeSystem, UTCTimeSystem,
legacyRegistry legacyRegistry
@ -34,7 +35,23 @@ define([
"implementation": UTCTimeSystem, "implementation": UTCTimeSystem,
"depends": ["$timeout"] "depends": ["$timeout"]
} }
],
"runs": [
{
"implementation": function (openmct, $timeout) {
// Temporary shim to initialize the time conductor to
// something
if (!openmct.conductor.timeSystem()) {
var utcTimeSystem = new UTCTimeSystem($timeout);
openmct.conductor.timeSystem(utcTimeSystem, utcTimeSystem.defaults().bounds);
}
},
"depends": ["openmct", "$timeout"],
"priority": "fallback"
}
] ]
} }
}); });
}); });

4
platform/features/table/src/TelemetryCollection.js
View File

@ -84,7 +84,7 @@ define(
}; };
TelemetryCollection.prototype.inBounds = function (element) { TelemetryCollection.prototype.inBounds = function (element) {
var noBoundsDefined = !this.lastBounds || (!this.lastBounds.start && !this.lastBounds.end); var noBoundsDefined = !this.lastBounds || (this.lastBounds.start === undefined && this.lastBounds.end === undefined);
var withinBounds = var withinBounds =
_.get(element, this.sortField) >= this.lastBounds.start && _.get(element, this.sortField) >= this.lastBounds.start &&
_.get(element, this.sortField) <= this.lastBounds.end; _.get(element, this.sortField) <= this.lastBounds.end;
@ -114,7 +114,7 @@ define(
array = this.highBuffer; array = this.highBuffer;
} }
} else { } else {
array = this.highBuffer; array = this.telemetry;
} }
// If out of bounds low, disregard data // If out of bounds low, disregard data

2
platform/features/table/src/controllers/TelemetryTableController.js
View File

@ -391,7 +391,7 @@ define(
getDomainObjects() getDomainObjects()
.then(filterForTelemetry) .then(filterForTelemetry)
.then(this.loadColumns) .then(this.loadColumns)
//.then(this.subscribeToNewData) .then(this.subscribeToNewData)
.then(this.getHistoricalData) .then(this.getHistoricalData)
.catch(error) .catch(error)
}; };