From 84b026f0aaa47b7d86e454f2ad354a287608181a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=87=AF?= Date: Thu, 19 Nov 2026 10:44:26 +0800 Subject: [PATCH 1/2] feat(fft): preserve acquisition times in historical results --- .../plugins/fft/bk/BkFftPipeline.java | 2 +- .../plugins/fft/bk/BkFftWindowInput.java | 7 ++++-- .../plugins/fft/bk/BkResultFrames.java | 11 ++++++-- .../plugins/fft/bk/BkSpectrumProcessor.java | 6 +++-- .../fft/measurement/FftResultFrames.java | 8 ++++++ .../fft/measurement/FftWindowBuffer.java | 22 +++++++++++++++- .../fft/spectrum/FftSpectrumProcessor.java | 8 ++++-- .../FftBkFileOutputContractTest.java | 25 +++++++++++++++++++ 8 files changed, 79 insertions(+), 10 deletions(-) diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkFftPipeline.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkFftPipeline.java index 386c807..716df32 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkFftPipeline.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkFftPipeline.java @@ -106,7 +106,7 @@ public static ProcessorPipelineBuilder build(DashboardPipelineContext sourceTime) { double[] nativeInput(int hopLength, boolean completeWindow) { int offset = completeWindow ? 0 : weightedSamples.length - hopLength; return Arrays.copyOfRange(weightedSamples, offset, weightedSamples.length); @@ -65,7 +68,7 @@ void accept(ChannelFrame frame, double[] raw, double[] weighted, Runnable discon offset += copied; if (used == rawSamples.length) { var time = new Time(taskOriginSample, sourceBoundaries[0], sourceBoundaries[rawSamples.length], sourceSampleRate); - try { output.accept(new Window(rawSamples.clone(), weightedSamples.clone(), time)); } + try { output.accept(new Window(rawSamples.clone(), weightedSamples.clone(), time, FftWindowBuffer.sourceTimeAtBoundary(frame, offset))); } finally { used = rawSamples.length - hopLength; System.arraycopy(rawSamples, hopLength, rawSamples, 0, used); diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkResultFrames.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkResultFrames.java index 95e0cb7..1b3c01c 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkResultFrames.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkResultFrames.java @@ -63,6 +63,11 @@ public BkResultFrames(DashboardPipelineContext run, Channe public void publish(Map values, Set planned, boolean paired, double taskTimeMs, int sampleCount, Consumer output) { + publish(values, planned, paired, taskTimeMs, sampleCount, Optional.empty(), output); + } + + public void publish(Map values, Set planned, boolean paired, + double taskTimeMs, int sampleCount, Optional sourceTime, Consumer output) { if (values.isEmpty()) return; Instant publication = Instant.now(); var emitted = new HashSet(); @@ -107,13 +112,15 @@ else if (custom) y = FftCustomUnits.linearValues(code, value == null ? new double[0] : value.x().clone(), y, taskTimeMs, frameStep, rms); ResultFrame targeted = FftResultFrames.target(original, requirement.dashboardResultId()); ResultFrame published; - try { published = targeted.withOutputMetadata(new ResultOutputMetadata(true, outputStep, Optional.of(publication)) + boolean sourceTimed = "FFT Spectrogram".equals(code) && sourceTime.isPresent(); + try { published = targeted.withOutputMetadata(new ResultOutputMetadata(!sourceTimed, outputStep, + sourceTimed ? Optional.empty() : Optional.of(publication)) .withPersistedIndexSampleCount((long) Math.max(1, sampleCount))); } finally { targeted.release(); } if (custom) published = FftCustomUnits.mark(published, FftCustomUnits.unit(code, declaration.unitX(), FftCustomUnits.custom(channel) ? channel.waveformUnit() : "FS", FftCustomUnits.custom(reference) ? reference.waveformUnit() : "FS").resultUnitIdentityY()); - output.accept(published); + output.accept(sourceTimed ? FftResultFrames.stampSourceTime(published, sourceTime) : published); } catch (UnitConversionException unavailable) { // One unavailable Math/display variant does not suppress other selected results. if (!channel.legacyMathSamples() && !custom) throw unavailable; diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkSpectrumProcessor.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkSpectrumProcessor.java index 4abfee8..390c582 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkSpectrumProcessor.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/bk/BkSpectrumProcessor.java @@ -1,5 +1,7 @@ package com.opentest.plugins.fft.bk; +import java.time.Instant; +import java.util.Optional; import java.util.Collection; import java.util.List; import java.util.Map; @@ -19,7 +21,7 @@ /** Stateful BK tasks consume filtered advances, without repeating overlapping samples. */ public final class BkSpectrumProcessor extends Processor { - public record Frame(Map results, Set publishedResults, double taskTimeMs, int sampleCount) { } + public record Frame(Map results, Set publishedResults, double taskTimeMs, int sampleCount, Optional sourceTime) { } private final FftParameters config; private final ChannelMetadata channel; @@ -60,7 +62,7 @@ private void calculate(BkFftWindowInput.Window window) { var completed = tasks.push(samples, readWeighting, Boolean.TRUE.equals(config.fftRmsEnable())); nativePrimed = completed.accepted(); if (!completed.publishedResults().isEmpty()) - context().emit(new Frame(completed.results(), completed.publishedResults(), window.time().taskTimeMs(), completed.sampleCount())); + context().emit(new Frame(completed.results(), completed.publishedResults(), window.time().taskTimeMs(), completed.sampleCount(), window.sourceTime())); } private void resetNative() { diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftResultFrames.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftResultFrames.java index 69fce25..d72d17f 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftResultFrames.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftResultFrames.java @@ -1,6 +1,8 @@ package com.opentest.plugins.fft.measurement; +import java.time.Instant; import java.util.List; +import java.util.Optional; import java.util.Objects; import java.util.function.Consumer; import com.opentest.dashboard.api.capability.UnitConversionException; @@ -38,6 +40,12 @@ public static Consumer indexedOutput(long sampleCount, Consumer sourceTime) { + if (sourceTime.isEmpty()) return frame; + try { return frame.withSourceTimestamp(sourceTime); } + finally { frame.release(); } + } + public static ResultFrame target(ResultFrame frame, Long dashboardResultId) { if (dashboardResultId == null || dashboardResultId <= 0) throw new IllegalArgumentException("FFT output requires a persisted dashboardResultId"); diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftWindowBuffer.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftWindowBuffer.java index ee29747..79424f9 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftWindowBuffer.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/measurement/FftWindowBuffer.java @@ -1,5 +1,7 @@ package com.opentest.plugins.fft.measurement; +import java.time.Instant; +import java.util.Optional; import java.util.function.BiConsumer; import com.opentest.dashboard.api.frame.ChannelFrame; @@ -20,7 +22,25 @@ public FftWindowBuffer(int length, double overlap) { public int length() { return samples.length; } public int hop() { return hop; } + public static Optional sourceTimeAtBoundary(ChannelFrame frame, int offset) { + if (frame.sourceSampleRate() <= 0D || frame.samples().length == 0) return Optional.empty(); + long span = Math.subtractExact(frame.sourceRange().endSampleExclusive(), frame.sourceRange().startSampleInclusive()); + long nanos = Math.round(span * (double) offset / frame.samples().length + / frame.sourceSampleRate() * 1_000_000_000D); + return frame.sourceTimestamp().filter(timestamp -> timestamp.isAfter(Instant.EPOCH)) + .map(timestamp -> timestamp.plusNanos(nanos)); + } + + @FunctionalInterface + public interface TimedWindowConsumer { + void accept(double[] samples, double taskTimeMs, Optional sourceTime); + } + public void accept(ChannelFrame frame, BiConsumer consumer) { + accept(frame, (samples, time, sourceTime) -> consumer.accept(samples, time)); + } + + public void accept(ChannelFrame frame, TimedWindowConsumer consumer) { if (origin != null && (origin != frame.taskOriginSample() || sourceRate != frame.sourceSampleRate())) throw new IllegalArgumentException("FFT source time axis changed during execution"); if (origin != null && previousEnd != frame.sourceRange().startSampleInclusive()) used = 0; @@ -34,7 +54,7 @@ public void accept(ChannelFrame frame, BiConsumer consumer) { double end = frame.sourceRange().startSampleInclusive() + (frame.sourceRange().endSampleExclusive() - frame.sourceRange().startSampleInclusive()) * (double) offset / frame.samples().length; - try { consumer.accept(samples.clone(), (end - origin) * 1000D / sourceRate); } + try { consumer.accept(samples.clone(), (end - origin) * 1000D / sourceRate, sourceTimeAtBoundary(frame, offset)); } finally { used = samples.length - hop; System.arraycopy(samples, hop, samples, 0, used); diff --git a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/spectrum/FftSpectrumProcessor.java b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/spectrum/FftSpectrumProcessor.java index 037b340..094758f 100644 --- a/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/spectrum/FftSpectrumProcessor.java +++ b/plugins/fft-tools/backend/src/main/java/com/opentest/plugins/fft/spectrum/FftSpectrumProcessor.java @@ -1,5 +1,8 @@ package com.opentest.plugins.fft.spectrum; +import java.time.Instant; +import java.util.Optional; + import com.opentest.algorithm.api.AlgorithmService; import com.opentest.algorithm.api.OrdinaryFftOptions; import com.opentest.dashboard.api.channel.ChannelMetadata; @@ -49,7 +52,7 @@ public FftSpectrumProcessor(DashboardPipelineContext sourceTime) { if (!"AUTO".equals(config.timeMode()) && config.splitNum() != null && accumulator.count() >= config.splitNum()) return; var calculated = algorithms.calculateFft(weighting.apply(samples), options); if (calculated.isEmpty()) return; @@ -65,7 +68,8 @@ private void calculate(double[] samples, double time) { var output = FftResultFrames.indexedOutput(sampleCount, context()::emit); double step = windows.hop() * 1000D / channel.sampleRate(); results.spectrum("FFT Spectrum", "FS", x, current.spectrum(), time, step, output); - results.spectrum("FFT Spectrogram", "FS", x, spectrogram, time, step, output); + results.spectrum("FFT Spectrogram", "FS", x, spectrogram, time, step, + frame -> output.accept(FftResultFrames.stampSourceTime(frame, sourceTime))); results.spectrum("Amplitude Spectral Density", "dBFS/√(Hz)", x, current.amplitudeSpectralDensity(), time, step, output); results.spectrum("Power Spectral Density", "dB(FS²/Hz)", x, current.powerSpectralDensity(), time, step, output); } diff --git a/plugins/fft-tools/backend/src/test/java/com/opentest/plugins/fft/measurement/FftBkFileOutputContractTest.java b/plugins/fft-tools/backend/src/test/java/com/opentest/plugins/fft/measurement/FftBkFileOutputContractTest.java index 447e693..3155fa3 100644 --- a/plugins/fft-tools/backend/src/test/java/com/opentest/plugins/fft/measurement/FftBkFileOutputContractTest.java +++ b/plugins/fft-tools/backend/src/test/java/com/opentest/plugins/fft/measurement/FftBkFileOutputContractTest.java @@ -1,10 +1,12 @@ package com.opentest.plugins.fft.measurement; import com.fasterxml.jackson.databind.ObjectMapper; +import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -86,6 +88,29 @@ void explicitAndSharedOperandFilesBindToTheirFrozenOwners(ExecutionInputPurpose fixture.rejectUnrelatedTargets(); } + @Test void spectrogramUsesTheSourceClockWhileSpectrumRetainsPublicationTime() { + var fixture = new Fixture("BASEBAND_PRECISION", ExecutionInputPurpose.CAPTURE_STREAM, false, SignalType.AUDIO, false); + fixture.add("FFT Spectrogram", null); + fixture.add("FFT Spectrum", null); + var stamp = Instant.ofEpochSecond(1_794_312_000L, 123_000_001L); + var results = new BkFftResults.Result(new double[]{100, 200}, new double[]{.25, .5}, null, 0); + var values = Map.of("FFT Spectrogram", results, "FFT Spectrum", results); + var observed = new HashMap>(); + new BkResultFrames(fixture.run(), fixture.channel).publish(values, values.keySet(), false, 50, 2400, + Optional.of(stamp), frame -> { + try { + observed.put(frame.resultCode(), frame.sourceTimestamp()); + if ("FFT Spectrogram".equals(frame.resultCode())) { + assertFalse(frame.outputMetadata().omitRealtimeTaskRelativeTime()); + assertTrue(frame.outputMetadata().publicationTimestamp().isEmpty()); + } else { + assertTrue(frame.outputMetadata().publicationTimestamp().isPresent()); + } + } finally { frame.release(); } + }); + assertEquals(Map.of("FFT Spectrogram", Optional.of(stamp), "FFT Spectrum", Optional.empty()), observed); + } + @Test void rawPairedFramesWithoutGraphicsAreAlsoDeclared() { var fixture = new Fixture("BASEBAND_PRECISION", ExecutionInputPurpose.CAPTURE_STREAM, false, SignalType.AUDIO, false); fixture.add("Auto Spectrum", null); From a82f5c8466257653fdc76dafdf103c49418fef52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=87=AF?= Date: Thu, 19 Nov 2026 18:24:58 -0800 Subject: [PATCH 2/2] fix(fft): forward chart context to absolute time range editor --- .../hooks/__tests__/graphic-unit-refresh.test.ts | 11 ++++++++++- .../measure-workspace/hooks/use-graphic-operation.ts | 4 ++-- .../frontend/src/shared/measure-workspace/index.vue | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/__tests__/graphic-unit-refresh.test.ts b/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/__tests__/graphic-unit-refresh.test.ts index e26a9fe..562f55b 100644 --- a/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/__tests__/graphic-unit-refresh.test.ts +++ b/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/__tests__/graphic-unit-refresh.test.ts @@ -14,7 +14,7 @@ function setup(history = false) { const graphConfigRef = ref({ edit: vi.fn().mockResolvedValue({ affectedGraphicConfigIds: ['graphic-1', 'graphic-2'] }) }) const hook = useGraphicOperation({ graphConfigRef, requestId: ref(history ? 'saved-1' : null), dashboardId: ref('dashboard-1'), refreshPage, refreshSingleGraphicFromList, updateSingleGraphicConfig: vi.fn(), deleteGraphicConfig: vi.fn() }) - return { hook, refreshPage, refreshSingleGraphicFromList } + return { hook, refreshPage, refreshSingleGraphicFromList, edit: graphConfigRef.value.edit } } it('refreshes the current workspace after a Y-axis save reports associated graphics', async () => { @@ -50,3 +50,12 @@ it('forwards the actual workspace context through its runtime lock guard', () => locked.value = true; handle(config, true, context) expect(base).toHaveBeenCalledOnce() }) + + +it('forwards the mounted chart context to the managed settings editor', async () => { + const value = setup(true) + const config = { id: 'graphic-1', graphicType: 7 } + const chartInstance = { timeOriginNs: 1795071049939000000n } + await value.hook.handleEditGraphic(config, chartInstance) + expect(value.edit).toHaveBeenCalledWith(7, { config, chartInstance }) +}) diff --git a/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/use-graphic-operation.ts b/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/use-graphic-operation.ts index 9fb9227..57eb0e6 100644 --- a/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/use-graphic-operation.ts +++ b/plugins/fft-tools/frontend/src/shared/measure-workspace/hooks/use-graphic-operation.ts @@ -35,10 +35,10 @@ export default function useGraphicOperation({ /** * 编辑图谱 */ - const handleEditGraphic = async config => { + const handleEditGraphic = async (config, chartInstance = undefined) => { if (!graphConfigRef.value) return try { - const result = await graphConfigRef.value.edit(config.graphicType, { config }) as GraphicEditResult | null + const result = await graphConfigRef.value.edit(config.graphicType, { config, ...(chartInstance ? { chartInstance } : {}) }) as GraphicEditResult | null const recalculationTaskId = typeof result?.recalculationTaskId === 'string' ? result.recalculationTaskId.trim() : '' diff --git a/plugins/fft-tools/frontend/src/shared/measure-workspace/index.vue b/plugins/fft-tools/frontend/src/shared/measure-workspace/index.vue index e9b57d5..82c49e4 100644 --- a/plugins/fft-tools/frontend/src/shared/measure-workspace/index.vue +++ b/plugins/fft-tools/frontend/src/shared/measure-workspace/index.vue @@ -106,7 +106,7 @@ :recalculating="isGraphicRecalculating(waveFormGraphicConfig.config)" :download-btns="getDownloadOptions(waveFormGraphicConfig.config, isExecuting || isRuntimeLocked)" @download="handleExport" - @config="handleEditGraphic(waveFormGraphicConfig.config)" + @config="(config, chartInstance) => handleEditGraphic(config || waveFormGraphicConfig.config, chartInstance)" @config-changed=" (config, needUpdate, context) => handleConfigChanged(config || waveFormGraphicConfig.config, needUpdate, context) " @@ -150,7 +150,7 @@ :recalculating="isGraphicRecalculating(data.config)" :download-btns="getDownloadOptions(data.config, isExecuting || isRuntimeLocked)" @download="handleExport" - @config="handleEditGraphic(data.config)" + @config="(config, chartInstance) => handleEditGraphic(config || data.config, chartInstance)" @config-changed="(config, needUpdate, context) => handleConfigChanged(config || data.config, needUpdate, context)" /> @@ -1757,9 +1757,9 @@ const isRuntimeLocked = computed(() => { return props.runtimeLocked }) -const handleEditGraphic = config => { +const handleEditGraphic = (config, chartInstance = undefined) => { if (isRuntimeLocked.value) return - return handleBaseEditGraphic(config) + return handleBaseEditGraphic(config, chartInstance) } const handleConfigChanged = (config, needUpdate, context?) => {