ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-25 21:59:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Time Conductor] Clean up code style

Browse Source 
Clean up code style in TelemetrySubscription, for
changes associated with WTD-1515.
This commit is contained in:
Victor Woeltjen 2015-09-10 11:20:09 -07:00
parent 78fae345da
commit 7d20351a6a
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
platform/telemetry/src/TelemetrySubscription.js
View File

@ -123,25 +123,6 @@ define(
telemetryCapability.getMetadata(); telemetryCapability.getMetadata();
} }
// From a telemetry series, retrieve a single data point
// containing all fields for domains/ranges
function makeDatum(domainObject, series, index) {
var metadata = lookupMetadata(domainObject),
result = {};
(metadata.domains || []).forEach(function (domain) {
result[domain.key] =
series.getDomainValue(index, domain.key);
});
(metadata.ranges || []).forEach(function (range) {
result[range.key] =
series.getRangeValue(index, range.key);
});
return result;
}
// Update the latest telemetry data for a specific // Update the latest telemetry data for a specific
// domain object. This will notify listeners. // domain object. This will notify listeners.
function update(domainObject, series) { function update(domainObject, series) {
@ -160,7 +141,7 @@ define(
pool.put(domainObject.getId(), { pool.put(domainObject.getId(), {
domain: series.getDomainValue(count - 1), domain: series.getDomainValue(count - 1),
range: series.getRangeValue(count - 1), range: series.getRangeValue(count - 1),
datum: makeDatum(domainObject, series, count - 1) datum: self.makeDatum(domainObject, series, count - 1)
}); });
} }
} }
@ -188,6 +169,11 @@ define(
function cacheObjectReferences(objects) { function cacheObjectReferences(objects) {
self.telemetryObjects = objects; self.telemetryObjects = objects;
self.metadatas = objects.map(lookupMetadata); self.metadatas = objects.map(lookupMetadata);
self.metadataById = {};
objects.forEach(function (obj, i) {
self.metadataById[obj.getId()] = self.metadatas[i];
});
// Fire callback, as this will be the first time that // Fire callback, as this will be the first time that
// telemetry objects are available, or these objects // telemetry objects are available, or these objects
// will have changed. // will have changed.
@ -239,12 +225,36 @@ define(
initialize(); initialize();
this.unlistenToMutation = addMutationListener(); this.unlistenToMutation = addMutationListener();
// Expose makeDatum for TelemetryHandler to use, but not
// as part of public API
this.makeDatum = makeDatum;
} }
/**
* From a telemetry series, retrieve a single data point
* containing all fields for domains/ranges
* @private
*/
TelemetrySubscription.prototype.makeDatum = function (domainObject, series, index) {
var id = domainObject && domainObject.getId(),
metadata = (id && this.metadataById[id]) || {},
result = {};
(metadata.domains || []).forEach(function (domain) {
result[domain.key] =
series.getDomainValue(index, domain.key);
});
(metadata.ranges || []).forEach(function (range) {
result[range.key] =
series.getRangeValue(index, range.key);
});
return result;
};
/**
* Terminate all underlying subscriptions.
* @private
*/
TelemetrySubscription.prototype.unsubscribeAll = function () { TelemetrySubscription.prototype.unsubscribeAll = function () {
var $q = this.$q; var $q = this.$q;
return this.unsubscribePromise.then(function (unsubscribes) { return this.unsubscribePromise.then(function (unsubscribes) {