diff --git a/src/api/time/IndependentTimeContext.js b/src/api/time/IndependentTimeContext.js index 9f9edbcc4d2..501afa958e8 100644 --- a/src/api/time/IndependentTimeContext.js +++ b/src/api/time/IndependentTimeContext.js @@ -359,6 +359,18 @@ class IndependentTimeContext extends TimeContext { } } + /** + * @returns {boolean} + * @override + */ + isFixed() { + if (this.upstreamTimeContext) { + return this.upstreamTimeContext.isFixed(...arguments); + } else { + return super.isFixed(...arguments); + } + } + /** * @returns {number} * @override @@ -400,7 +412,7 @@ class IndependentTimeContext extends TimeContext { } /** - * Reset the time context to the global time context + * Reset the time context from the global time context */ resetContext() { if (this.upstreamTimeContext) { @@ -428,6 +440,8 @@ class IndependentTimeContext extends TimeContext { // Emit bounds so that views that are changing context get the upstream bounds this.emit('bounds', this.getBounds()); this.emit(TIME_CONTEXT_EVENTS.boundsChanged, this.getBounds()); + // Also emit the mode in case it's different from previous time context + this.emit(TIME_CONTEXT_EVENTS.modeChanged, this.#copy(this.getMode())); } /** @@ -502,6 +516,8 @@ class IndependentTimeContext extends TimeContext { // Emit bounds so that views that are changing context get the upstream bounds this.emit('bounds', this.getBounds()); this.emit(TIME_CONTEXT_EVENTS.boundsChanged, this.getBounds()); + // Also emit the mode in case it's different from the global time context + this.emit(TIME_CONTEXT_EVENTS.modeChanged, this.#copy(this.getMode())); // now that the view's context is set, tell others to check theirs in case they were following this view's context. this.globalTimeContext.emit('refreshContext', viewKey); } diff --git a/src/api/time/TimeAPI.js b/src/api/time/TimeAPI.js index 3cc2d8b6e10..0ae82e23c1d 100644 --- a/src/api/time/TimeAPI.js +++ b/src/api/time/TimeAPI.js @@ -23,6 +23,7 @@ import { FIXED_MODE_KEY, REALTIME_MODE_KEY } from '@/api/time/constants'; import IndependentTimeContext from '@/api/time/IndependentTimeContext'; +import { TIME_CONTEXT_EVENTS } from './constants'; import GlobalTimeContext from './GlobalTimeContext.js'; /** @@ -142,7 +143,7 @@ class TimeAPI extends GlobalTimeContext { addIndependentContext(key, value, clockKey) { let timeContext = this.getIndependentContext(key); - //stop following upstream time context since the view has it's own + //stop following upstream time context since the view has its own timeContext.resetContext(); if (clockKey) { @@ -152,6 +153,12 @@ class TimeAPI extends GlobalTimeContext { timeContext.setMode(FIXED_MODE_KEY, value); } + // Also emit the mode in case it's different from the previous time context + timeContext.emit( + TIME_CONTEXT_EVENTS.modeChanged, + JSON.parse(JSON.stringify(timeContext.getMode())) + ); + // Notify any nested views to update, pass in the viewKey so that particular view can skip getting an upstream context this.emit('refreshContext', key); diff --git a/src/plugins/plot/MctPlot.vue b/src/plugins/plot/MctPlot.vue index 76815cc53d5..7bf9cf57441 100644 --- a/src/plugins/plot/MctPlot.vue +++ b/src/plugins/plot/MctPlot.vue @@ -537,6 +537,7 @@ export default { this.followTimeContext(); }, followTimeContext() { + this.updateMode(); this.updateDisplayBounds(this.timeContext.getBounds()); this.timeContext.on('modeChanged', this.updateMode); this.timeContext.on('boundsChanged', this.updateDisplayBounds); diff --git a/src/plugins/timeConductor/independent/IndependentTimeConductor.vue b/src/plugins/timeConductor/independent/IndependentTimeConductor.vue index 5ca91492a48..2ff26ee74ef 100644 --- a/src/plugins/timeConductor/independent/IndependentTimeConductor.vue +++ b/src/plugins/timeConductor/independent/IndependentTimeConductor.vue @@ -243,12 +243,20 @@ export default { this.timeContext.off(TIME_CONTEXT_EVENTS.modeChanged, this.setTimeOptionsMode); }, setTimeOptionsClock(clock) { + // If the user has persisted any time options, then don't override them with global settings. + if (this.independentTCEnabled) { + return; + } this.setTimeOptionsOffsets(); this.timeOptions.clock = clock.key; }, setTimeOptionsMode(mode) { - this.setTimeOptionsOffsets(); - this.timeOptions.mode = mode; + // If the user has persisted any time options, then don't override them with global settings. + if (this.independentTCEnabled) { + this.setTimeOptionsOffsets(); + this.timeOptions.mode = mode; + this.isFixed = this.timeOptions.mode === FIXED_MODE_KEY; + } }, setTimeOptionsOffsets() { this.timeOptions.clockOffsets =