diff --git a/platform/features/table/src/controllers/TelemetryTableController.js b/platform/features/table/src/controllers/TelemetryTableController.js index 68e47da5b9..a46cdf6f9c 100644 --- a/platform/features/table/src/controllers/TelemetryTableController.js +++ b/platform/features/table/src/controllers/TelemetryTableController.js @@ -246,7 +246,7 @@ define( this.table.populateColumns(allColumns); - var domainColumns = telemetryApi.commonValuesForHints(metadatas, ['x']); + var domainColumns = telemetryApi.commonValuesForHints(metadatas, ['domain']); this.timeColumns = domainColumns.map(function (metadatum) { return metadatum.name; }); diff --git a/platform/telemetry/src/TelemetryCapability.js b/platform/telemetry/src/TelemetryCapability.js index d4ad4cb812..f784f59ffc 100644 --- a/platform/telemetry/src/TelemetryCapability.js +++ b/platform/telemetry/src/TelemetryCapability.js @@ -212,8 +212,8 @@ define( var telemetryAPI = this.openmct.telemetry; var metadata = telemetryAPI.getMetadata(domainObject); - var defaultDomain = metadata.valuesForHints(['x'])[0].source; - var defaultRange = metadata.valuesForHints(['y'])[0].source; + var defaultDomain = metadata.valuesForHints(['domain'])[0].source; + var defaultRange = metadata.valuesForHints(['range'])[0].source; var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) === telemetryAPI.legacyProvider; @@ -274,8 +274,8 @@ define( var telemetryAPI = this.openmct.telemetry; var metadata = telemetryAPI.getMetadata(domainObject); - var defaultDomain = metadata.valuesForHints(['x'])[0].source; - var defaultRange = metadata.valuesForHints(['y'])[0].source; + var defaultDomain = metadata.valuesForHints(['domain'])[0].source; + var defaultRange = metadata.valuesForHints(['range'])[0].source; var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) === telemetryAPI.legacyProvider; diff --git a/src/api/telemetry/LegacyTelemetryProvider.js b/src/api/telemetry/LegacyTelemetryProvider.js index 47b6022e34..c0f40eb85a 100644 --- a/src/api/telemetry/LegacyTelemetryProvider.js +++ b/src/api/telemetry/LegacyTelemetryProvider.js @@ -56,11 +56,11 @@ define([ datum = legacySeries.getDatum(i); } else { datum = {}; - metadata.valuesForHints(['x']).forEach(function (metadatum) { + metadata.valuesForHints(['domain']).forEach(function (metadatum) { 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); }); } diff --git a/src/api/telemetry/TelemetryMetadataManager.js b/src/api/telemetry/TelemetryMetadataManager.js index 0bb243c3fd..1346b263c7 100644 --- a/src/api/telemetry/TelemetryMetadataManager.js +++ b/src/api/telemetry/TelemetryMetadataManager.js @@ -38,7 +38,6 @@ define([ metadata.domains.forEach(function (domain, index) { var valueMetadata = _.clone(domain); valueMetadata.hints = { - x: index + 1, domain: index + 1 }; valueMetadatas.push(valueMetadata); @@ -47,7 +46,6 @@ define([ metadata.ranges.forEach(function (range, index) { var valueMetadata = _.clone(range); valueMetadata.hints = { - y: index, range: index, priority: index + metadata.domains.length + 1 };