ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 15:43:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Telemetry] x/y -> domain/range

Browse Source 
Update source to use domain/range instead of x/y.

https://github.com/nasa/openmct/issues/1546
This commit is contained in:
Pete Richards
2017-05-09 18:51:57 -07:00
parent c674627ebd
commit 3df7e30d2c
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,7 +246,7 @@ define(
this.table.populateColumns(allColumns); this.table.populateColumns(allColumns);
var domainColumns = telemetryApi.commonValuesForHints(metadatas, ['x']); var domainColumns = telemetryApi.commonValuesForHints(metadatas, ['domain']);
this.timeColumns = domainColumns.map(function (metadatum) { this.timeColumns = domainColumns.map(function (metadatum) {
return metadatum.name; return metadatum.name;
}); });

8
platform/telemetry/src/TelemetryCapability.js
View File

@ -212,8 +212,8 @@ define(
var telemetryAPI = this.openmct.telemetry; var telemetryAPI = this.openmct.telemetry;
var metadata = telemetryAPI.getMetadata(domainObject); var metadata = telemetryAPI.getMetadata(domainObject);
var defaultDomain = metadata.valuesForHints(['x'])[0].source; var defaultDomain = metadata.valuesForHints(['domain'])[0].source;
var defaultRange = metadata.valuesForHints(['y'])[0].source; var defaultRange = metadata.valuesForHints(['range'])[0].source;
var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) === var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) ===
telemetryAPI.legacyProvider; telemetryAPI.legacyProvider;
@ -274,8 +274,8 @@ define(
var telemetryAPI = this.openmct.telemetry; var telemetryAPI = this.openmct.telemetry;
var metadata = telemetryAPI.getMetadata(domainObject); var metadata = telemetryAPI.getMetadata(domainObject);
var defaultDomain = metadata.valuesForHints(['x'])[0].source; var defaultDomain = metadata.valuesForHints(['domain'])[0].source;
var defaultRange = metadata.valuesForHints(['y'])[0].source; var defaultRange = metadata.valuesForHints(['range'])[0].source;
var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) === var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) ===
telemetryAPI.legacyProvider; telemetryAPI.legacyProvider;

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

@ -56,11 +56,11 @@ define([
datum = legacySeries.getDatum(i); datum = legacySeries.getDatum(i);
} else { } else {
datum = {}; datum = {};
metadata.valuesForHints(['x']).forEach(function (metadatum) { metadata.valuesForHints(['domain']).forEach(function (metadatum) {
datum[metadatum.key] = legacySeries.getDomainValue(i, metadatum.key); datum[metadatum.key] = legacySeries.getDomainValue(i, metadatum.key);
}); });
metadata.valuesForHints(['y']).forEach(function (metadatum) { metadata.valuesForHints(['range']).forEach(function (metadatum) {
datum[metadatum.key] = legacySeries.getRangeValue(i, metadatum.key); datum[metadatum.key] = legacySeries.getRangeValue(i, metadatum.key);
}); });
} }

2
src/api/telemetry/TelemetryMetadataManager.js
View File

@ -38,7 +38,6 @@ define([
metadata.domains.forEach(function (domain, index) { metadata.domains.forEach(function (domain, index) {
var valueMetadata = _.clone(domain); var valueMetadata = _.clone(domain);
valueMetadata.hints = { valueMetadata.hints = {
x: index + 1,
domain: index + 1 domain: index + 1
}; };
valueMetadatas.push(valueMetadata); valueMetadatas.push(valueMetadata);
@ -47,7 +46,6 @@ define([
metadata.ranges.forEach(function (range, index) { metadata.ranges.forEach(function (range, index) {
var valueMetadata = _.clone(range); var valueMetadata = _.clone(range);
valueMetadata.hints = { valueMetadata.hints = {
y: index,
range: index, range: index,
priority: index + metadata.domains.length + 1 priority: index + metadata.domains.length + 1
}; };