ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-27 14:49:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/telemetry-comps' into combined-rodap-stuff

Browse Source
This commit is contained in:
Scott Bell 2024-10-04 11:37:26 +02:00
commit 3cd9e62682
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/api/telemetry/TelemetryCollection.js
View File

@ -73,10 +73,6 @@ export default class TelemetryCollection extends EventEmitter {
this.isStrategyLatest = this.options.strategy === 'latest';
this.dataOutsideTimeBounds = false;
this.modeChanged = false;
console.debug(
`🫙 Created telemetry for ${this.domainObject.name} with bounds ${options.start} and ${options.end}`
);
}
/**
@ -98,7 +94,7 @@ export default class TelemetryCollection extends EventEmitter {
this.lastBounds.end = this.options.end;
}
console.debug(
`🫙 Bounds for collection are start ${this.lastBounds.start} and end ${this.lastBounds.end}`
`🫙 Bounds for collection are start ${new Date(this.lastBounds.start).toISOString()} and end ${new Date(this.lastBounds.end).toISOString()}`
);
this._watchBounds();
this._watchTimeSystem();
@ -144,6 +140,9 @@ export default class TelemetryCollection extends EventEmitter {
* @private
*/
async _requestHistoricalTelemetry() {
console.debug(
`🫙 Requesting historical telemetry with start ${new Date(this.lastBounds.start).toISOString()} and end ${new Date(this.lastBounds.end).toISOString()}}`
);
let options = this.openmct.telemetry.standardizeRequestOptions({ ...this.options });
const historicalProvider = this.openmct.telemetry.findRequestProvider(
this.domainObject,
@ -229,7 +228,6 @@ export default class TelemetryCollection extends EventEmitter {
let hasDataBeforeStartBound = false;
let size = this.options.size;
let enforceSize = size !== undefined && this.options.enforceSize;
console.debug(`🫙 Bounds are telemetry are currently`, this.lastBounds);
// loop through, sort and dedupe
for (let datum of data) {
@ -237,6 +235,13 @@ export default class TelemetryCollection extends EventEmitter {
beforeStartOfBounds = parsedValue < this.lastBounds.start;
afterEndOfBounds = parsedValue > this.lastBounds.end;
if (beforeStartOfBounds) {
console.debug(
`🫙 Datum is before start of bounds: ${new Date(parsedValue).toISOString()} < ${new Date(this.lastBounds.start).toISOString()}`,
this.options
);
}
if (
!afterEndOfBounds &&
(!beforeStartOfBounds || (this.isStrategyLatest && this.openmct.telemetry.greedyLAD()))
@ -348,8 +353,12 @@ export default class TelemetryCollection extends EventEmitter {
this.lastBounds = bounds;
// delete start/end if they are defined in options as we've got new bounds
if (!isTick && startChanged) {
delete this.options.start;
}
if (!isTick && endChanged) {
delete this.options.end;
}
if (isTick) {
if (this.timeKey === undefined) {

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

@ -108,9 +108,9 @@ export default class CompsManager extends EventEmitter {
}
async load(telemetryOptions) {
if (!_.isEqual(telemetryOptions, this.#telemetryOptions) && this.#loaded) {
if (!_.isEqual(telemetryOptions, this.#telemetryOptions)) {
console.debug(
`😩 Reloading comps manager ${this.#domainObject.name} due to telemetry options change`,
`😩 Reloading comps manager ${this.#domainObject.name} due to telemetry options change.`,
telemetryOptions
);
this.#destroy();

3
src/plugins/plot/stackedPlot/StackedPlotItem.vue
View File

@ -250,7 +250,8 @@ export default {
...persistedSeriesConfig.series
}
],
yAxis: persistedSeriesConfig.yAxis
yAxis: persistedSeriesConfig.yAxis,
...this.childObject.configuration
}
},
openmct: this.openmct,