ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-19 11:17:04 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[Imagery Freshness] Update Telemetry for Imagery Freshness (#3723)

Browse Source 
* added new spacecraftPosition keys and changed old spacecraft keys to spacecraftOriention keys, updated how freshness is determined

* due to tests, added some checks for missing related telemetry before acting on it

* lint fixes

* pr comments, change simple if to Boolean
This commit is contained in:
Jamie V 2021-03-02 16:55:27 -08:00 committed by GitHub
parent 22d32eed1d
commit 221d10d3e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/imagery/components/ImageryViewLayout.vue
View File

@ -271,11 +271,27 @@ export default {
if (this.relatedTelemetry.hasRelatedTelemetry) { if (this.relatedTelemetry.hasRelatedTelemetry) {
isFresh = true; isFresh = true;
for (let key of this.spacecraftKeys) { for (let key of this.spacecraftPositionKeys) {
if (this.relatedTelemetry[key] && latest[key] && focused[key]) { if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
if (!this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key])) { isFresh = Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
isFresh = false; } else {
} isFresh = false;
}
}
}
return isFresh;
},
isSpacecraftOrientationFresh() {
let isFresh = undefined;
let latest = this.latestRelatedTelemetry;
let focused = this.focusedImageRelatedTelemetry;
if (this.relatedTelemetry.hasRelatedTelemetry) {
isFresh = true;
for (let key of this.spacecraftOrientationKeys) {
if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
isFresh = Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
} else { } else {
isFresh = false; isFresh = false;
} }
@ -293,12 +309,10 @@ export default {
isFresh = true; isFresh = true;
// camera freshness relies on spacecraft position freshness // camera freshness relies on spacecraft position freshness
if (this.isSpacecraftPositionFresh) { if (this.isSpacecraftPositionFresh && this.isSpacecraftOrientationFresh) {
for (let key of this.cameraKeys) { for (let key of this.cameraKeys) {
if (this.relatedTelemetry[key] && latest[key] && focused[key]) { if (this.relatedTelemetry[key] && latest[key] && focused[key]) {
if (!this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key])) { isFresh = Boolean(this.relatedTelemetry[key].comparisonFunction(latest[key], focused[key]));
isFresh = false;
}
} else { } else {
isFresh = false; isFresh = false;
} }
@ -333,7 +347,8 @@ export default {
this.imageFormatter = this.openmct.telemetry.getValueFormatter(this.imageHints); this.imageFormatter = this.openmct.telemetry.getValueFormatter(this.imageHints);
// related telemetry keys // related telemetry keys
this.spacecraftKeys = ['heading', 'roll', 'pitch']; this.spacecraftPositionKeys = ['positionX', 'positionY', 'positionZ'];
this.spacecraftOrientationKeys = ['heading', 'roll', 'pitch'];
this.cameraKeys = ['cameraPan', 'cameraTilt']; this.cameraKeys = ['cameraPan', 'cameraTilt'];
this.sunKeys = ['sunOrientation']; this.sunKeys = ['sunOrientation'];
@ -380,7 +395,7 @@ export default {
// unsubscribe from related telemetry // unsubscribe from related telemetry
if (this.relatedTelemetry.hasRelatedTelemetry) { if (this.relatedTelemetry.hasRelatedTelemetry) {
for (let key of this.relatedTelemetry.keys) { for (let key of this.relatedTelemetry.keys) {
if (this.relatedTelemetry[key].unsubscribe) { if (this.relatedTelemetry[key] && this.relatedTelemetry[key].unsubscribe) {
this.relatedTelemetry[key].unsubscribe(); this.relatedTelemetry[key].unsubscribe();
} }
} }
@ -391,7 +406,7 @@ export default {
this.relatedTelemetry = new RelatedTelemetry( this.relatedTelemetry = new RelatedTelemetry(
this.openmct, this.openmct,
this.domainObject, this.domainObject,
[...this.spacecraftKeys, ...this.cameraKeys, ...this.sunKeys] [...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys]
); );
if (this.relatedTelemetry.hasRelatedTelemetry) { if (this.relatedTelemetry.hasRelatedTelemetry) {
@ -466,7 +481,7 @@ export default {
} }
}, },
trackLatestRelatedTelemetry() { trackLatestRelatedTelemetry() {
[...this.spacecraftKeys, ...this.cameraKeys, ...this.sunKeys].forEach(key => { [...this.spacecraftPositionKeys, ...this.spacecraftOrientationKeys, ...this.cameraKeys, ...this.sunKeys].forEach(key => {
if (this.relatedTelemetry[key] && this.relatedTelemetry[key].subscribe) { if (this.relatedTelemetry[key] && this.relatedTelemetry[key].subscribe) {
this.relatedTelemetry[key].subscribe((datum) => { this.relatedTelemetry[key].subscribe((datum) => {
let valueKey = this.relatedTelemetry[key].realtime.valueKey; let valueKey = this.relatedTelemetry[key].realtime.valueKey;

14
src/plugins/imagery/components/RelatedTelemetry/RelatedTelemetry.js
View File

@ -68,12 +68,14 @@ export default class RelatedTelemetry {
await Promise.all( await Promise.all(
this.keys.map(async (key) => { this.keys.map(async (key) => {
if (this[key].historical) { if (this[key]) {
await this._initializeHistorical(key); if (this[key].historical) {
} await this._initializeHistorical(key);
}
if (this[key].realtime && this[key].realtime.telemetryObjectId) { if (this[key].realtime && this[key].realtime.telemetryObjectId) {
await this._intializeRealtime(key); await this._intializeRealtime(key);
}
} }
}) })
); );
@ -153,7 +155,7 @@ export default class RelatedTelemetry {
destroy() { destroy() {
this._openmct.time.off('timeSystem', this._timeSystemChange); this._openmct.time.off('timeSystem', this._timeSystemChange);
for (let key of this.keys) { for (let key of this.keys) {
if (this[key].unsubscribe) { if (this[key] && this[key].unsubscribe) {
this[key].unsubscribe(); this[key].unsubscribe();
} }
} }