ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-18 02:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1369 from nasa/datum-fallback

Browse Source 
Use series.getDatum when available
This commit is contained in:
Andrew Henry 2017-01-18 21:37:31 -08:00 committed by GitHub
commit df2ce72e39
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/telemetry/src/TelemetryHandle.js
View File

@ -122,9 +122,12 @@ define(
*/
self.getDatum = function (telemetryObject, index) {
function makeNewDatum(series) {
return series ?
subscription.makeDatum(telemetryObject, series, index) :
undefined;
if (series) {
if (series.getDatum) {
return series.getDatum(index);
}
return subscription.makeDatum(telemetryObject, series, index);
}
}
return typeof index !== 'number' ?

3
src/api/telemetry/LegacyTelemetryProvider.js
View File

@ -45,6 +45,9 @@ define([
};
function createDatum(domainObject, metadata, legacySeries, i) {
if (legacySeries.getDatum) {
return legacySeries.getDatum(i);
}
var datum = {};
metadata.domains.reduce(function (d, domain) {