ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-16 07:26:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass options on request to underlying collections

Browse Source
This commit is contained in:
Scott Bell 2024-09-24 21:32:56 +02:00
parent ee612a6b5a
commit dfcfa47237
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/comps/CompsManager.js
View File

@ -8,6 +8,7 @@ export default class CompsManager extends EventEmitter {
#telemetryCollections = {};
#dataFrame = {};
#telemetryLoadedPromises = [];
#telemetryOptions = {};
#loaded = false;
#compositionLoaded = false;
#telemetryProcessors = {};
@ -110,8 +111,9 @@ export default class CompsManager extends EventEmitter {
return this.#loaded;
}
async load() {
async load(telemetryOptions) {
if (!this.#compositionLoaded) {
this.#telemetryOptions = telemetryOptions;
await this.#loadComposition();
this.#compositionLoaded = true;
}
@ -206,7 +208,7 @@ export default class CompsManager extends EventEmitter {
this.deleteParameter(keyString);
};
requestUnderlyingTelemetry() {
requestUnderlyingTelemetry(options) {
const underlyingTelemetry = {};
Object.keys(this.#telemetryCollections).forEach((collectionKey) => {
const collection = this.#telemetryCollections[collectionKey];
@ -252,8 +254,10 @@ export default class CompsManager extends EventEmitter {
#addTelemetryObject = (telemetryObject) => {
const keyString = this.#openmct.objects.makeKeyString(telemetryObject.identifier);
this.#telemetryObjects[keyString] = telemetryObject;
this.#telemetryCollections[keyString] =
this.#openmct.telemetry.requestCollection(telemetryObject);
this.#telemetryCollections[keyString] = this.#openmct.telemetry.requestCollection(
telemetryObject,
this.#telemetryOptions
);
this.#telemetryCollections[keyString].on('add', this.#getTelemetryProcessor(keyString));
this.#telemetryCollections[keyString].on('clear', this.clearData);

2
src/plugins/comps/CompsTelemetryProvider.js
View File

@ -61,7 +61,7 @@ export default class CompsTelemetryProvider {
this.#openmct,
this.#compsManagerPool
);
specificCompsManager.load().then(() => {
specificCompsManager.load(options).then(() => {
const callbackID = this.#getCallbackID();
const telemetryForComps = specificCompsManager.requestUnderlyingTelemetry();
const expression = specificCompsManager.getExpression();