From fe22832f44eaf227e9c74bbda80d6310da8a23f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=87=AF?= Date: Thu, 19 Nov 2026 10:44:15 +0800 Subject: [PATCH 1/4] feat(time-axis): add acquisition time display and export support --- .../MeasurementResultFileProjection.java | 3 +- .../com/opentest/service/FileService.java | 64 ++++++++++--- .../service/export/AcquisitionTimeExport.java | 28 ++++++ .../service/export/ChannelCursor.java | 9 ++ .../service/export/GraphicPointCursor.java | 3 + .../export/MemoryGraphicPointCursor.java | 9 ++ .../export/ResultCurvePointCursor.java | 12 ++- .../service/export/ResultCurveReader.java | 40 ++++++++- .../service/export/TimeAxisUnits.java | 2 +- .../export/TimeDomainExportXAxisResolver.java | 21 +++++ .../ProviderReplayDashboardHandler.java | 14 ++- .../FileServiceCsvExportFormatTest.java | 41 +++++++-- .../service/export/ResultCurveReaderTest.java | 27 ++++++ .../monitor/measure/MonitorFftEvent.java | 7 +- .../monitor/measure/MonitorFftProcessor.java | 6 +- .../monitor/measure/MonitorFftProjection.java | 14 ++- .../core/__tests__/chart-box.test.ts | 24 +++++ .../data-graph/components/core/chart-box.vue | 52 ++++++++++- .../components/views/spectrogram-view.vue | 9 +- .../data-graph/hooks/use-axis-context-menu.ts | 12 ++- .../crychart/data-graph/hooks/use-cursor.ts | 4 + .../legacy/__tests__/tdf-chart-step.test.ts | 35 +++++++- .../__tests__/time-history-curve.test.ts | 6 +- .../crychart/legacy/charts/TDFChart.ts | 90 +++++++++++++++++-- .../legacy/charts/TimeHistoryCurve.ts | 5 +- .../legacy/charts/WaveformSingleYAxis.ts | 5 +- .../crychart/legacy/core/BaseChartV2.ts | 23 ++++- .../chart-tools/cursor-view/index.vue | 2 +- .../components/config/unit-view-v3.vue | 4 + .../src/modules/shared/data-graph/types.ts | 5 ++ .../utils/__tests__/time-axis.test.ts | 10 +-- .../data-graph/utils/copy-series-data.ts | 10 ++- .../shared/data-graph/utils/time-axis.ts | 28 +++--- .../report/test-data/acoustic-data.vue | 15 +++- .../components/report/test-data/index.vue | 5 ++ 35 files changed, 563 insertions(+), 81 deletions(-) create mode 100644 apps/backend/crydaq-service/src/main/java/com/opentest/service/export/AcquisitionTimeExport.java diff --git a/apps/backend/crydaq-dashboard-standard-processors/src/main/java/com/opentest/dashboard/standard/result/MeasurementResultFileProjection.java b/apps/backend/crydaq-dashboard-standard-processors/src/main/java/com/opentest/dashboard/standard/result/MeasurementResultFileProjection.java index 25ca8565..c1041ade 100644 --- a/apps/backend/crydaq-dashboard-standard-processors/src/main/java/com/opentest/dashboard/standard/result/MeasurementResultFileProjection.java +++ b/apps/backend/crydaq-dashboard-standard-processors/src/main/java/com/opentest/dashboard/standard/result/MeasurementResultFileProjection.java @@ -64,8 +64,7 @@ public static XYData project(String logicalFileName, ResultFrame frame, ChannelM CrybinBlockMetadata blockMetadata = new CrybinBlockMetadata(); blockMetadata.setTaskRelativeTimeMs(frame.outputMetadata().persistedTaskRelativeTimeMs() == null ? frame.taskRelativeTimeMs() : frame.outputMetadata().persistedTaskRelativeTimeMs()); - if (layout == Layout.CONTINUOUS || (layout == Layout.FRAMED && frame.xStep() != null - && frame.y().length == 1 && blockMetadata.getTaskRelativeTimeMs() != null)) { + if (layout == Layout.CONTINUOUS || layout == Layout.FRAMED) { frame.sourceTimestamp().ifPresent(timestamp -> blockMetadata.setSourceTimestampNanos( Math.addExact(Math.multiplyExact(timestamp.getEpochSecond(), 1_000_000_000L), timestamp.getNano()))); } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/FileService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/FileService.java index 8ea75030..1cc838c2 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/FileService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/FileService.java @@ -149,6 +149,8 @@ import com.opentest.service.component.dashboard.DashboardExecuteStrategyFactory; import com.opentest.service.axis.ExactGraphicBindingResolver; import com.opentest.service.axis.SweepCurveGroupResolver; +import com.opentest.dashboard.api.unit.TimeAxisDisplayUnits; +import com.opentest.service.export.AcquisitionTimeExport; import com.opentest.service.export.ChannelCursor; import com.opentest.service.export.ChannelExportHeaderInfo; import com.opentest.service.export.ChannelGraphicCsvExport; @@ -14308,7 +14310,7 @@ private void writeWorkbookFilesToTarget(FileDownloadDto item, Path targetDir, Fl } int sceneType = ObjectUtil.isNotEmpty(snapshot.getDashboardConfig()) ? SceneTypeEnum.DASHBOARD.getType() : SceneTypeEnum.FLOW.getType(); - if (isTimeDomainExport(graphicConfig)) { + if (isTimeDomainExport(graphicConfig) || isClockSpectrogram(graphicConfig)) { exportCsvTimeDomainPerChannel( item, graphicConfig, @@ -14405,7 +14407,7 @@ private Tuple writeCsvFilesToTarget(FileDownloadDto item, Path targetDir, FlowEx } int sceneType = ObjectUtil.isNotEmpty(snapshot.getDashboardConfig()) ? SceneTypeEnum.DASHBOARD.getType() : SceneTypeEnum.FLOW.getType(); - if (isTimeDomainExport(graphicConfig)) { + if (isTimeDomainExport(graphicConfig) || isClockSpectrogram(graphicConfig)) { return writeTimeDomainCsvFilesToTarget( item, graphicConfig, @@ -14623,6 +14625,7 @@ private Tuple writeTimeDomainCsvFilesToTarget( return new Tuple(0, 0); } + String frequencyUnit = isClockSpectrogram(graphicConfig) ? StrUtil.blankToDefault(graphicConfig.getUnitY(), "Hz") : null; boolean singleSheet = resultCodeInfos.size() == 1; Set writtenFileNames = new HashSet<>(); int successCount = 0; @@ -14673,7 +14676,10 @@ private Tuple writeTimeDomainCsvFilesToTarget( var declared = selection.curveResult != null ? selection.curveResult : declaredCurveFacts(resultCodeInfo.getDashboardResult(), resultCodeInfo.getResultCode(), BooleanUtil.isTrue(resultCodeInfo.getPostProcessFlag()), vchId, snapshot); - if (ResultCurveReader.handles(declared) || ResultCurveSourceFacts.isScalar(declared)) { + if (frequencyUnit != null) { + cursors.add(openSpectrogramCursor(memorySelection, selection, snapshot, url, collectInterval, filterFunc, + item.getPointsType())); + } else if (ResultCurveReader.handles(declared) || ResultCurveSourceFacts.isScalar(declared)) { cursors.add(openDeclaredCurveCursor(declared, memorySelection, selection, url, unitX, filterFunc, item.getPointsType(), snapshot)); } else if (memorySelection != null) { @@ -14728,7 +14734,7 @@ private Tuple writeTimeDomainCsvFilesToTarget( cursorOwnershipTransferred = true; writeTimeDomainCsvFile( - targetFile, channelMetas, cursors, unitX); + targetFile, channelMetas, cursors, unitX, frequencyUnit); successCount++; } catch (Exception artifactFailure) { deleteFailedExportArtifact(targetFile, artifactFailure); @@ -14757,7 +14763,7 @@ private Tuple writeTimeDomainCsvFilesToTarget( private void writeTimeDomainCsvFile(java.nio.file.Path file, List channelMetas, List cursors, - String unitX) throws Exception { + String unitX, String frequencyUnit) throws Exception { try { java.nio.file.Path parent = file.getParent(); if (parent != null) { @@ -14765,7 +14771,7 @@ private void writeTimeDomainCsvFile(java.nio.file.Path file, } List> headers = buildMultiChannelHeaders( - channelMetas, unitX); + channelMetas, unitX, frequencyUnit); try (OutputStream outputStream = Files.newOutputStream(file); OutputStreamWriter outputStreamWriter = new OutputStreamWriter( @@ -14784,10 +14790,12 @@ private void writeTimeDomainCsvFile(java.nio.file.Path file, for (GraphicPointCursor cursor : cursors) { if (cursor != null && cursor.hasNext()) { hasAnyData = true; - row.add(cursor.nextX()); + row.add(TimeAxisDisplayUnits.isClock(unitX) ? exportTimeCell(cursor, unitX) : cursor.nextX()); + if (frequencyUnit != null) row.add(cursor.nextX()); row.add(cursor.nextY()); } else { row.add(null); + if (frequencyUnit != null) row.add(null); row.add(null); } } @@ -14811,6 +14819,26 @@ private void writeTimeDomainCsvFile(java.nio.file.Path file, } } + private boolean isClockSpectrogram(GraphicConfigSnapshotDto graphic) { + return GraphicTypeEnum.TIME_FREQUENCY_SPECTROGRAM.getType().equals(graphic.getGraphicType()) + && TimeAxisDisplayUnits.isClock(graphic.getUnitX()); + } + + private GraphicPointCursor openSpectrogramCursor(MemoryExportSelection memory, ExportFileSelection selection, + FlowExecuteSnapshotDataDto snapshot, String url, Integer collectInterval, + BiFunction filter, Integer pointsType) throws IOException { + var transform = buildExportYDataTransform(selection, snapshot); + return memory != null + ? new MemoryGraphicPointCursor(memory.series, filter, pointsType, collectInterval, transform) + : ChannelCursor.forExactShardFiles(filter, url, resolveResultMatShardNames(selection.getFile()), + pointsType, collectInterval, transform); + } + + private Object exportTimeCell(GraphicPointCursor cursor, String unitX) { + return TimeAxisDisplayUnits.isClock(unitX) + ? AcquisitionTimeExport.format(cursor.nextAcquisitionTimeNanos()) : workbookNumericCellValue(cursor.nextX()); + } + /** * 判断是否为时域数据导出 */ @@ -14918,6 +14946,8 @@ private void exportCsvTimeDomainPerChannel( continue; } String unitX = StrUtil.blankToDefault(graphicConfig.getUnitX(), ""); + String frequencyUnit = isClockSpectrogram(graphicConfig) + ? StrUtil.blankToDefault(graphicConfig.getUnitY(), "Hz") : null; // ===== 1. 为当前 result 收集所有通道的元信息并创建游标 ===== List channelMetas = new ArrayList<>(); @@ -14964,7 +14994,10 @@ private void exportCsvTimeDomainPerChannel( var declared = selection.curveResult != null ? selection.curveResult : declaredCurveFacts(resultCodeInfo.getDashboardResult(), resultCodeInfo.getResultCode(), BooleanUtil.isTrue(resultCodeInfo.getPostProcessFlag()), vchId, snapshot); - if (ResultCurveReader.handles(declared) || ResultCurveSourceFacts.isScalar(declared)) { + if (frequencyUnit != null) { + cursor = openSpectrogramCursor(memorySelection, selection, snapshot, url, collectInterval, + filterFunc, item.getPointsType()); + } else if (ResultCurveReader.handles(declared) || ResultCurveSourceFacts.isScalar(declared)) { cursor = openDeclaredCurveCursor(declared, memorySelection, selection, url, unitX, filterFunc, item.getPointsType(), snapshot); } else if (memorySelection != null) { @@ -15019,7 +15052,7 @@ private void exportCsvTimeDomainPerChannel( WriteSheet writeSheet = EasyExcel.writerSheet(currentSheetName).build(); // 多通道三行表头:通道名称 / X,Y / 单位 - List> headers = buildMultiChannelHeaders(channelMetas, unitX); + List> headers = buildMultiChannelHeaders(channelMetas, unitX, frequencyUnit); excelWriter.write(headers, writeSheet); long headerSize = estimateDataSize(headers); currentFileSize += headerSize; @@ -15036,13 +15069,13 @@ private void exportCsvTimeDomainPerChannel( for (GraphicPointCursor cursor : cursors) { if (cursor != null && cursor.hasNext()) { hasAnyData = true; - double x = cursor.nextX(); - double y = cursor.nextY(); - row.add(workbookNumericCellValue(x)); - row.add(workbookNumericCellValue(y)); + row.add(exportTimeCell(cursor, unitX)); + if (frequencyUnit != null) row.add(workbookNumericCellValue(cursor.nextX())); + row.add(workbookNumericCellValue(cursor.nextY())); } else { // 该通道已结束,占位两列空 row.add(null); + if (frequencyUnit != null) row.add(null); row.add(null); } } @@ -15541,7 +15574,7 @@ private List> createSimpleHeaders(String channelName, String unitX, /** * 创建多通道表头:每个通道占两列 (X,Y) */ - private List> buildMultiChannelHeaders(List metas, String unitX) { + private List> buildMultiChannelHeaders(List metas, String unitX, String frequencyUnit) { List> headers = new ArrayList<>(); // 第一行:通道名称(每个通道两列) @@ -15549,6 +15582,7 @@ private List> buildMultiChannelHeaders(List metas, for (ChannelMetaInfo meta : metas) { channelRow.add(meta.getDisplayName()); channelRow.add(""); + if (frequencyUnit != null) channelRow.add(""); } headers.add(channelRow); @@ -15557,6 +15591,7 @@ private List> buildMultiChannelHeaders(List metas, for (int i = 0; i < metas.size(); i++) { axisRow.add("X"); axisRow.add("Y"); + if (frequencyUnit != null) axisRow.add("Z"); } headers.add(axisRow); @@ -15564,6 +15599,7 @@ private List> buildMultiChannelHeaders(List metas, List unitRow = new ArrayList<>(); for (ChannelMetaInfo meta : metas) { unitRow.add(unitX); + if (frequencyUnit != null) unitRow.add(frequencyUnit); unitRow.add(meta.getUnitY()); } headers.add(unitRow); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/AcquisitionTimeExport.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/AcquisitionTimeExport.java new file mode 100644 index 00000000..0c20e3e7 --- /dev/null +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/AcquisitionTimeExport.java @@ -0,0 +1,28 @@ +package com.opentest.service.export; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Locale; + +public final class AcquisitionTimeExport { + private static final DateTimeFormatter CLOCK = DateTimeFormatter.ofPattern("HH:mm:ss.SSS", Locale.ROOT) + .withZone(ZoneId.systemDefault()); + + private AcquisitionTimeExport() { } + + static long timestamp(Long sourceNanos, double offsetMs) { + if (sourceNanos == null || sourceNanos <= 0 || !Double.isFinite(offsetMs)) return 0L; + double offsetNanos = offsetMs * 1_000_000D; + if (offsetNanos >= Long.MAX_VALUE || offsetNanos <= Long.MIN_VALUE) return 0L; + try { + return Math.addExact(sourceNanos, Math.round(offsetNanos)); + } catch (ArithmeticException overflow) { + return 0L; + } + } + + public static String format(long timestamp) { + return timestamp > 0 ? CLOCK.format(Instant.ofEpochSecond(0, timestamp)) : "—"; + } +} diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ChannelCursor.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ChannelCursor.java index 8e4f0979..bb5cd545 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ChannelCursor.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ChannelCursor.java @@ -46,6 +46,7 @@ public class ChannelCursor implements GraphicPointCursor { private final Integer pointsType; private final YDataTransform yTransformFunction; private final TimeDomainExportXAxisResolver timeDomainXAxisResolver; + private Long currentSourceTimestamp; private int currentShardIndex = 1; private InputStream currentInputStream; @@ -373,6 +374,7 @@ private void loadNextChunk() throws IOException { openNextShard(); return; } + currentSourceTimestamp = blockHeader.getMetadata().getSourceTimestampNanos(); XYData block = currentCrybinReader.readCurrentBlock(currentShardFileName); double[] xRaw = XYDataArraySupport.toDoubleArray(block.getXData()); double[] yRaw = XYDataArraySupport.toDoubleArray(block.getYData()); @@ -467,6 +469,13 @@ public double nextX() { return xChunk[dataIdx]; } + @Override + public long nextAcquisitionTimeNanos() { + if (!hasNext()) throw new NoSuchElementException("No more data"); + return timeDomainXAxisResolver == null ? AcquisitionTimeExport.timestamp(currentSourceTimestamp, 0D) + : timeDomainXAxisResolver.acquisitionTime(xChunk[filteredIndices[chunkPos]]); + } + public double nextY() { if (!hasNext()) { throw new NoSuchElementException("No more data"); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/GraphicPointCursor.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/GraphicPointCursor.java index 49ec2a02..723a5e23 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/GraphicPointCursor.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/GraphicPointCursor.java @@ -12,6 +12,9 @@ public interface GraphicPointCursor extends AutoCloseable { double nextY(); + /** Exact epoch nanoseconds for the current point, or zero if unavailable. Does not advance. */ + default long nextAcquisitionTimeNanos() { return 0L; } + XYData.Metadata getCurrentMetadata(); @Override diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/MemoryGraphicPointCursor.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/MemoryGraphicPointCursor.java index d8f79481..b5c346c7 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/MemoryGraphicPointCursor.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/MemoryGraphicPointCursor.java @@ -24,6 +24,7 @@ public final class MemoryGraphicPointCursor implements GraphicPointCursor { private final Integer collectInterval; private final ChannelCursor.YDataTransform yTransform; private final TimeDomainExportXAxisResolver timeDomainXAxisResolver; + private Long currentSourceTimestamp; private List chunks; private int chunkIndex; private long globalPointIndex; @@ -122,6 +123,13 @@ public double nextX() { return xChunk[filteredIndices[chunkPosition]]; } + @Override + public long nextAcquisitionTimeNanos() { + if (!hasNext()) throw new NoSuchElementException("No more data"); + return timeDomainXAxisResolver == null ? AcquisitionTimeExport.timestamp(currentSourceTimestamp, 0D) + : timeDomainXAxisResolver.acquisitionTime(xChunk[filteredIndices[chunkPosition]]); + } + @Override public double nextY() { if (!hasNext()) { @@ -151,6 +159,7 @@ private void loadNextChunk() { chunk.getYData()) == 0) { continue; } + currentSourceTimestamp = chunk.getBlockMetadata() == null ? null : chunk.getBlockMetadata().getSourceTimestampNanos(); currentMetadata = chunk.getMetadata() == null ? new XYData.Metadata() : chunk.getMetadata(); yChunk = toDoubleArray(chunk.getYData()); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurvePointCursor.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurvePointCursor.java index efc95f54..a055ded7 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurvePointCursor.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurvePointCursor.java @@ -59,19 +59,29 @@ private ResultCurveReader.Block readSelectionFrame() throws IOException { } int count = (int) first.framePointCount(); double[] xs = new double[count], ys = new double[count]; + long[] acquisitionTimes = null; ResultCurveReader.Block part = first; while (true) { if (part == null || part.frameId() != first.frameId()) throw new IOException("Incomplete logical selection frame"); System.arraycopy(part.x(), 0, xs, (int) part.sampleOffset(), part.x().length); System.arraycopy(part.y(), 0, ys, (int) part.sampleOffset(), part.y().length); + if (part.acquisitionTimes() != null) { + if (acquisitionTimes == null) acquisitionTimes = new long[count]; + System.arraycopy(part.acquisitionTimes(), 0, acquisitionTimes, (int) part.sampleOffset(), part.x().length); + } if (part.last()) break; part = reader.read(pageSize); } return new ResultCurveReader.Block(xs, ys, first.sourceMetadata(), first.step(), first.frameId(), - 0, count, true, true); + 0, count, true, true, null, acquisitionTimes); } @Override public double nextX() { if (!hasNext()) throw new NoSuchElementException(); return block.x()[indices[position]]; } + @Override public long nextAcquisitionTimeNanos() { + if (!hasNext()) throw new NoSuchElementException(); + return block.acquisitionTimes() == null ? 0L : block.acquisitionTimes()[indices[position]]; + } + @Override public double nextY() { if (!hasNext()) throw new NoSuchElementException(); return y[indices[position++]]; } @Override public XYData.Metadata getCurrentMetadata() { return block == null ? null : block.sourceMetadata(); } private void closeAfterFailure(Throwable original) { diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurveReader.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurveReader.java index eabb4814..270d2f48 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurveReader.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/ResultCurveReader.java @@ -2,6 +2,7 @@ import com.opentest.common.model.dto.algorithm.TaskSampleTime; import com.opentest.common.enums.PostProcessTypeEnum; +import com.opentest.dashboard.api.unit.TimeAxisDisplayUnits; import java.io.InterruptedIOException; import com.opentest.platform.file.XYData; import com.opentest.platform.file.crybin.CrybinBlockMetadata; @@ -63,7 +64,11 @@ public record DiskSource(String fileSystemUrl, List shardNames) { public record Description(FrozenResult result, String unitX, FrameSemantics frameSemantics, String axisMeaning) { } public record Block(double[] x, double[] y, XYData.Metadata sourceMetadata, Double step, - long frameId, long sampleOffset, long framePointCount, boolean first, boolean last, double[] aggregateY) { + long frameId, long sampleOffset, long framePointCount, boolean first, boolean last, double[] aggregateY, long[] acquisitionTimes) { + public Block(double[] x, double[] y, XYData.Metadata sourceMetadata, Double step, + long frameId, long sampleOffset, long framePointCount, boolean first, boolean last, double[] aggregateY) { + this(x, y, sourceMetadata, step, frameId, sampleOffset, framePointCount, first, last, aggregateY, null); + } public Block(double[] x, double[] y, XYData.Metadata sourceMetadata, Double step, long frameId, long sampleOffset, long framePointCount, boolean first, boolean last) { this(x, y, sourceMetadata, step, frameId, sampleOffset, framePointCount, first, last, null); @@ -87,6 +92,7 @@ public double[] convertY(ChannelCursor.YDataTransform converter) throws IOExcept private final PostProcessCurveContract postProcess; private final TaskCurveContract task; private boolean ended; + private double completeTaskFrameStart; private ResultCurveReader(FrozenResult result, CurveSource source, String targetUnit, boolean singleFrame, long pointCount) throws IOException { this.source = source; @@ -149,7 +155,7 @@ public Block read(int maxPoints) throws IOException { ended = true; source.close(); return null; } - return switch (description.frameSemantics()) { + Block block = switch (description.frameSemantics()) { case ALGORITHM_RESPONSE -> NativeResponseCurveContract.normalize(segment, scale); case SCOPE_WINDOW -> ScopeWindowCurveContract.normalize(segment, scale); case SAMPLED_WAVEFORM -> new Block(segment.x(), segment.y(), segment.metadata(), @@ -165,6 +171,7 @@ yield new Block(axis.x(), segment.y(), segment.metadata(), axis.step(), segment. segment.offset() + axis.x().length == segment.yCount()); } }; + return attachAcquisitionTimes(segment, block); } catch (IOException | RuntimeException | Error failure) { ended = true; try { source.close(); } catch (Throwable cleanup) { if (cleanup != failure) failure.addSuppressed(cleanup); } @@ -172,5 +179,34 @@ yield new Block(axis.x(), segment.y(), segment.metadata(), axis.step(), segment. } } + private Block attachAcquisitionTimes(CurveSource.Segment segment, Block block) throws IOException { + Long source = segment.blockMetadata().getSourceTimestampNanos(); + if (!TimeAxisDisplayUnits.isClock(description.unitX()) || source == null || source <= 0) return block; + double start; + switch (description.frameSemantics()) { + case SAMPLED_WAVEFORM, CONTINUOUS_WAVEFORM, PUBLISHED_WAVEFORM -> { + if (block.step() == null) return block; + start = block.x()[0] - segment.offset() * block.step(); + } + case COMPLETE_TASK_CURVE -> { + if (segment.offset() == 0) completeTaskFrameStart = block.x()[0]; + start = completeTaskFrameStart; + } + case TASK_POINTS -> { + Double taskMs = segment.blockMetadata().getTaskRelativeTimeMs(); + if (taskMs == null) return block; + start = taskMs / TimeAxisUnits.millisecondsPerUnit(description.unitX()); + } + default -> { return block; } + } + double millisecondsPerUnit = TimeAxisUnits.millisecondsPerUnit(description.unitX()); + long[] times = new long[block.x().length]; + for (int index = 0; index < times.length; index++) { + times[index] = AcquisitionTimeExport.timestamp(source, (block.x()[index] - start) * millisecondsPerUnit); + } + return new Block(block.x(), block.y(), block.sourceMetadata(), block.step(), block.frameId(), + block.sampleOffset(), block.framePointCount(), block.first(), block.last(), block.aggregateY(), times); + } + @Override public void close() throws IOException { ended = true; source.close(); } } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeAxisUnits.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeAxisUnits.java index 06a4f27d..83a9158f 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeAxisUnits.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeAxisUnits.java @@ -10,7 +10,7 @@ public final class TimeAxisUnits { private static final Map MILLISECONDS = Map.of( UnitEnum.SECOND.getCode(), 1000D, UnitEnum.MILLISECOND.getCode(), 1D, UnitEnum.MICROSECOND.getCode(), 0.001D, UnitEnum.MINUTE.getCode(), 60000D, - UnitEnum.HOUR.getCode(), 3600000D, TimeAxisDisplayUnits.CLOCK, 1000D); + UnitEnum.HOUR.getCode(), 3600000D, TimeAxisDisplayUnits.CLOCK, 1000D, "hms", 1000D); private TimeAxisUnits() { } public static boolean convertible(String source, String target) { return source != null && target != null && MILLISECONDS.containsKey(source) && MILLISECONDS.containsKey(target); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeDomainExportXAxisResolver.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeDomainExportXAxisResolver.java index 9dc3f3e0..58fd7cd7 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeDomainExportXAxisResolver.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/TimeDomainExportXAxisResolver.java @@ -3,6 +3,7 @@ import com.opentest.platform.file.crybin.CrybinBlockHeader; import com.opentest.platform.file.crybin.CrybinBlockMetadata; import com.opentest.platform.file.XYData; +import com.opentest.dashboard.api.unit.TimeAxisDisplayUnits; import java.io.IOException; @@ -15,6 +16,9 @@ final class TimeDomainExportXAxisResolver { private final double outputMillisecondsPerUnit; private final double sourceMillisecondsPerUnit; private final Double formalWaveformSamplingRate; + private final boolean clock; + private Long blockSourceNanos; + private double blockStartMs; private long waveformSamples; private Double previousPointTimeMs; @@ -27,6 +31,7 @@ final class TimeDomainExportXAxisResolver { } TimeDomainExportXAxisResolver(String unitX, Double formalWaveformSamplingRate, String sourceUnitX) throws IOException { + this.clock = TimeAxisDisplayUnits.isClock(unitX); this.outputMillisecondsPerUnit = TimeAxisUnits.millisecondsPerUnit(unitX); this.sourceMillisecondsPerUnit = TimeAxisUnits.millisecondsPerUnit(sourceUnitX == null ? "ms" : sourceUnitX); if (formalWaveformSamplingRate != null @@ -53,7 +58,9 @@ final class TimeDomainExportXAxisResolver { if (yData == null || yData.length == 0) { throw new IOException("Time-domain export block has no Y data"); } + blockSourceNanos = clock && blockMetadata != null ? blockMetadata.getSourceTimestampNanos() : null; if (formalWaveformSamplingRate != null) { + blockStartMs = waveformSamples * 1000D / formalWaveformSamplingRate; return resolveWaveform(yData.length); } if (xData == null || xData.length != yData.length) { @@ -61,6 +68,15 @@ final class TimeDomainExportXAxisResolver { } Double blockTimeMs = blockMetadata == null ? null : blockMetadata.getTaskRelativeTimeMs(); + if (!isFiniteNonNegative(blockTimeMs) && clock && explicitX) { + // Older explicit curves may have a relative X axis but no acquisition metadata. + blockSourceNanos = null; + double[] result = new double[xData.length]; + for (int index = 0; index < xData.length; index++) { + result[index] = fromMilliseconds(xData[index] * sourceMillisecondsPerUnit); + } + return result; + } if (!isFiniteNonNegative(blockTimeMs)) { throw new IOException( "Time-domain export requires a finite non-negative taskRelativeTimeMs"); @@ -74,6 +90,7 @@ final class TimeDomainExportXAxisResolver { "Time-domain export local X must start at zero"); } + blockStartMs = blockTimeMs; double[] result = new double[xData.length]; Double previousLocalTimeMs = null; for (int index = 0; index < xData.length; index++) { @@ -123,6 +140,10 @@ void validateWaveformSamplingRate(XYData.Metadata metadata) throws IOException { } } + long acquisitionTime(double x) { + return AcquisitionTimeExport.timestamp(blockSourceNanos, x * outputMillisecondsPerUnit - blockStartMs); + } + private double fromMilliseconds(double value) { return value / outputMillisecondsPerUnit; } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/replay/ProviderReplayDashboardHandler.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/replay/ProviderReplayDashboardHandler.java index 44c890aa..b4faa464 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/replay/ProviderReplayDashboardHandler.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/grpc/replay/ProviderReplayDashboardHandler.java @@ -131,10 +131,16 @@ private void accept(ChannelDto channel,CaptureData capture) { long end=time==null?start+capture.getData().length:time.getSourceEndSampleExclusive(); long origin=time==null?origins.computeIfAbsent(id,ignored->start):time.getTaskOriginSample(); origins.putIfAbsent(id,origin);nextSamples.put(id,end); - Optional timestamp=capture.getTimestamp()<=0?Optional.empty():Optional.of(Instant.ofEpochSecond( - Math.floorDiv(capture.getTimestamp(),1_000_000_000L),Math.floorMod(capture.getTimestamp(),1_000_000_000L))); - pipeline.accept(ChannelFrame.of(metadata,capture.getData().clone(),origin,new SourceSampleRange(start,end), - time==null?metadata.sampleRate():time.getSourceSamplingRate(),timestamp)); + // WAV replay timestamps are offsets used for alignment. Only captured stamps carry an epoch. + Optional alignment = replayInstant(capture.getTimestamp()); + Optional source = replayInstant(capture.getSourceTimestampNanos()); + pipeline.accept(ChannelFrame.captured(metadata, capture.getData().clone(), null, origin, + new SourceSampleRange(start, end), time == null ? metadata.sampleRate() : time.getSourceSamplingRate(), + source, Optional.empty(), alignment)); + } + + private static Optional replayInstant(Long nanos) { + return nanos == null || nanos <= 0 ? Optional.empty() : Optional.of(Instant.ofEpochSecond(0, nanos)); } @Override protected long recordedProgressMillis(long rawMillis) { return progressTime.applyAsLong(rawMillis); } @Override protected void closeRuntimeResourcesForStop() { diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/FileServiceCsvExportFormatTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/FileServiceCsvExportFormatTest.java index 5cfef413..07432074 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/FileServiceCsvExportFormatTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/FileServiceCsvExportFormatTest.java @@ -29,6 +29,8 @@ import org.junit.jupiter.api.io.TempDir; import org.springframework.test.util.ReflectionTestUtils; +import java.time.LocalDate; +import java.time.ZoneId; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -249,6 +251,24 @@ void exportCsvWithSplitShouldUseResultSetDisplayNameForSheet(String unit) throws assertFalse(workbookXml.contains("name=\"" + sheetKey + "\"")); } + @Test + void clockSpectrogramCsvKeepsFrequencyAndMissingAcquisitionTime() throws Exception { + var service = new FileService(); + var cursor = mock(ChannelCursor.class); + when(cursor.hasNext()).thenReturn(true, true, false); + long midnight = LocalDate.of(2026, 11, 10).atStartOfDay(ZoneId.systemDefault()).toEpochSecond(); + when(cursor.nextAcquisitionTimeNanos()).thenReturn(midnight * 1_000_000_000L + 123_000_001L, 0L); + when(cursor.nextX()).thenReturn(100.0, 200.0); + when(cursor.nextY()).thenReturn(0.5, 0.7); + + var file = tempDir.resolve("spectrogram.csv"); + ReflectionTestUtils.invokeMethod(service, "writeTimeDomainCsvFile", file, + List.of(new ChannelMetaInfo("Ch1", "Ch1", "FS")), List.of(cursor), "h:m:s", "Hz"); + + assertEquals(List.of("Ch1,,", "X,Y,Z", "h:m:s,Hz,FS", "00:00:00.123,100.0,0.5", "—,200.0,0.7"), + readUtf8Csv(file).lines().toList()); + } + @Test void writeTimeDomainCsvFileShouldAlignChannelsByLongestCursorAndLeaveTailEmpty() throws Exception { FileService service = new FileService(); @@ -272,7 +292,7 @@ void writeTimeDomainCsvFileShouldAlignChannelsByLongestCursorAndLeaveTailEmpty() csvFile, channelMetas, Arrays.asList(ch1, ch2), - "s"); + "s", null); String[] lines = readUtf8Csv(csvFile).split("\\r?\\n"); assertEquals("Ch1,,Ch2,", lines[0]); @@ -354,8 +374,9 @@ void timeDomainWorkbookShouldPropagateMemoryCursorInitializationFailure() assertEquals("existing workbook", Files.readString(existingTarget)); } - @Test - void timeDomainWorkbookShouldExportTaskRelativeTimeInSeconds() + @ParameterizedTest + @ValueSource(strings = {"s", "h:m:s"}) + void timeDomainWorkbookExportsRelativeSecondsOrAcquisitionClock(String unitX) throws Exception { FileService service = new FileService(); ReflectionTestUtils.setField( @@ -380,7 +401,7 @@ void timeDomainWorkbookShouldExportTaskRelativeTimeInSeconds() resultCode.setDashboardResult(dashboardResult); GraphicConfigSnapshotDto graphic = new GraphicConfigSnapshotDto(); graphic.setId(10L); - graphic.setUnitX("s"); + graphic.setUnitX(unitX); graphic.setResultCodes(Collections.singletonList(resultCode)); DashboardExportRequirement requirement = @@ -402,6 +423,8 @@ void timeDomainWorkbookShouldExportTaskRelativeTimeInSeconds() metadata.setXStep(200D); CrybinBlockMetadata firstBlock = new CrybinBlockMetadata(); firstBlock.setTaskRelativeTimeMs(200D); + long midnight = LocalDate.of(2026, 11, 10).atStartOfDay(ZoneId.systemDefault()).toEpochSecond(); + firstBlock.setSourceTimestampNanos(midnight * 1_000_000_000L + 123_000_001L); CrybinBlockMetadata secondBlock = new CrybinBlockMetadata(); secondBlock.setTaskRelativeTimeMs(400D); dataContext.addChunk( @@ -433,11 +456,17 @@ void timeDomainWorkbookShouldExportTaskRelativeTimeInSeconds() String worksheetXml = readZipEntry( tempDir.resolve("time-result.xlsx"), "xl/worksheets/sheet1.xml"); - assertTrue(worksheetXml.contains("0.2")); - assertTrue(worksheetXml.contains("0.4")); String sharedStringsXml = readZipEntry( tempDir.resolve("time-result.xlsx"), "xl/sharedStrings.xml"); + if ("s".equals(unitX)) { + assertTrue(worksheetXml.contains("0.2")); + assertTrue(worksheetXml.contains("0.4")); + } else { + assertTrue(worksheetXml.contains("00:00:00.123") || sharedStringsXml.contains("00:00:00.123"), + () -> worksheetXml + sharedStringsXml); + assertTrue(worksheetXml.contains("—") || sharedStringsXml.contains("—")); + } assertTrue(worksheetXml.contains("NaN") || sharedStringsXml.contains("NaN")); } diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/export/ResultCurveReaderTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/export/ResultCurveReaderTest.java index 8657f5c0..cad38d03 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/export/ResultCurveReaderTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/export/ResultCurveReaderTest.java @@ -25,6 +25,33 @@ class ResultCurveReaderTest { @TempDir Path directory; + @Test void clockWaveformUsesEachBlocksExactSourceStampAcrossPagesAndGaps() throws Exception { + var metadata = metadata(); + metadata.setSamplingRate(1000D); + metadata.setXStep(1D); + long firstStamp = 1_794_312_000_250_123_456L; + var first = block(3); + first.setSourceTimestampNanos(firstStamp); + var missing = block(4); + var later = block(5); + long laterStamp = firstStamp + 2_000_000_000L; + later.setSourceTimestampNanos(laterStamp); + write("wave_1.crybin", null, new double[]{1, 2, 3}, metadata, first); + write("wave_2.crybin", null, new double[]{4}, metadata, missing); + write("wave_3.crybin", null, new double[]{5}, metadata, later); + var frozen = facts("SAMPLED_WAVEFORM", "ms").withSamplingFacts( + new ResultCurveReader.SamplingFacts(1000D, 0, 5)); + var source = new ResultCurveReader.DiskSource("local://" + directory, + List.of("wave_1.crybin", "wave_2.crybin", "wave_3.crybin")); + try (var cursor = new ResultCurvePointCursor(ResultCurveReader.open(frozen, source, "h:m:s"), 2, null)) { + for (long expected : new long[]{firstStamp, firstStamp + 1_000_000L, firstStamp + 2_000_000L, 0L, laterStamp}) { + assertEquals(expected, cursor.nextAcquisitionTimeNanos()); + cursor.nextY(); + } + assertFalse(cursor.hasNext()); + } + } + @Test void nativeNegativeDuplicateXRemainsOrderedAcrossMemoryAndRealCrybinPages() throws Exception { double[] x = {-0.003, -0.001, -0.001, 0.004}; double[] y = {1, 2, 3, 4}; XYData.Metadata metadata = metadata(); diff --git a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftEvent.java b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftEvent.java index 3392871b..41a74468 100644 --- a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftEvent.java +++ b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftEvent.java @@ -1,14 +1,17 @@ package com.opentest.plugins.monitor.measure; +import java.time.Instant; import java.util.List; +import java.util.Optional; import com.opentest.dashboard.api.frame.CaptureClock; import com.opentest.algorithm.api.FftResult; /** Plugin-private window/batch boundary; spectrum arrays are owned by this completed calculation. */ sealed interface MonitorFftEvent { String vchId(); - record Window(String vchId,FftResult values,double endMs,double stepMs,int sampleCount,CaptureClock clock) implements MonitorFftEvent { - Window(String vchId,FftResult values,double endMs,double stepMs,int sampleCount){this(vchId,values,endMs,stepMs,sampleCount,null);} + record Window(String vchId,FftResult values,double endMs,double stepMs,int sampleCount, + CaptureClock clock, Optional sourceEndTime) implements MonitorFftEvent { + Window(String vchId,FftResult values,double endMs,double stepMs,int sampleCount){this(vchId,values,endMs,stepMs,sampleCount,null,Optional.empty());} } record InputBatch(String vchId,List windows,double sourceBatchMillis) implements MonitorFftEvent { InputBatch(String vchId,List windows){this(vchId,windows,windows.isEmpty()?0D:windows.getLast().endMs());} diff --git a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProcessor.java b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProcessor.java index f5e5612a..8287dffe 100644 --- a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProcessor.java +++ b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProcessor.java @@ -1,5 +1,6 @@ package com.opentest.plugins.monitor.measure; +import java.time.Instant; import java.util.ArrayList; import com.opentest.algorithm.api.AlgorithmService; import com.opentest.algorithm.api.SignalAlgorithmService; @@ -29,7 +30,10 @@ final class MonitorFftProcessor extends Processor @Override public void onFrame(ChannelFrame input){ var completed=new ArrayList(); windows.acceptTimed(input,(values,end,step,clock)->{ - var window=new MonitorFftEvent.Window(channel.vchId(),values,end,step,parameters.fftLength(),clock); + long offset = clock.sourceRange().endSampleExclusive() - input.sourceRange().startSampleInclusive(); + var sourceEnd = input.sourceTimestamp().filter(time -> time.isAfter(Instant.EPOCH)) + .map(time -> time.plusNanos(Math.round(offset * 1_000_000_000D / input.sourceSampleRate()))); + var window=new MonitorFftEvent.Window(channel.vchId(),values,end,step,parameters.fftLength(),clock,sourceEnd); completed.add(window);context().emit(window); }); if(recorded||!completed.isEmpty())context().emit(new MonitorFftEvent.InputBatch(channel.vchId(),completed, diff --git a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProjection.java b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProjection.java index 5789db7d..f7d020cf 100644 --- a/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProjection.java +++ b/apps/backend/opentest-monitor-tools/src/main/java/com/opentest/plugins/monitor/measure/MonitorFftProjection.java @@ -25,9 +25,17 @@ final class MonitorFftProjection extends Processor window.values().frequencies().clone(),values,window.endMs(),window.stepMs(),Boolean.TRUE.equals(parameters.fftRmsEnable())); try { var targeted=raw.withDashboardResultId(result.dashboardResultId()); - try {context().emit(targeted.withOutputMetadata(targeted.outputMetadata().withResultUnitIdentityY(MonitorUnits.identity(result.resultCode(), channel)) - .withPersistedIndexSampleCount((long) window.sampleCount())));} - finally{targeted.release();} + try { + var indexed = targeted.withOutputMetadata(targeted.outputMetadata() + .withResultUnitIdentityY(MonitorUnits.identity(result.resultCode(), channel)) + .withPersistedIndexSampleCount((long) window.sampleCount())); + if ("FFT Spectrogram".equals(result.resultCode()) && window.sourceEndTime().isPresent()) { + try { context().emit(indexed.withSourceTimestamp(window.sourceEndTime())); } + finally { indexed.release(); } + } else { + context().emit(indexed); + } + } finally { targeted.release(); } } finally {raw.release();} } diff --git a/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/__tests__/chart-box.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/__tests__/chart-box.test.ts index 4627282d..68feb623 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/__tests__/chart-box.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/__tests__/chart-box.test.ts @@ -1078,6 +1078,30 @@ describe('ChartBox context menu', () => { ) }) + it('keeps the X-axis context menu available for multi-Y waveforms', async () => { + const xAxis = createInteractiveAxis() + const yAxis = createInteractiveAxis() + const wrapper = mountGraphBox({ + config: { + ...createConfigWithAxes(), + graphicType: 99 + }, + chartInstance: { + chart: createChartWithLayout(), + getDefaultAxisX: () => xAxis, + getDefaultAxisY: () => yAxis + } + }) + await flushPromises() + + expect(wrapper.find('.chart-box-left-content').classes()).toContain('show-axis-x') + expect(xAxis.addEventListener).toHaveBeenCalledWith('contextmenu', expect.any(Function)) + expect(yAxis.addEventListener).not.toHaveBeenCalledWith('contextmenu', expect.any(Function)) + + wrapper.unmount() + expect(xAxis.removeEventListener).toHaveBeenCalledWith('contextmenu', expect.any(Function)) + }) + it('uses the shared Y-axis system setting for YRight axis label visibility when enabled', () => { localStorage.setItem( STORAGE_ITEM_KEY_GRAPH_DISPLAY_SETTINGS, diff --git a/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/chart-box.vue b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/chart-box.vue index 86b787f6..e3b2fcc9 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/chart-box.vue +++ b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/core/chart-box.vue @@ -157,6 +157,9 @@ diff --git a/apps/frontend/src/modules/test/components/report/test-data/index.vue b/apps/frontend/src/modules/test/components/report/test-data/index.vue index dd61ba24..384cbde1 100644 --- a/apps/frontend/src/modules/test/components/report/test-data/index.vue +++ b/apps/frontend/src/modules/test/components/report/test-data/index.vue @@ -42,6 +42,7 @@ + + + + diff --git a/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.test.ts b/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.test.ts index 1a4db823..e4867a25 100644 --- a/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.test.ts +++ b/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.test.ts @@ -7,7 +7,8 @@ vi.mock('@/utils/index', () => ({ translate: key => key })) -vi.mock('@/constants/chart', () => ({ +vi.mock('@/constants/chart', async importOriginal => ({ + ...await importOriginal(), GRAPHIC_TYPE_ENUM: { WAVEFORM: 0, FREQUENCY_DOMAIN_HISTOGRAM: 1, @@ -189,6 +190,7 @@ function mountAxisView(modelValue, type = AXIS_TYPE_ENUM.X, config = {}, systemS ElInput: InputTextStub, ElCheckbox: CheckboxStub, DcSimpleSelect: SimpleSelectStub, + AxisRangeInput: RangeInputStub, DcRangeInput: RangeInputStub, DcInputNumber: InputNumberStub, DcGradientColor: passthrough('DcGradientColor') @@ -245,6 +247,19 @@ describe('AxisView system settings', () => { vi.unstubAllGlobals() }) + it('allows a fixed clock range to return to auto when the clock mapping is no longer invertible', async () => { + const value: DataGraphAxisConfig = { unit: 'h:m:s', autoScale: false, useSystemSettings: false, + absoluteTimeRange: { startNs: '1795071049939000000', endNs: '1795071050939000000' } } + const wrapper = mountAxisView(value, AXIS_TYPE_ENUM.X, {}, true, { chartInstance: { + timeOriginNs: 1795071049939000000n, getAcquisitionTimeMapping: () => undefined + } }) + const auto = wrapper.findAll('.el-checkbox-stub').find(item => item.text().includes('chart.config.autoScale')) + expect(auto.attributes('data-disabled')).not.toBe('true') + await auto.trigger('click') + expect(value.autoScale).toBe(true) + wrapper.unmount() + }) + it('shows the system axis value in a disabled Show Label checkbox', async () => { const modelValue: DataGraphAxisConfig = { useDefault: true, @@ -717,6 +732,16 @@ describe('AxisView system settings', () => { }) describe('Scope X range editing', () => { + it('edits seconds in the settings form while storing raw milliseconds', async () => { + const model = { unit: 's', autoScale: false, start: 1000, end: 3000 } + const wrapper = mountAxisView(model) + expect(wrapper.get('.DcRangeInput-stub').attributes('data-end')).toBe('3') + wrapper.findComponent(RangeInputStub).vm.$emit('update:end', 4) + await nextTick() + expect(model.end).toBe(4000) + wrapper.unmount() + }) + it.each(['raw', undefined] as const)( 'captures the cycle start and saves raw endpoints (stored format: %s)', async coordinate => { diff --git a/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.vue b/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.vue index 1236ab24..78068c63 100644 --- a/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.vue +++ b/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.vue @@ -78,7 +78,7 @@ :rules="rangeValidationRules" class="chart-form__range-panel" > -
+
+ - + {{ $t('chart.config.autoScale') }}
@@ -217,6 +221,10 @@ import { computed, ref, shallowRef, watch } from 'vue' import { translate } from '@/utils' import { formatAxisRangeInput } from '@/utils/value-formatter' import AxisRangeInput from './axis-range-input.vue' +import AxisTimeInput from './axis-time-input.vue' +import { isClockUnit } from '../../utils/time-axis' +import { captureAbsoluteTimeRange, getTimeAxisMapping, projectAbsoluteTimeRange, validAbsoluteTimeRange, type TimeAxisMapping } from '../../utils/time-axis-range' +import { resolveAxisXValueType, toAxisDisplayX, toAxisRawX } from '../../utils/axis-value-conversion' import MultipleAxisSetting from '@/modules/shared/data-graph/components/config/multiple-axis-setting.vue' import { GRAPHIC_TYPE_ENUM } from '@/constants/chart' import { @@ -261,9 +269,10 @@ const useAxisEndpoint = (field: 'start' | 'end') => computed({ get: () => { const raw = toNumericAxisValue(formData.value[field]) - return raw === null || formData.value.timeCoordinateSystem !== 'raw' + const mapped = raw === null || formData.value.timeCoordinateSystem !== 'raw' ? raw : (editingXMapping.value?.toDisplay(raw) ?? raw) + return props.type === AXIS_TYPE_ENUM.X && mapped !== null ? Number(toAxisDisplayX(mapped, xValueType.value)) : mapped }, set: value => { const mapping = editingXMapping.value @@ -273,7 +282,8 @@ const useAxisEndpoint = (field: 'start' | 'end') => formData.value[endpoint] = relative === null ? null : mapping.toRaw(relative) } } - formData.value[field] = value === null ? null : (mapping?.toRaw(value) ?? value) + const coordinate = props.type === AXIS_TYPE_ENUM.X ? Number(toAxisRawX(value, xValueType.value)) : value + formData.value[field] = value === null ? null : (mapping?.toRaw(coordinate!) ?? coordinate) if (editingXMapping.value) formData.value.timeCoordinateSystem = 'raw' } }) @@ -299,6 +309,10 @@ const props = withDefaults( config?: DataGraphConfig chartInstance?: { getXAxisDisplayMapping?: () => DataGraphXAxisDisplayMapping + timeOriginNs?: bigint + getTimeCoordinateScale?: () => number + getAcquisitionTimeMapping?: () => TimeAxisMapping | undefined + getDefaultAxisX?: () => { getInterval?: () => { start?: number; end?: number } } getYAxisDisplayMapping?: (axisType: 'y' | 'yRight') => DataGraphYAxisDisplayMapping | undefined addEventListener?: (_event: 'data' | 'visible', _listener: () => void) => void removeEventListener?: (_event: 'data' | 'visible', _listener: () => void) => void @@ -330,10 +344,12 @@ const props = withDefaults( const localFormData = ref({}) const editingXMapping = shallowRef() +const editingClockMapping = shallowRef() watch( () => props.chartInstance, chart => { editingXMapping.value = props.type === AXIS_TYPE_ENUM.X ? chart?.getXAxisDisplayMapping?.() : undefined + editingClockMapping.value = props.type === AXIS_TYPE_ENUM.X ? getTimeAxisMapping(chart) : undefined }, { immediate: true } ) @@ -348,6 +364,31 @@ const formData = computed({ modelValue.value = value } }) +const isClockAxis = computed(() => props.type === AXIS_TYPE_ENUM.X && isClockUnit(formData.value.unit ?? props.config.unitX)) +const xValueType = computed(() => resolveAxisXValueType(formData.value.unit ?? props.config.unitX, props.config.resultCode)) +function numericClockInterval() { + const start = Number(formData.value.start), end = Number(formData.value.end) + if (Number.isFinite(start) && Number.isFinite(end) && start < end) return { start, end } + const current = props.chartInstance?.getDefaultAxisX?.().getInterval?.() + return { start: Number(current?.start), end: Number(current?.end) } +} +const useClockEndpoint = (key: 'startNs' | 'endNs') => computed({ + get: () => formData.value.absoluteTimeRange?.[key] ?? captureAbsoluteTimeRange(editingClockMapping.value, numericClockInterval())?.[key], + set: value => { + if (!value) return + const range = formData.value.absoluteTimeRange ?? captureAbsoluteTimeRange(editingClockMapping.value, numericClockInterval()) + if (!range) return + formData.value.absoluteTimeRange = { ...range, [key]: value } + const projected = projectAbsoluteTimeRange(formData.value.absoluteTimeRange, editingClockMapping.value) + if (projected) Object.assign(formData.value, projected) + } +}) +const clockStart = useClockEndpoint('startNs') +const clockEnd = useClockEndpoint('endNs') +watch(() => formData.value.autoScale, (auto, previous) => { + if (!isClockAxis.value || auto !== false || previous === false || formData.value.absoluteTimeRange) return + formData.value.absoluteTimeRange = captureAbsoluteTimeRange(editingClockMapping.value, numericClockInterval()) +}) watch( () => modelValue.value, @@ -388,7 +429,7 @@ const axisModelKey = computed( ) function validateStrictRange(_rule: unknown, value: DataGraphAxisConfig | undefined, callback: ValidationCallback) { - if (value?.autoScale !== false || resolveStrictFixedAxisInterval(value)) { + if (value?.autoScale !== false || (isClockAxis.value ? validAbsoluteTimeRange(value.absoluteTimeRange) : resolveStrictFixedAxisInterval(value))) { callback() return } @@ -416,6 +457,7 @@ watch( (chartInstance, _previousChartInstance, onCleanup) => { const refreshMapping = () => { mappingRevision.value += 1 + if (!editingClockMapping.value && props.type === AXIS_TYPE_ENUM.X) editingClockMapping.value = getTimeAxisMapping(chartInstance) } chartInstance?.addEventListener?.('data', refreshMapping) chartInstance?.addEventListener?.('visible', refreshMapping) @@ -540,10 +582,10 @@ const mappedRangeRules = [ } ] const rangeValidationProp = computed(() => - props.strictRange || yAxisDisplayMapping.value ? axisModelKey.value : undefined + props.strictRange || isClockAxis.value || yAxisDisplayMapping.value ? axisModelKey.value : undefined ) const rangeValidationRules = computed(() => { - if (props.strictRange) { + if (props.strictRange || isClockAxis.value) { return strictRangeRules } return yAxisDisplayMapping.value ? mappedRangeRules : undefined @@ -762,4 +804,5 @@ const rangeProps = computed(() => { width: unset; } } +.chart-form__range--clock { flex-direction: column; align-items: stretch; } diff --git a/apps/frontend/src/modules/shared/data-graph/components/config/config-form.vue b/apps/frontend/src/modules/shared/data-graph/components/config/config-form.vue index 034e4779..df0372f1 100644 --- a/apps/frontend/src/modules/shared/data-graph/components/config/config-form.vue +++ b/apps/frontend/src/modules/shared/data-graph/components/config/config-form.vue @@ -52,6 +52,7 @@