diff --git a/GLOSSARY.md b/GLOSSARY.md new file mode 100644 index 00000000..0acdeec7 --- /dev/null +++ b/GLOSSARY.md @@ -0,0 +1,20 @@ +# OpenTest chart time terminology + +These terms distinguish the capture instant, a position within a measurement, and the visible range. Other domain boundaries are documented in CONTEXT.md. + +## Time + +**Acquisition Timestamp**: A trustworthy time marker for the instant data was captured, corresponding to a complete calendar date and time. A file's creation or modification date is not an acquisition timestamp. +_Avoid_: File time, accumulated measurement seconds + +**Task-relative Time**: A position relative to the origin of one measurement task, without a calendar date. +_Avoid_: Acquisition timestamp, clock label + +**Time-axis Display Mode**: The representation of a time position presented to the user, including relative seconds and clock time with milliseconds. +_Avoid_: Acquisition time source, fixed-range binding mode + +**Chart Viewport**: The currently visible range of the chart axes. It does not itself determine which points are copied or exported. +_Avoid_: Original data range, export data range + +**Absolute Fixed Range**: A range bounded by two complete acquisition instants. Changing records or measuring again does not change those instants. +_Avoid_: Fixed seconds after the start of each measurement diff --git a/GLOSSARY.zh-CN.md b/GLOSSARY.zh-CN.md new file mode 100644 index 00000000..1e30c368 --- /dev/null +++ b/GLOSSARY.zh-CN.md @@ -0,0 +1,20 @@ +# OpenTest 图谱时间术语 + +以下术语区分采集时刻、测量内的位置及用户看到的范围;其余领域边界见 CONTEXT.md。 + +## 时间 + +**采集绝对时间(Acquisition Timestamp)**:数据实际采集时刻的可信时间标记,可对应完整日期和时间;文件创建或修改时间不构成采集绝对时间。 +_Avoid_:文件时间、测量累计秒数 + +**任务相对时间(Task-relative Time)**:数据在一次测量任务内相对于任务原点的位置,不表达日历日期。 +_Avoid_:采集绝对时间、时钟刻度 + +**时间轴显示方式(Time-axis Display Mode)**:同一时间位置面向用户的表达方式,包括相对秒及带毫秒的时钟显示。 +_Avoid_:采集时间来源、固定范围绑定方式 + +**图谱视口(Chart Viewport)**:当前图谱坐标轴可见的范围;它本身不决定复制或数据导出的取点范围。 +_Avoid_:原始数据范围、导出数据范围 + +**绝对固定范围(Absolute Fixed Range)**:以两个完整采集绝对时刻界定的固定范围;更换记录或再次测量不改变这两个时刻。 +_Avoid_:固定测量起点后的同一秒数区间 diff --git a/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/BaseChartConfig.java b/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/BaseChartConfig.java index 319b7a59..202b3854 100644 --- a/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/BaseChartConfig.java +++ b/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/BaseChartConfig.java @@ -304,6 +304,15 @@ public Axis() { * 是否自适应 */ private Boolean autoScale; + + /** Acquisition instants are decimal nanoseconds, never floating-point axis coordinates. */ + private AbsoluteTimeRange absoluteTimeRange; + } + + @Data + public static class AbsoluteTimeRange implements Serializable { + private String startNs; + private String endNs; } } diff --git a/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/HeatmapChartConfig.java b/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/HeatmapChartConfig.java index 79067757..6d8fe1ea 100644 --- a/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/HeatmapChartConfig.java +++ b/apps/backend/crydaq-common/src/main/java/com/opentest/common/model/dto/chart/HeatmapChartConfig.java @@ -27,13 +27,20 @@ public class HeatmapChartConfig extends BaseChartConfig { public void setAxisInfo(Axis xAxis, Axis yAxis) { if (heatmap != null) { Axis realXAxis = new Axis( true); - realXAxis.setUnit(UnitEnum.SECOND.getCode()); + realXAxis.setUnit(getTimeDisplayUnit()); heatmap.setXAxis(realXAxis); heatmap.setYAxis(xAxis); heatmap.setZAxis(yAxis); } } + /** Time is independent of the frequency coordinate carried by the result. */ + @JsonIgnore + public String getTimeDisplayUnit() { + String stored = getUnitX(); + return "h:m:s".equals(stored) || "hms".equals(stored) ? "h:m:s" : UnitEnum.SECOND.getCode(); + } + @Override public void applyAxisDefaults(Axis xAxis, Axis yAxis) { if (heatmap != null) { diff --git a/apps/backend/crydaq-common/src/main/java/com/opentest/common/utils/CryBusinessUtil.java b/apps/backend/crydaq-common/src/main/java/com/opentest/common/utils/CryBusinessUtil.java index d794ed49..1dffa96c 100644 --- a/apps/backend/crydaq-common/src/main/java/com/opentest/common/utils/CryBusinessUtil.java +++ b/apps/backend/crydaq-common/src/main/java/com/opentest/common/utils/CryBusinessUtil.java @@ -15,6 +15,7 @@ import com.opentest.common.model.dto.*; import com.opentest.common.model.dto.algorithm.AlgorithmResultCodeResponseDto; import com.opentest.common.model.dto.chart.BaseChartConfig; +import com.opentest.common.model.dto.chart.HeatmapChartConfig; import com.opentest.common.model.dto.dashboard.TimeWindowConfigDto; import com.opentest.common.model.dto.node.AbstractNodeConfig; import com.opentest.common.model.dto.parameters.BaseVariableParameters; @@ -189,8 +190,14 @@ public static BaseChartConfig convertChartConfig(String unitX, String unitY, Str } // Heatmaps use elapsed time horizontally; the result's X coordinate // is frequency and belongs to their Y axis, including legacy records. - chartConfig.setUnitX(StrUtil.equals(ChartTypeEnum.HEATMAP.getCode(), chartType) - ? UnitEnum.SECOND.getCode() : unitX); + if (chartConfig instanceof HeatmapChartConfig heatmap) { + if ("s".equals(unitX) || "h:m:s".equals(unitX) || "hms".equals(unitX)) { + heatmap.setUnitX(unitX); + } + chartConfig.setUnitX(heatmap.getTimeDisplayUnit()); + } else { + chartConfig.setUnitX(unitX); + } // 先执行基础单位处理 双轴最多两个 processBasicUnitDesc(chartConfig, resultCodes, unitY, windowAxis); assembleDefaultTitle(chartConfig, resultCodes, semanticResultCount); diff --git a/apps/backend/crydaq-common/src/test/java/com/opentest/common/utils/ChartConfigAxisRoundTripTest.java b/apps/backend/crydaq-common/src/test/java/com/opentest/common/utils/ChartConfigAxisRoundTripTest.java index 0dab2413..c292620d 100644 --- a/apps/backend/crydaq-common/src/test/java/com/opentest/common/utils/ChartConfigAxisRoundTripTest.java +++ b/apps/backend/crydaq-common/src/test/java/com/opentest/common/utils/ChartConfigAxisRoundTripTest.java @@ -14,6 +14,16 @@ class ChartConfigAxisRoundTripTest { private final ObjectMapper mapper = new ObjectMapper(); + @Test + void absoluteAxisEndpointsRemainDecimalNanosecondsAcrossStorage() { + String json = "{\"chartType\":\"heatmap\",\"heatmap\":{\"xAxis\":{\"unit\":\"h:m:s\",\"absoluteTimeRange\":{\"startNs\":\"1795075990180123456\",\"endNs\":\"1795075991180123456\"}}}}"; + var source = CryBusinessUtil.parseChartConfig(json); + var stored = ChartConfigStorageCodec.copy(source); + var node = mapper.valueToTree(stored).path("heatmap").path("xAxis").path("absoluteTimeRange"); + assertEquals("1795075990180123456", node.path("startNs").asText()); + assertEquals("1795075991180123456", node.path("endNs").asText()); + } + @Test void heatmapReadKeepsTimeCoordinateSeparateFromTheFrequencyResultUnit() { String stored = "{\"chartType\":\"heatmap\",\"heatmap\":{\"xAxis\":{\"unit\":\"Hz\"},\"yAxis\":{\"unit\":\"Hz\"},\"zAxis\":{\"unit\":\"dBV rms\"}}}"; @@ -23,6 +33,25 @@ void heatmapReadKeepsTimeCoordinateSeparateFromTheFrequencyResultUnit() { assertEquals("dBV rms", chart.getUnitZ()); } + @Test + void heatmapClockSelectionSurvivesDefaultsAndReadback() { + String stored = "{\"chartType\":\"heatmap\",\"heatmap\":{\"xAxis\":{\"unit\":\"h:m:s\"}}}"; + var chart = (HeatmapChartConfig) CryBusinessUtil.convertChartConfig("Hz", "Hz", stored, List.of(), null); + assertEquals("h:m:s", chart.getUnitX()); + chart.applyAxisDefaults(null, null); + assertEquals("h:m:s", chart.getUnitX()); + } + + @Test + void heatmapRequestUnitSurvivesRebuiltConfigurationAndSwitchesBackToSeconds() { + var chart = (HeatmapChartConfig) CryBusinessUtil.convertChartConfig("h:m:s", "Hz", + "{\"chartType\":\"heatmap\"}", List.of(), null); + assertEquals("h:m:s", chart.getUnitX()); + String stored = ChartConfigStorageCodec.encode(chart); + assertEquals("h:m:s", CryBusinessUtil.convertChartConfig("Hz", "Hz", stored, List.of(), null).getUnitX()); + assertEquals("s", CryBusinessUtil.convertChartConfig("s", "Hz", stored, List.of(), null).getUnitX()); + } + @org.junit.jupiter.api.Test void snapshotDtoCopyUsesRegisteredConverterWithoutRevivingAxes() throws Exception { var registry = cn.hutool.core.convert.ConverterRegistry.getInstance(); diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/AcquisitionClock.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/AcquisitionClock.java new file mode 100644 index 00000000..ba8a4d7d --- /dev/null +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/AcquisitionClock.java @@ -0,0 +1,18 @@ +package com.opentest.core.export; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Locale; + +/** Presentation of trusted acquisition timestamps, shared by binary and tabular exports. */ +public final class AcquisitionClock { + private static final DateTimeFormatter CLOCK = DateTimeFormatter.ofPattern("HH:mm:ss.SSS", Locale.ROOT) + .withZone(ZoneId.systemDefault()); + private AcquisitionClock() { } + public static boolean selected(String unit) { return "h:m:s".equals(unit) || "hms".equals(unit); } + public static String zone() { return CLOCK.getZone().getId(); } + public static String format(long nanos) { + return nanos > 0 ? CLOCK.format(Instant.ofEpochSecond(0, nanos)) : "—"; + } +} diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73StructureValidator.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73StructureValidator.java index 56637ae4..140c7ffe 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73StructureValidator.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73StructureValidator.java @@ -42,9 +42,13 @@ static void validate(Path path, fileId = H5.H5Fopen(path.toString(), HDF5Constants.H5F_ACC_RDONLY, HDF5Constants.H5P_DEFAULT); validateUserBlock(fileId); - validateRootVariableCount(fileId, curves.size() * 2L + 2L + tableVariables.size() + validateRootVariableCount(fileId, curves.size() * 2L + 2L + curves.stream().filter(ResultMat73Writer.CurveLayout::isClock).count() * 2L + tableVariables.size() + (tableManifestLength > 0 ? 1L : 0L)); for (ResultMat73Writer.CurveLayout curve : curves) { + if (curve.isClock()) { + validateTimeVariable(fileId, "/" + curve.getKey() + "_x_timestamp_ns", 1, curve.getPointCount(), "int64", HDF5Constants.H5T_STD_I64LE); + validateTimeVariable(fileId, "/" + curve.getKey() + "_x_clock", 12, curve.getPointCount(), "char", HDF5Constants.H5T_STD_U16LE); + } validateCurveVariable(fileId, "/" + curve.getKey() + "_x", curve.getPointCount()); validateCurveVariable(fileId, "/" + curve.getKey() + "_y", @@ -146,6 +150,21 @@ private static void validateCurveVariable(long fileId, } } + private static void validateTimeVariable(long fileId, String path, int rows, long count, String matlabClass, long type) throws IOException { + long dataset = HDF5Constants.H5I_INVALID_HID; + long dataType = HDF5Constants.H5I_INVALID_HID; + try { + dataset = openRequiredDataset(fileId, path); + validateDimensions(dataset, new long[]{rows, count}, path); + validateMatlabClass(dataset, matlabClass.getBytes(StandardCharsets.US_ASCII), path); + dataType = H5.H5Dget_type(dataset); + if (!H5.H5Tequal(dataType, type)) throw new IOException("Invalid acquisition time type: " + path); + } finally { + closeDataType(dataType); + closeDataset(dataset); + } + } + private static void validateJsonVariable(long fileId, String path, int byteLength) throws IOException { diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73Writer.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73Writer.java index 2259d267..c60cc16e 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73Writer.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMat73Writer.java @@ -1,6 +1,7 @@ package com.opentest.core.export.result.mat; import com.fasterxml.jackson.databind.ObjectMapper; +import com.opentest.core.export.AcquisitionClock; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; @@ -61,6 +62,8 @@ public final class ResultMat73Writer implements AutoCloseable { private long fileId = HDF5Constants.H5I_INVALID_HID; private long activeXDatasetId = HDF5Constants.H5I_INVALID_HID; private long activeYDatasetId = HDF5Constants.H5I_INVALID_HID; + private long activeTimestampDatasetId = HDF5Constants.H5I_INVALID_HID; + private long activeClockDatasetId = HDF5Constants.H5I_INVALID_HID; private String activeKey; private ResultMatCurveMetadata activeMetadata; private long activePointCount; @@ -147,6 +150,10 @@ public void startCurve(ResultMatCurveMetadata metadata) throws IOException { String key = String.format(Locale.ROOT, "curve_%04d", curves.size() + 1); activeXDatasetId = createExtendibleDoubleDataset("/" + key + "_x"); activeYDatasetId = createExtendibleDoubleDataset("/" + key + "_y"); + if (metadata.isClock()) { + activeTimestampDatasetId = createExtendibleDataset("/" + key + "_x_timestamp_ns", HDF5Constants.H5T_STD_I64LE, "int64", 1); + activeClockDatasetId = createExtendibleDataset("/" + key + "_x_clock", HDF5Constants.H5T_STD_U16LE, "char", 12); + } activeKey = key; activeMetadata = metadata; activePointCount = 0L; @@ -183,9 +190,15 @@ public void append(double[] xValues, double[] yValues, int offset, int length) throws IOException { + append(xValues, yValues, offset, length, null); + } + + public void append(double[] xValues, double[] yValues, int offset, int length, long[] timestamps) throws IOException { requireOpen(); try { requireActiveCurve(); + if (timestamps != null && (offset < 0 || offset > timestamps.length - length)) + throw new IllegalArgumentException("Acquisition timestamps must align with X points"); if (xValues == null || yValues == null) { throw new IllegalArgumentException("结果曲线 X/Y 数据块不能为空"); } @@ -202,6 +215,7 @@ public void append(double[] xValues, activePointCount, nextPointCount); extendAndWrite(activeYDatasetId, yValues, offset, length, activePointCount, nextPointCount); + if (activeMetadata.isClock()) writeClockBlock(timestamps, offset, length, activePointCount, nextPointCount); activePointCount = nextPointCount; } catch (IllegalArgumentException | IllegalStateException failure) { failAndCleanup(failure); @@ -409,21 +423,25 @@ private void createFile() throws IOException { } private long createExtendibleDoubleDataset(String datasetPath) { + return createExtendibleDataset(datasetPath, HDF5Constants.H5T_IEEE_F64LE, "double", 1); + } + + private long createExtendibleDataset(String datasetPath, long type, String matlabClass, int rows) { long dataSpaceId = HDF5Constants.H5I_INVALID_HID; long creationPropertyId = HDF5Constants.H5I_INVALID_HID; long datasetId = HDF5Constants.H5I_INVALID_HID; RuntimeException failure = null; try { dataSpaceId = H5.H5Screate_simple(2, - new long[]{1L, 0L}, new long[]{1L, HDF5Constants.H5S_UNLIMITED}); + new long[]{rows, 0L}, new long[]{rows, HDF5Constants.H5S_UNLIMITED}); creationPropertyId = H5.H5Pcreate(HDF5Constants.H5P_DATASET_CREATE); H5.H5Pset_chunk(creationPropertyId, 2, - new long[]{1L, CURVE_CHUNK_POINTS}); + new long[]{rows, CURVE_CHUNK_POINTS}); datasetId = H5.H5Dcreate(fileId, datasetPath, - HDF5Constants.H5T_IEEE_F64LE, dataSpaceId, + type, dataSpaceId, HDF5Constants.H5P_DEFAULT, creationPropertyId, HDF5Constants.H5P_DEFAULT); - writeMatlabClass(datasetId, MATLAB_DOUBLE_CLASS); + writeMatlabClass(datasetId, matlabClass.getBytes(StandardCharsets.US_ASCII)); } catch (RuntimeException createFailure) { failure = createFailure; } finally { @@ -527,6 +545,37 @@ private void extendAndWrite(long datasetId, } } + private void writeClockBlock(long[] timestamps, int offset, int length, long start, long end) { + long[] stamps = new long[length]; + short[] characters = new short[12 * length]; + for (int i = 0; i < length; i++) { + stamps[i] = timestamps == null ? 0 : timestamps[offset + i]; + String clock = String.format(Locale.ROOT, "%-12s", AcquisitionClock.format(stamps[i])); + for (int column = 0; column < 12; column++) characters[column * length + i] = (short) clock.charAt(column); + } + writeTimeValues(activeTimestampDatasetId, HDF5Constants.H5T_NATIVE_LLONG, stamps, 1, length, start, end); + writeTimeValues(activeClockDatasetId, HDF5Constants.H5T_NATIVE_USHORT, characters, 12, length, start, end); + } + + private void writeTimeValues(long dataset, long type, Object values, int rows, int length, long start, long end) { + long fileSpace = HDF5Constants.H5I_INVALID_HID; + long memorySpace = HDF5Constants.H5I_INVALID_HID; + RuntimeException failure = null; + try { + H5.H5Dset_extent(dataset, new long[]{rows, end}); + fileSpace = H5.H5Dget_space(dataset); + H5.H5Sselect_hyperslab(fileSpace, HDF5Constants.H5S_SELECT_SET, new long[]{0, start}, null, new long[]{rows, length}, null); + memorySpace = H5.H5Screate_simple(2, new long[]{rows, length}, null); + H5.H5Dwrite(dataset, type, memorySpace, fileSpace, HDF5Constants.H5P_DEFAULT, values); + } catch (RuntimeException writeFailure) { + failure = writeFailure; + } finally { + failure = closeHandle(HandleType.DATA_SPACE, memorySpace, failure); + failure = closeHandle(HandleType.DATA_SPACE, fileSpace, failure); + } + if (failure != null) throw failure; + } + private void writeMatlabHeader() throws IOException { byte[] header = new byte[128]; Arrays.fill(header, 0, 124, (byte) ' '); @@ -599,6 +648,10 @@ private IOException closeHdf5Handles() { private IOException closeActiveCurveDatasets() { RuntimeException firstFailure = null; + firstFailure = closeHandle(HandleType.DATASET, activeClockDatasetId, firstFailure); + activeClockDatasetId = HDF5Constants.H5I_INVALID_HID; + firstFailure = closeHandle(HandleType.DATASET, activeTimestampDatasetId, firstFailure); + activeTimestampDatasetId = HDF5Constants.H5I_INVALID_HID; if (activeYDatasetId >= 0L) { try { H5.H5Dclose(activeYDatasetId); @@ -698,6 +751,8 @@ private CurveLayout(String key, this.metadata = metadata; } + boolean isClock() { return metadata.isClock(); } + String getKey() { return key; } diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMatCurveMetadata.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMatCurveMetadata.java index 4eadf4ba..a84448fa 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMatCurveMetadata.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/export/result/mat/ResultMatCurveMetadata.java @@ -1,5 +1,6 @@ package com.opentest.core.export.result.mat; +import com.opentest.core.export.AcquisitionClock; import java.util.LinkedHashMap; import java.util.Map; @@ -40,6 +41,8 @@ public static Builder builder(String resultSetId, return new Builder(resultSetId, resultCode, channelId); } + public boolean isClock() { return AcquisitionClock.selected(unitX); } + Map toManifestMap(String key, long pointCount) { Map json = new LinkedHashMap<>(); json.put("key", key); @@ -52,7 +55,14 @@ Map toManifestMap(String key, long pointCount) { json.put("channelName", channelName); json.put("channelType", channelType); json.put("domainType", domainType); - json.put("unitX", unitX); + json.put("unitX", isClock() ? "s" : unitX); + if (isClock()) { + json.put("timeDisplayUnit", "h:m:s"); + json.put("timeZone", AcquisitionClock.zone()); + json.put("timestampVariable", key + "_x_timestamp_ns"); + json.put("clockVariable", key + "_x_clock"); + json.put("missingAcquisitionTime", "timestamp 0; clock —"); + } json.put("unitY", unitY); json.put("pointCount", pointCount); if (valueShape != null) { json.put("valueShape", valueShape); } diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/model/Hdf5Data.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/model/Hdf5Data.java index c3efd6ad..b3e99d7d 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/model/Hdf5Data.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/model/Hdf5Data.java @@ -29,6 +29,9 @@ public class Hdf5Data extends Data { @Getter private final double[] yData; + @Getter + private final long[] acquisitionTimes; + /** * Metadata */ @@ -106,11 +109,19 @@ public Hdf5Data(String fileName, Object xData, Object yData, Metadata metadata) * @param metadata Metadata元数据 */ public Hdf5Data(String fileName, Object xData, Object yData, Metadata metadata, GroupingMode groupingMode) { + this(fileName, xData, yData, metadata, groupingMode, null); + } + + public Hdf5Data(String fileName, Object xData, Object yData, Metadata metadata, + GroupingMode groupingMode, long[] acquisitionTimes) { super(fileName); this.xData = toHdfNumericArray(xData, "X"); this.yData = toHdfNumericArray(yData, "Y"); this.metadata = metadata != null ? metadata : new Metadata(); this.groupingMode = groupingMode; + if (acquisitionTimes != null && (this.xData == null || acquisitionTimes.length != this.xData.length)) + throw new IllegalArgumentException("Acquisition timestamps must align with X points"); + this.acquisitionTimes = acquisitionTimes; } private static double[] toHdfNumericArray(Object values, String axis) { @@ -134,6 +145,6 @@ public byte getDataType() { @Override public long getApproximateBytes() { - return ArrayUtil.length(xData) * 8L + ArrayUtil.length(yData) * 8L; + return ArrayUtil.length(xData) * 8L + ArrayUtil.length(yData) * 8L + ArrayUtil.length(acquisitionTimes) * 8L; } } diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/writer/Hdf5Writer.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/writer/Hdf5Writer.java index f35b46c3..3b5403f1 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/writer/Hdf5Writer.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/concurrent/writer/Hdf5Writer.java @@ -1,5 +1,8 @@ package com.opentest.core.fm.concurrent.writer; +import com.opentest.core.export.AcquisitionClock; +import java.util.Arrays; + import ch.systemsx.cisd.hdf5.HDF5Factory; import ch.systemsx.cisd.hdf5.IHDF5Writer; import cn.hutool.core.io.FileUtil; @@ -386,6 +389,7 @@ private void writeChunkPerBlock(Hdf5Data h5Data) { // Write/append X data if (h5Data.getXData() != null && h5Data.getXData().length > 0) { + writeClockColumns(h5Data.getAcquisitionTimes(), 0, h5Data.getXData().length, xOffset); writeDataPerBlock(h5Data.getXData(), "/x_data", true); } @@ -414,6 +418,28 @@ private void writeValueValidity(double[] values, long offset) { payloadBytes += (long) flags.length * Integer.BYTES; } + private void writeClockColumns(long[] times, int start, int length, long offset) { + if (times == null) return; + String timestampPath = currentGroupPath + "/x_timestamp_ns"; + String clockPath = currentGroupPath + "/x_clock"; + if (!writer.object().exists(timestampPath)) { + writer.int64().createArray(timestampPath, 0, 10000); + writer.string().createArrayVL(clockPath, 0, 10000); + writer.string().setAttr("/", "timeDisplayUnit", "h:m:s"); + writer.string().setAttr("/", "timeZone", AcquisitionClock.zone()); + writer.string().setAttr("/", "missingAcquisitionTime", "timestamp 0; empty clock"); + } + long[] stamps = new long[length]; + String[] clocks = new String[length]; + for (int i = 0; i < length; i++) { + stamps[i] = times[start + i]; + clocks[i] = stamps[i] > 0 ? AcquisitionClock.format(stamps[i]) : ""; + } + writer.int64().writeArrayBlockWithOffset(timestampPath, stamps, length, offset); + writer.string().writeArrayBlockWithOffset(clockPath, clocks, length, offset); + payloadBytes += (long) length * (Long.BYTES + 12); + } + private void writeDataPerBlock(double[] data, String datasetName, boolean isXData) { String dataPath = currentGroupPath + datasetName; if (!writer.object().exists(dataPath)) { @@ -439,14 +465,18 @@ private void writeDataPerBlock(double[] data, String datasetName, boolean isXDat * AUTO_SPLIT mode: Automatically fill current group, write overflow to new group */ private void writeChunkAutoSplit(Hdf5Data h5Data) { + if (h5Data.getAcquisitionTimes() != null) { + writeTimedChunkAutoSplit(h5Data); + return; + } // Write/append X data if (h5Data.getXData() != null && h5Data.getXData().length > 0) { - writeDataAutoSplit(h5Data.getXData(), "/x_data", true); + writeDataAutoSplit(h5Data.getXData(), "/x_data", true, h5Data.getAcquisitionTimes()); } // Write/append Y data if (h5Data.getYData() != null && h5Data.getYData().length > 0) { - writeDataAutoSplit(h5Data.getYData(), "/y_data", false); + writeDataAutoSplit(h5Data.getYData(), "/y_data", false, null); } } @@ -458,7 +488,21 @@ private void writeChunkAutoSplit(Hdf5Data h5Data) { * @param datasetName Dataset name (/x_data or /y_data) * @param isXData Whether it's X data (for updating corresponding offset) */ - private void writeDataAutoSplit(double[] data, String datasetName, boolean isXData) { + private void writeTimedChunkAutoSplit(Hdf5Data data) { + if (data.getYData() == null || data.getXData().length != data.getYData().length) + throw new IllegalArgumentException("Timed HDF points require paired X/Y arrays"); + int index = 0; + while (index < data.getXData().length) { + if (currentGroupPath == null || Math.max(xOffset, yOffset) >= maxElementsPerGroup) switchToNewGroup(); + int count = (int) Math.min(maxElementsPerGroup - Math.max(xOffset, yOffset), data.getXData().length - index); + writeClockColumns(data.getAcquisitionTimes(), index, count, xOffset); + writeDataPerBlock(Arrays.copyOfRange(data.getXData(), index, index + count), "/x_data", true); + writeDataPerBlock(Arrays.copyOfRange(data.getYData(), index, index + count), "/y_data", false); + index += count; + } + } + + private void writeDataAutoSplit(double[] data, String datasetName, boolean isXData, long[] acquisitionTimes) { int idx = 0; while (idx < data.length) { // Check if new group needs to be created @@ -485,6 +529,7 @@ private void writeDataAutoSplit(double[] data, String datasetName, boolean isXDa double[] segment = new double[canWrite]; System.arraycopy(data, idx, segment, 0, canWrite); + if (isXData) writeClockColumns(acquisitionTimes, idx, canWrite, xOffset); if (!isXData) writeValueValidity(segment, yOffset); writer.float64().writeArrayBlockWithOffset(dataPath, segment, canWrite, isXData ? xOffset : yOffset); diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5PublicResultWriter.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5PublicResultWriter.java index 3b7b36a0..5f97b9b8 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5PublicResultWriter.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5PublicResultWriter.java @@ -15,7 +15,8 @@ public final class OpenTestHdf5PublicResultWriter { private static final int BLOCK_SIZE = 65_536; private static final List DESCRIPTION = List.of( - "dataKind", "resultName", "channelName", "unitX", "unitY", "domainType", "unavailable", "missingValuePolicy"); + "dataKind", "resultName", "channelName", "unitX", "unitY", "domainType", "unavailable", "missingValuePolicy", + "timeDisplayUnit", "timeZone", "missingAcquisitionTime"); private OpenTestHdf5PublicResultWriter() { } @@ -147,10 +148,24 @@ static long[] copyChunks(IHDF5Reader reader, IHDF5Writer writer, String targetRo writer.float64().writeArrayBlockWithOffset(targetRoot + path, values, values.length, offset); } } + copyClockColumns(reader, writer, group, targetRoot); } return counts; } + private static void copyClockColumns(IHDF5Reader reader, IHDF5Writer writer, String group, String targetRoot) { + if (!reader.object().hasAttribute("/", "timeDisplayUnit")) return; + String stamps = group + "/x_timestamp_ns", clocks = group + "/x_clock"; + long length = arrayLength(reader, group + "/x_data"); + if (!reader.object().isDataSet(stamps) || !reader.object().isDataSet(clocks) + || arrayLength(reader, stamps) != length || arrayLength(reader, clocks) != length) { + throw new IllegalArgumentException("H5 采集时间列缺失或长度不一致"); + } + // Native dataset copies retain the original fixed-string encoding and element width. + reader.object().copy(stamps, writer, targetRoot + stamps); + reader.object().copy(clocks, writer, targetRoot + clocks); + } + private static long[] axisCounts(IHDF5Reader reader) { long[] counts = new long[2]; for (String chunk : chunks(reader)) { diff --git a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5ResultSetWriter.java b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5ResultSetWriter.java index 7005a876..e0516032 100644 --- a/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5ResultSetWriter.java +++ b/apps/backend/crydaq-core/src/main/java/com/opentest/core/fm/hdf/OpenTestHdf5ResultSetWriter.java @@ -142,7 +142,8 @@ private static void writeCompletedFiles(Path target, List members, boolean ignored -> String.format(Locale.ROOT, "result_%04d", resultKeys.size() + 1)); attribute(writer, memberPath, "resultKey", key); attribute(writer, memberPath, "memberKey", String.format(Locale.ROOT, "member_%04d", memberNumber)); - for (String name : List.of("dataKind", "resultName", "channelName", "domainType", "unitX", "unitY", "unavailable", "missingValuePolicy")) { + for (String name : List.of("dataKind", "resultName", "channelName", "domainType", "unitX", "unitY", "unavailable", "missingValuePolicy", + "timeDisplayUnit", "timeZone", "missingAcquisitionTime")) { attribute(writer, memberPath, name, optionalString(reader, name)); } long[] counts = OpenTestHdf5PublicResultWriter.copyChunks(reader, writer, memberPath); diff --git a/apps/backend/crydaq-core/src/test/java/com/opentest/core/export/result/mat/ResultMat73WriterTest.java b/apps/backend/crydaq-core/src/test/java/com/opentest/core/export/result/mat/ResultMat73WriterTest.java index 7dd2b8ba..44016703 100644 --- a/apps/backend/crydaq-core/src/test/java/com/opentest/core/export/result/mat/ResultMat73WriterTest.java +++ b/apps/backend/crydaq-core/src/test/java/com/opentest/core/export/result/mat/ResultMat73WriterTest.java @@ -8,6 +8,7 @@ import ch.systemsx.cisd.hdf5.HDF5Factory; import ch.systemsx.cisd.hdf5.IHDF5Reader; import com.fasterxml.jackson.databind.JsonNode; +import com.opentest.core.export.AcquisitionClock; import com.fasterxml.jackson.databind.ObjectMapper; import hdf.hdf5lib.H5; import hdf.hdf5lib.HDF5Constants; @@ -39,6 +40,33 @@ class ResultMat73WriterTest { @TempDir Path tempDir; + @Test + void clockColumnsKeepExactTimestampsAndMissingValuesAcrossAppends() throws Exception { + Path output = tempDir.resolve("clock.mat"); + long stamp = 1_795_071_049_939_000_000L; + try (var writer = new ResultMat73Writer(output, graphicMetadata())) { + writer.startCurve(ResultMatCurveMetadata.builder("42", "Waveform", "AI1").unitX("h:m:s").build()); + writer.append(new double[]{0}, new double[]{1}, 0, 1, new long[]{stamp}); + writer.append(new double[]{1, 2}, new double[]{2, 3}, 0, 2, new long[]{0, stamp + 2_000_000_000L}); + writer.finishCurve(); + writer.finish(); + } + try (var reader = HDF5Factory.openForReading(output.toFile())) { + assertArrayEquals(new long[]{1, 3}, reader.object().getDimensions("/curve_0001_x_timestamp_ns")); + assertArrayEquals(new long[]{12, 3}, reader.object().getDimensions("/curve_0001_x_clock")); + assertEquals("int64", reader.string().getAttr("/curve_0001_x_timestamp_ns", "MATLAB_class")); + assertEquals("char", reader.string().getAttr("/curve_0001_x_clock", "MATLAB_class")); + assertArrayEquals(new long[]{stamp, 0, stamp + 2_000_000_000L}, reader.int64().readMatrix("/curve_0001_x_timestamp_ns")[0]); + var chars = reader.uint16().readMatrix("/curve_0001_x_clock"); + StringBuilder first = new StringBuilder(); + for (int j = 0; j < 12; j++) first.append((char) chars[j][0]); + assertEquals(AcquisitionClock.format(stamp), first.toString()); + } + var manifest = OBJECT_MAPPER.readTree(readAllBytes(output, "/curve_manifest_utf8")).get(0); + assertEquals("s", manifest.get("unitX").asText()); + assertEquals("h:m:s", manifest.get("timeDisplayUnit").asText()); + } + @Test void writesTableOnlyWithUnicodeMissingValuesAndInfinities() throws Exception { Path output = tempDir.resolve("validation.mat"); diff --git a/apps/backend/crydaq-core/src/test/java/com/opentest/core/fm/concurrent/writer/Hdf5WriterExportMetadataTest.java b/apps/backend/crydaq-core/src/test/java/com/opentest/core/fm/concurrent/writer/Hdf5WriterExportMetadataTest.java index 6e1e2abd..26578c93 100644 --- a/apps/backend/crydaq-core/src/test/java/com/opentest/core/fm/concurrent/writer/Hdf5WriterExportMetadataTest.java +++ b/apps/backend/crydaq-core/src/test/java/com/opentest/core/fm/concurrent/writer/Hdf5WriterExportMetadataTest.java @@ -4,7 +4,11 @@ import ch.systemsx.cisd.hdf5.IHDF5Reader; import com.opentest.core.fm.concurrent.model.Hdf5Data; import com.opentest.core.fm.hdf.Hdf5ValueValidity; +import com.opentest.core.export.AcquisitionClock; import com.opentest.core.fm.hdf.OpenTestHdf5Result; +import com.opentest.core.fm.hdf.OpenTestHdf5PublicResultWriter; +import com.opentest.core.fm.hdf.OpenTestHdf5ResultSetWriter; +import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -18,6 +22,38 @@ class Hdf5WriterExportMetadataTest { @TempDir Path directory; + @Test void clockColumnsStayPairedAcrossChunkSplitsAndMissingSourceTime() throws Exception { + long stamp = 1_795_071_049_939_000_000L; + var meta = metadata(); meta.setUnitX("s"); + try (var writer = writer("clock.h5", 3)) { + writer.appendData(new Hdf5Data("clock.h5", new double[]{0, 1, 2, 3}, new double[]{1, 2, 3, 4}, meta, + Hdf5Data.GroupingMode.AUTO_SPLIT, new long[]{stamp, stamp + 1_000_000_000L, 0, stamp + 3_000_000_000L})); + } + try (var reader = HDF5Factory.openForReading(directory.resolve("clock.h5").toFile())) { + assertArrayEquals(new double[]{0, 1, 2}, reader.float64().readArray("/chunks/chunk_0/x_data")); + assertArrayEquals(new double[]{1, 2, 3}, reader.float64().readArray("/chunks/chunk_0/y_data")); + assertArrayEquals(new long[]{stamp, stamp + 1_000_000_000L, 0}, reader.int64().readArray("/chunks/chunk_0/x_timestamp_ns")); + assertArrayEquals(new String[]{AcquisitionClock.format(stamp), AcquisitionClock.format(stamp + 1_000_000_000L), ""}, reader.string().readArray("/chunks/chunk_0/x_clock")); + assertArrayEquals(new String[]{AcquisitionClock.format(stamp + 3_000_000_000L)}, reader.string().readArray("/chunks/chunk_1/x_clock")); + assertEquals("s", reader.string().getAttr("/", "unitX")); + assertEquals("h:m:s", reader.string().getAttr("/", "timeDisplayUnit")); + } + Path source = directory.resolve("clock.h5"); + Path single = directory.resolve("public-clock.h5"); + Path set = directory.resolve("public-set.h5"); + OpenTestHdf5PublicResultWriter.writeSingle(single, source, false); + OpenTestHdf5ResultSetWriter.writePublicCompletedFiles(set, List.of(source), false); + for (Path path : List.of(single, set)) { + String root = path.equals(single) ? "" : "/members/member_0"; + try (var reader = HDF5Factory.openForReading(path.toFile())) { + assertEquals("h:m:s", reader.string().getAttr(root.isEmpty() ? "/" : root, "timeDisplayUnit")); + assertArrayEquals(new long[]{stamp, stamp + 1_000_000_000L, 0}, reader.int64().readArray(root + "/chunks/chunk_0/x_timestamp_ns")); + assertArrayEquals(new String[]{AcquisitionClock.format(stamp), AcquisitionClock.format(stamp + 1_000_000_000L), ""}, reader.string().readArray(root + "/chunks/chunk_0/x_clock")); + assertArrayEquals(new long[]{stamp + 3_000_000_000L}, reader.int64().readArray(root + "/chunks/chunk_1/x_timestamp_ns")); + } + } + } + @Test void realMemberKeepsUnicodeIdentityUnitsAndAllSplitSamples() throws Exception { Hdf5Data.Metadata metadata = metadata(); metadata.setUnitY("Pa"); 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-server/src/main/java/com/opentest/controller/ProjectDashboardController.java b/apps/backend/crydaq-server/src/main/java/com/opentest/controller/ProjectDashboardController.java index 751ba6ee..93000e48 100644 --- a/apps/backend/crydaq-server/src/main/java/com/opentest/controller/ProjectDashboardController.java +++ b/apps/backend/crydaq-server/src/main/java/com/opentest/controller/ProjectDashboardController.java @@ -55,6 +55,7 @@ import com.opentest.service.DashboardRenderDataQueryService; import com.opentest.service.FlowExecuteResultService; import com.opentest.service.GraphicConfigService; +import com.opentest.service.axis.TimeAxisPreferenceService; import com.opentest.service.HistoricalReferenceTestRecalculationTaskService; import com.opentest.service.component.ProjectDashboardComponent; import com.opentest.service.jni.AlgorithmLibJNIBridgeCacheService; @@ -86,6 +87,8 @@ public class ProjectDashboardController extends BaseController { @Resource private GraphicConfigService graphicConfigService; @Resource + private TimeAxisPreferenceService timeAxisPreferenceService; + @Resource private HistoricalReferenceTestRecalculationTaskService historicalReferenceTestRecalculationTaskService; @Resource @@ -499,6 +502,12 @@ public CommonResult resultDetail(@PathVariable Long id) { return success(response); } + /** Report viewports must not inherit the current source graph's time range. */ + @GetMapping("/result/{id}/report-detail") + public CommonResult reportResultDetail(@PathVariable Long id) { + return timeAxisPreferenceService.readFrozenSnapshots(() -> resultDetail(id)); + } + private void omitInlineLimitConfigs(FlowExecuteResultDto detail) { DashboardConfigDto dashboardConfig = detail == null ? null : detail.getDashboardConfig(); DashboardItemConfigDto dashboardItemConfig = dashboardConfig == null ? null : dashboardConfig.getDashboardItemConfig(); 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..3d97492c 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,9 @@ 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.core.export.AcquisitionClock; import com.opentest.service.export.ChannelCursor; import com.opentest.service.export.ChannelExportHeaderInfo; import com.opentest.service.export.ChannelGraphicCsvExport; @@ -11525,7 +11528,7 @@ private ResultMatCurveBlockCursor openResultMatBlockCursor( selection, memorySelection); return new GraphicPointResultMatBlockCursor( - cursor, RESULT_MAT_APPEND_CHUNK_POINTS); + cursor, RESULT_MAT_APPEND_CHUNK_POINTS, AcquisitionClock.selected(unitX)); } private GraphicPointCursor openResultMatPointCursor( @@ -13605,8 +13608,10 @@ private boolean writeDeclaredCurveToHdf(FileDownloadDto item, FlowExecuteSnapsho metadata.setStep(block.step()); Object y = block.convertY((x, values, sourceMetadata) -> XYDataArraySupport.toDoubleArray(convertExportYData(item, x, values, snapshot, sourceMetadata))); metadata = describeHdfResult(item, exportHdf5Metadata(item, metadata), block.x(), y, - reader.description().unitX(), "continuous"); - manager.appendData(new Hdf5Data(target, block.x(), y, metadata, Hdf5Data.GroupingMode.AUTO_SPLIT), false); + AcquisitionClock.selected(reader.description().unitX()) ? "s" : reader.description().unitX(), "continuous"); + boolean clock = AcquisitionClock.selected(reader.description().unitX()); + manager.appendData(new Hdf5Data(target, block.x(), y, metadata, Hdf5Data.GroupingMode.AUTO_SPLIT, + clock ? (block.acquisitionTimes() == null ? new long[block.x().length] : block.acquisitionTimes()) : null), false); written = true; } return written; @@ -14308,7 +14313,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 +14410,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 +14628,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 +14679,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 +14737,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 +14766,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 +14774,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 +14793,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 +14822,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 +14949,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 +14997,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 +15055,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 +15072,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 +15577,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 +15585,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 +15594,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 +15602,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/GraphicConfigService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java index 1227b5be..a4a9eeb6 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigService.java @@ -243,6 +243,7 @@ import com.opentest.service.virtualchannel.VirtualChannelResultUnitRuleService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.opentest.service.axis.TimeAxisPreferenceService; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; @@ -526,6 +527,7 @@ MathResultUnitReconcileResultDto toResult() { private GraphicResultCodeService graphicResultCodeService; @Resource private AxisContractPlanner axisContractPlanner; + @Resource private TimeAxisPreferenceService timeAxisPreferenceService; @Resource private GraphicContractPreviewTokenService graphicContractPreviewTokenService; @Resource @@ -17730,6 +17732,9 @@ private UUID modifySnapshotWithinGraphicLock(GraphicConfigDto dto) { } // 统一保存更新后的快照 graphicConfigSnapshotService.saveOrUpdateEntity(updatedSnapshot); + if (timeAxisPreferenceService != null) timeAxisPreferenceService.remember( + snapshot.getGraphicConfigId(), snapshot.getProjectId(), snapshot.getUnitX(), updatedSnapshot.getUnitX(), + snapshot.getOriginal(), updatedSnapshot.getOriginal()); // 更新结果码 if (legacyPartialRequest && !displayOnlyPartialRequest) { updateLegacyPartialBindingUnits( @@ -19173,6 +19178,8 @@ private GraphicConfigDto modifySourceGraphicWithinContextualUnitOperation(Graphi // 保存更新。受限测量切型保留 opaque handler_config,不经 DTO 的 basicSettings 编解码。 if (boundedMetadata) saveMeasurementGraphicTypeEntity(entity, metadata); else this.saveOrUpdateEntity(entity); + if (timeAxisPreferenceService != null) timeAxisPreferenceService.remember( + graphic.getId(), graphic.getProjectId(), graphic.getUnitX(), entity.getUnitX(), graphic.getOriginal(), entity.getOriginal()); // 更新结果码 if (legacyPartialRequest && !displayOnlyPartialRequest) { Set bindingIdsToUpdate = axisPlan == null diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java index 0b3b52cf..85bb39dc 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/GraphicConfigSnapshotService.java @@ -28,6 +28,7 @@ import com.opentest.common.utils.EntityUtils; import com.opentest.dal.mapper.sqlite.GraphicConfigSnapshotMapper; import com.opentest.service.axis.AxisContractPlan; +import com.opentest.service.axis.TimeAxisPreferenceService; import com.opentest.service.axis.LegacyAxisReadContext; import com.opentest.service.axis.LegacyAxisReadNormalizer; import com.opentest.service.axis.MonitorScopeTimeAxis; @@ -95,6 +96,7 @@ public class GraphicConfigSnapshotService extends BaseService entityToDto(List records) { @@ -786,6 +788,7 @@ private List applyLegacyAxisReadNormalization( dto.setUnitX(projection.unitX()); dto.setOriginal(projection.original()); } + if (timeAxisPreferenceService != null) timeAxisPreferenceService.apply(dto); return effectiveBindings; } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/ProjectReportService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/ProjectReportService.java index c92bd203..d7abab6b 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/ProjectReportService.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/ProjectReportService.java @@ -50,6 +50,7 @@ import org.springframework.util.DigestUtils; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; +import java.math.BigInteger; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -284,7 +285,23 @@ private void validateChartViewport(JsonNode viewport) { JsonNode range = entry.getValue(); if (!range.isObject()) throw invalid("Invalid chart viewport range"); if (range.path("mode").asText().equals("auto") && range.size() == 1) return; - if (!range.path("mode").asText().equals("manual") || range.size() != 3 + boolean timeUnit = range.has("timeUnit"); + if (timeUnit && (!key.equals("x") || !range.path("timeUnit").isTextual() + || !(range.path("timeUnit").asText().equals("s") || range.path("timeUnit").asText().equals("h:m:s")))) { + throw invalid("Invalid chart viewport time unit"); + } + boolean absolute = range.has("absoluteTimeRange"); + if (absolute) { + JsonNode clock = range.path("absoluteTimeRange"); + if (!key.equals("x") || timeUnit && !range.path("timeUnit").asText().equals("h:m:s") || !clock.isObject() || clock.size() != 2 + || !clock.path("startNs").isTextual() || !clock.path("endNs").isTextual() + || !clock.path("startNs").asText().matches("[1-9][0-9]{0,21}") + || !clock.path("endNs").asText().matches("[1-9][0-9]{0,21}") + || new BigInteger(clock.path("startNs").asText()).compareTo(new BigInteger(clock.path("endNs").asText())) >= 0) { + throw invalid("Invalid absolute chart viewport range"); + } + } + if (!range.path("mode").asText().equals("manual") || range.size() != (absolute ? 4 : 3) + (timeUnit ? 1 : 0) || !range.path("start").isNumber() || !range.path("end").isNumber() || !Double.isFinite(range.path("start").doubleValue()) || !Double.isFinite(range.path("end").doubleValue()) diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/TimeAxisPreferenceService.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/TimeAxisPreferenceService.java new file mode 100644 index 00000000..b6d396b1 --- /dev/null +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/axis/TimeAxisPreferenceService.java @@ -0,0 +1,113 @@ +package com.opentest.service.axis; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.opentest.common.model.dto.GraphicConfigSnapshotDto; +import com.opentest.common.enums.GraphicTypeEnum; +import com.opentest.common.model.entity.GraphicConfig; +import com.opentest.dal.mapper.sqlite.GraphicConfigMapper; +import jakarta.annotation.Resource; +import java.util.List; +import java.util.Objects; +import java.util.function.Supplier; +import org.springframework.stereotype.Component; + +/** Source-owned time viewport preferences; frozen samples and report viewports stay independent. */ +@Component +public class TimeAxisPreferenceService { + private static final String PREFERENCE = "timeAxisPreference"; + private static final List RANGE_FIELDS = List.of("autoScale", "start", "end", "absoluteTimeRange"); + private final ThreadLocal frozenSnapshotRead = new ThreadLocal<>(); + @Resource private GraphicConfigMapper graphics; + @Resource private ObjectMapper json; + + /** Report reads use frozen graph settings, then apply their own saved viewport. */ + public T readFrozenSnapshots(Supplier read) { + Boolean previous = frozenSnapshotRead.get(); + frozenSnapshotRead.set(true); + try { + return read.get(); + } finally { + if (previous == null) frozenSnapshotRead.remove(); + else frozenSnapshotRead.set(previous); + } + } + + public void remember(Long sourceId, Long projectId, String previousUnit, String nextUnit, + String previousDisplay, String nextDisplay) { + if (sourceId == null || !timeUnit(nextUnit)) return; + ObjectNode next = object(nextDisplay); + if (next.path("timeAxisReadFallback").asBoolean(false)) return; + if (!next.path("xAxis").isObject()) return; + GraphicConfig source = graphics.selectById(sourceId); + if (source == null || !Objects.equals(source.getProjectId(), projectId)) return; + if ("Scope Waveform".equals(source.getResultCode())) return; + ObjectNode stored = object(source.getOriginal()); + JsonNode oldPreference = stored.get(PREFERENCE); + JsonNode oldAxis = oldPreference == null ? object(previousDisplay).path("xAxis") : oldPreference.path("axis"); + String oldUnit = oldPreference == null ? previousUnit : oldPreference.path("unit").asText(); + // Seconds ranges remain record-owned; the effective mode can differ from the raw snapshot. + if ("s".equals(nextUnit) && !clock(oldUnit)) return; + JsonNode nextAxis = next.path("xAxis"); + boolean clock = clock(nextUnit); + List intent = clock ? List.of("autoScale", "absoluteTimeRange") : RANGE_FIELDS; + if (Objects.equals(oldUnit, nextUnit) && intent.stream().allMatch(key -> Objects.equals(oldAxis.get(key), nextAxis.get(key)))) return; + ObjectNode preference = json.createObjectNode().put("unit", clock ? "h:m:s" : "s"); + ObjectNode axis = preference.putObject("axis"); + RANGE_FIELDS.forEach(key -> { if (nextAxis.has(key)) axis.set(key, nextAxis.get(key).deepCopy()); }); + if (clock && !axis.path("absoluteTimeRange").isObject()) axis.put("autoScale", true); + stored.set(PREFERENCE, preference); + ObjectNode sourceAxis = stored.withObject("/xAxis"); + RANGE_FIELDS.forEach(sourceAxis::remove); + sourceAxis.setAll(axis); + sourceAxis.put("unit", preference.path("unit").asText()); + GraphicConfig update = new GraphicConfig(); + update.setId(sourceId); update.setOriginal(stored.toString()); update.setUnitX(preference.path("unit").asText()); + graphics.updateById(update); + } + + public void apply(GraphicConfigSnapshotDto dto) { + if (Boolean.TRUE.equals(frozenSnapshotRead.get())) return; + if (dto.getSourceGraphicConfigId() == null || "Scope Waveform".equals(dto.getResultCode())) return; + if (!timeUnit(dto.getUnitX()) && !GraphicTypeEnum.isTimeFrequencyGraphic(dto.getGraphicType())) return; + GraphicConfig source = graphics.selectById(dto.getSourceGraphicConfigId()); + if (source == null || !Objects.equals(source.getProjectId(), dto.getProjectId())) return; + JsonNode preference = object(source.getOriginal()).get(PREFERENCE); + if (preference == null || !timeUnit(preference.path("unit").asText()) || !preference.path("axis").isObject()) return; + String unit = preference.path("unit").asText(); + ObjectNode display = object(dto.getOriginal()); + ObjectNode axis = display.withObject("/xAxis"); + boolean storedSeconds = "s".equals(dto.getUnitX()) || "s".equals(axis.path("unit").asText()); + display.remove("timeAxisReadFallback"); + display.remove("timeAxisClockPreference"); + if (clock(unit)) { + ObjectNode secondsFallback = json.createObjectNode(); + if (storedSeconds) { + RANGE_FIELDS.forEach(key -> { if (axis.has(key)) secondsFallback.set(key, axis.get(key).deepCopy()); }); + } else secondsFallback.put("autoScale", true); + display.set("timeAxisSecondsFallback", secondsFallback); + RANGE_FIELDS.forEach(axis::remove); + axis.setAll((ObjectNode) preference.path("axis")); + } else { + display.remove("timeAxisSecondsFallback"); + if (!storedSeconds) { + RANGE_FIELDS.forEach(axis::remove); + axis.put("autoScale", true); + } + axis.putNull("absoluteTimeRange"); + } + axis.put("unit", unit); + dto.setOriginal(display.toString()); dto.setUnitX(unit); + if (dto.getChartConfig() != null) dto.getChartConfig().setUnitX(unit); + } + + private ObjectNode object(String value) { + try { + JsonNode parsed = value == null || value.isBlank() ? null : json.readTree(value); + return parsed instanceof ObjectNode object ? object : json.createObjectNode(); + } catch (Exception invalid) { return json.createObjectNode(); } + } + private static boolean clock(String value) { return "h:m:s".equals(value) || "hms".equals(value); } + private static boolean timeUnit(String value) { return "s".equals(value) || clock(value); } +} 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..b622e8e0 --- /dev/null +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/AcquisitionTimeExport.java @@ -0,0 +1,22 @@ +package com.opentest.service.export; + +import com.opentest.core.export.AcquisitionClock; + +public final class AcquisitionTimeExport { + 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 AcquisitionClock.format(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 78389757..6b3a115a 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; @@ -378,6 +379,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()); @@ -472,6 +474,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/export/result/mat/GraphicPointResultMatBlockCursor.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/GraphicPointResultMatBlockCursor.java index a57ff8c4..0a4957c7 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/GraphicPointResultMatBlockCursor.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/GraphicPointResultMatBlockCursor.java @@ -13,6 +13,7 @@ public final class GraphicPointResultMatBlockCursor implements ResultMatCurveBlockCursor { private final GraphicPointCursor pointCursor; + private final long[] timeBuffer; private double[] xBuffer; private double[] yBuffer; private boolean finished; @@ -20,6 +21,10 @@ public final class GraphicPointResultMatBlockCursor public GraphicPointResultMatBlockCursor(GraphicPointCursor pointCursor, int blockPoints) { + this(pointCursor, blockPoints, false); + } + + public GraphicPointResultMatBlockCursor(GraphicPointCursor pointCursor, int blockPoints, boolean clock) { if (pointCursor == null) { throw new IllegalArgumentException("图谱点游标不能为空"); } @@ -27,6 +32,7 @@ public GraphicPointResultMatBlockCursor(GraphicPointCursor pointCursor, throw new IllegalArgumentException("结果 MAT 数据块点数必须大于 0"); } this.pointCursor = pointCursor; + timeBuffer = clock ? new long[blockPoints] : null; xBuffer = new double[blockPoints]; yBuffer = new double[blockPoints]; } @@ -40,6 +46,7 @@ public ResultMatCurveBlock nextBlock() { int count = 0; while (count < xBuffer.length && pointCursor.hasNext()) { xBuffer[count] = pointCursor.nextX(); + if (timeBuffer != null) timeBuffer[count] = pointCursor.nextAcquisitionTimeNanos(); yBuffer[count] = pointCursor.nextY(); count++; } @@ -47,7 +54,7 @@ public ResultMatCurveBlock nextBlock() { finished = true; return null; } - return ResultMatCurveBlock.wrap(xBuffer, yBuffer, 0, count); + return ResultMatCurveBlock.wrap(xBuffer, yBuffer, 0, count).withAcquisitionTimes(timeBuffer); } @Override diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveBlock.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveBlock.java index 5d4993a4..8da2b597 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveBlock.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveBlock.java @@ -7,6 +7,16 @@ * 因为流式游标可以复用同一组转换缓冲区。

*/ public final class ResultMatCurveBlock { + private long[] acquisitionTimes; + + public long[] getAcquisitionTimes() { return acquisitionTimes; } + + public ResultMatCurveBlock withAcquisitionTimes(long[] times) { + if (times != null && times.length < offset + length) throw new IllegalArgumentException("Timestamp block too short"); + acquisitionTimes = times; + return this; + } + private final double[] xValues; private final double[] yValues; private final int offset; diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveMaterializer.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveMaterializer.java index c498014d..3a73aad6 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveMaterializer.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveMaterializer.java @@ -22,6 +22,7 @@ public static MaterializedCurve materialize( } double[] xValues = new double[0]; double[] yValues = new double[0]; + long[] timestamps = null; int size = 0; try (ResultMatCurveBlockCursor source = cursor) { ResultMatCurveBlock block; @@ -36,6 +37,7 @@ public static MaterializedCurve materialize( int capacity = growCapacity(xValues.length, required); xValues = Arrays.copyOf(xValues, capacity); yValues = Arrays.copyOf(yValues, capacity); + if (timestamps != null) timestamps = Arrays.copyOf(timestamps, capacity); } System.arraycopy( block.getXValues(), block.getOffset(), @@ -43,6 +45,10 @@ public static MaterializedCurve materialize( System.arraycopy( block.getYValues(), block.getOffset(), yValues, size, block.getLength()); + if (block.getAcquisitionTimes() != null) { + if (timestamps == null) timestamps = new long[xValues.length]; + System.arraycopy(block.getAcquisitionTimes(), block.getOffset(), timestamps, size, block.getLength()); + } size = required; } } @@ -50,7 +56,7 @@ public static MaterializedCurve materialize( throw new IOException("结果 MAT 曲线没有可导出的数值点"); } return new MaterializedCurve( - Arrays.copyOf(xValues, size), Arrays.copyOf(yValues, size)); + Arrays.copyOf(xValues, size), Arrays.copyOf(yValues, size), timestamps == null ? null : Arrays.copyOf(timestamps, size)); } private static int growCapacity(int current, int required) @@ -70,10 +76,15 @@ private static int growCapacity(int current, int required) } public static final class MaterializedCurve { + private final long[] timestamps; + + public long[] getTimestamps() { return timestamps; } + private final double[] xValues; private final double[] yValues; - private MaterializedCurve(double[] xValues, double[] yValues) { + private MaterializedCurve(double[] xValues, double[] yValues, long[] timestamps) { + this.timestamps = timestamps; this.xValues = xValues; this.yValues = yValues; } diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveStreamer.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveStreamer.java index 35064b9f..253a3f97 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveStreamer.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatCurveStreamer.java @@ -43,8 +43,7 @@ static int write(CurveAppender appender, appender.startCurve(closeableCurve.toWriterMetadata()); ResultMatCurveBlock block; while ((block = closeableCurve.nextBlock()) != null) { - appender.append(block.getXValues(), block.getYValues(), - block.getOffset(), block.getLength()); + appender.appendBlock(block); } appender.finishCurve(); curveCount++; @@ -55,6 +54,10 @@ static int write(CurveAppender appender, } interface CurveAppender { + default void appendBlock(ResultMatCurveBlock block) throws IOException { + append(block.getXValues(), block.getYValues(), block.getOffset(), block.getLength()); + } + void startCurve(ResultMatCurveMetadata metadata) throws IOException; void append(double[] xValues, @@ -86,6 +89,11 @@ public void append(double[] xValues, writer.append(xValues, yValues, offset, length); } + @Override + public void appendBlock(ResultMatCurveBlock block) throws IOException { + writer.append(block.getXValues(), block.getYValues(), block.getOffset(), block.getLength(), block.getAcquisitionTimes()); + } + @Override public void finishCurve() throws IOException { writer.finishCurve(); diff --git a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatPointExtractionSession.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatPointExtractionSession.java index 54837731..685a4c5a 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatPointExtractionSession.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/export/result/mat/ResultMatPointExtractionSession.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.HashMap; +import java.util.Arrays; import java.util.Map; /** @@ -71,8 +72,27 @@ public ResultMatCurveBlockCursor apply( if (first == null) { firstByGroup.put(groupKey, anchorOf(extracted)); } - return new NumericArrayResultMatBlockCursor( - extracted.getXValues(), extracted.getYValues(), blockPoints); + var cursor = new NumericArrayResultMatBlockCursor(extracted.getXValues(), extracted.getYValues(), blockPoints); + if (materialized.getTimestamps() == null) return cursor; + // Only exact source points carry a trusted clock; interpolation must not bridge acquisition gaps. + long[] selectedTimes = new long[extracted.getXValues().length]; + for (int i = 0; i < selectedTimes.length; i++) { + int sourceIndex = Arrays.binarySearch(materialized.getXValues(), extracted.getXValues()[i]); + if (sourceIndex >= 0) selectedTimes[i] = materialized.getTimestamps()[sourceIndex]; + } + return new ResultMatCurveBlockCursor() { + int offset; + public ResultMatCurveBlock nextBlock() throws IOException { + var block = cursor.nextBlock(); + if (block == null) return null; + var times = Arrays.copyOfRange(selectedTimes, offset, offset + block.getLength()); + offset += block.getLength(); + // NumericArray cursors can reference a nonzero source offset. + return ResultMatCurveBlock.wrap(Arrays.copyOfRange(block.getXValues(), block.getOffset(), block.getOffset() + block.getLength()), + Arrays.copyOfRange(block.getYValues(), block.getOffset(), block.getOffset() + block.getLength()), 0, block.getLength()).withAcquisitionTimes(times); + } + public void close() throws IOException { cursor.close(); } + }; } private AutoSaveCurvePointExtractor.ExtractedCurve anchorOf( 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/main/java/com/opentest/service/report/ReportArchiveBuilder.java b/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportArchiveBuilder.java index 06ee8150..709730a0 100644 --- a/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportArchiveBuilder.java +++ b/apps/backend/crydaq-service/src/main/java/com/opentest/service/report/ReportArchiveBuilder.java @@ -21,6 +21,7 @@ import com.opentest.service.DashboardResultService; import com.opentest.service.VariablesService; import com.opentest.service.component.ProjectDashboardComponent; +import com.opentest.service.axis.TimeAxisPreferenceService; import com.opentest.service.dashboard.framework.SavedProviderExecutionReader; import com.opentest.service.dashboard.framework.PluginDashboardConfigurationResolver; import com.opentest.service.grpc.replay.DashboardReplayTaskService; @@ -59,6 +60,7 @@ public class ReportArchiveBuilder { @Resource private VariablesService variablesService; @Resource private ObjectMapper objectMapper; @Resource private ProjectDashboardComponent dashboardComponent; + @Resource private TimeAxisPreferenceService timeAxisPreferenceService; @Resource private DashboardHistoryResponseAssembler historyAssembler; @Resource private DashboardResultService resultService; @Resource private DashboardRenderDataQueryService renderDataService; @@ -133,8 +135,14 @@ public Prepared build(ProjectReport report, JsonNode config, JsonNode command) t } } + private FlowExecuteResultDto readReportDetail(Long requestId) { + return timeAxisPreferenceService == null + ? dashboardComponent.findDashboardDtoByIdWithAllResultSets(requestId) + : timeAxisPreferenceService.readFrozenSnapshots(() -> dashboardComponent.findDashboardDtoByIdWithAllResultSets(requestId)); + } + private ObjectNode buildRecord(Long requestId, Long dashboardId, Long projectId, JsonNode selection, ReportArchiveFiles.Build files, long deadline) throws Exception { - FlowExecuteResultDto detail = dashboardComponent.findDashboardDtoByIdWithAllResultSets(requestId); + FlowExecuteResultDto detail = readReportDetail(requestId); if (detail == null || !Objects.equals(detail.getProjectId(), projectId) || detail.getDashboardConfig() == null || !Objects.equals(detail.getDashboardConfig().getId(), dashboardId)) throw new IllegalArgumentException("Record is unavailable or outside the report scope"); @@ -205,7 +213,7 @@ private ObjectNode buildRecord(Long requestId, Long dashboardId, Long projectId, lease = replayService.tryAcquireCompletedReadLease(requestId, task.getTaskId(), epoch).orElse(null); if (lease == null && !completedWithoutOutput) throw new IOException("Archive replay is unavailable"); renderDatas = renderDataService.query(requestId, selectedIds); - response = historyAssembler.assemble(requestId, dashboardComponent.findDashboardDtoByIdWithAllResultSets(requestId)); + response = historyAssembler.assemble(requestId, readReportDetail(requestId)); } } 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/axis/TimeAxisPreferenceServiceTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/TimeAxisPreferenceServiceTest.java new file mode 100644 index 00000000..7062151f --- /dev/null +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/axis/TimeAxisPreferenceServiceTest.java @@ -0,0 +1,109 @@ +package com.opentest.service.axis; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; +import com.opentest.common.model.dto.GraphicConfigSnapshotDto; +import com.opentest.common.model.entity.GraphicConfig; +import com.opentest.dal.mapper.sqlite.GraphicConfigMapper; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.test.util.ReflectionTestUtils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +class TimeAxisPreferenceServiceTest { + private final ObjectMapper json = new ObjectMapper(); + private final GraphicConfigMapper graphics = mock(GraphicConfigMapper.class); + private final TimeAxisPreferenceService service = new TimeAxisPreferenceService(); + private final GraphicConfig source = new GraphicConfig(); + @BeforeEach void setup() { + source.setId(1L); source.setProjectId(10L); source.setUnitX("s"); source.setOriginal("{\"xAxis\":{\"autoScale\":true}}"); + ReflectionTestUtils.setField(service, "json", json); ReflectionTestUtils.setField(service, "graphics", graphics); + when(graphics.selectById(1L)).thenReturn(source); + doAnswer(call -> { GraphicConfig update = call.getArgument(0); source.setOriginal(update.getOriginal()); source.setUnitX(update.getUnitX()); return 1; }).when(graphics).updateById(any(GraphicConfig.class)); + } + @Test void absolutePreferenceFollowsSourceAcrossRecordsWithoutChangingFrozenInputs() throws Exception { + String original = "{\"xAxis\":{\"unit\":\"s\",\"autoScale\":true},\"yAxis\":{\"start\":-5}}"; + String next = "{\"xAxis\":{\"unit\":\"h:m:s\",\"autoScale\":false,\"absoluteTimeRange\":{\"startNs\":\"1795075990180123456\",\"endNs\":\"1795075991180123456\"}}}"; + service.remember(1L, 10L, "s", "h:m:s", original, next); + var first = snapshot(original); + var second = snapshot(original); + first.setId(100L); second.setId(200L); + service.apply(first); service.apply(second); + assertEquals("h:m:s", second.getUnitX()); + assertEquals(json.readTree(first.getOriginal()).path("xAxis"), json.readTree(second.getOriginal()).path("xAxis")); + assertEquals("1795075990180123456", json.readTree(second.getOriginal()).path("xAxis").path("absoluteTimeRange").path("startNs").asText()); + assertEquals(-5, json.readTree(second.getOriginal()).path("yAxis").path("start").asInt()); + assertEquals("s", json.readTree(original).path("xAxis").path("unit").asText()); + } + @Test void switchingBackToSecondsReplacesTheAbsolutePreferenceWithAuto() throws Exception { + service.remember(1L, 10L, "s", "h:m:s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + service.remember(1L, 10L, "s", "s", source.getOriginal(), "{\"xAxis\":{\"unit\":\"s\",\"autoScale\":true}}"); + var record = snapshot("{\"xAxis\":{\"absoluteTimeRange\":{\"startNs\":\"1\",\"endNs\":\"2\"}}}"); + service.apply(record); + assertEquals("s", record.getUnitX()); + assertTrue(json.readTree(record.getOriginal()).path("xAxis").path("absoluteTimeRange").isNull()); + } + @Test void ordinarySecondsEditsAndForeignProjectsDoNotCreatePreferences() { + service.remember(1L, 10L, "s", "s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":false,\"start\":1,\"end\":2}}"); + service.remember(1L, 20L, "s", "h:m:s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + verify(graphics, never()).updateById(any(GraphicConfig.class)); + } + @Test void reportReadsKeepFrozenUnitsAndRestoreNormalReadsEvenAfterFailure() { + service.remember(1L, 10L, "s", "h:m:s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + var report = snapshot("{\"xAxis\":{\"unit\":\"s\",\"autoScale\":false,\"start\":500,\"end\":1500}}"); + assertThrows(IllegalStateException.class, () -> service.readFrozenSnapshots(() -> { + service.apply(report); + assertEquals("s", report.getUnitX()); + throw new IllegalStateException("read failed"); + })); + var measurement = snapshot(report.getOriginal()); + service.apply(measurement); + assertEquals("h:m:s", measurement.getUnitX()); + } + + @Test void temporaryMissingClockFallbackDoesNotReplaceTheSourcePreference() throws Exception { + service.remember(1L, 10L, "s", "h:m:s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + service.remember(1L, 10L, "h:m:s", "s", source.getOriginal(), "{\"timeAxisReadFallback\":true,\"xAxis\":{\"autoScale\":false,\"start\":500,\"end\":1500}}"); + var record = snapshot("{\"xAxis\":{\"unit\":\"s\",\"autoScale\":false,\"start\":500,\"end\":1500}}"); + service.apply(record); + assertEquals("h:m:s", record.getUnitX()); + assertEquals(500, json.readTree(record.getOriginal()).path("timeAxisSecondsFallback").path("start").asInt()); + } + + @Test void returningFromEffectiveClockToSecondsPreservesOtherRecordsSecondsRanges() throws Exception { + service.remember(1L, 10L, "s", "h:m:s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + // This raw-s snapshot is currently displayed through the source's clock preference. + service.remember(1L, 10L, "s", "s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true,\"absoluteTimeRange\":null}}"); + var legacy = snapshot("{\"xAxis\":{\"unit\":\"s\",\"autoScale\":false,\"start\":1000,\"end\":3000}}"); + service.apply(legacy); + JsonNode axis = json.readTree(legacy.getOriginal()).path("xAxis"); + assertEquals("s", legacy.getUnitX()); assertFalse(axis.path("autoScale").asBoolean()); + assertEquals(1000, axis.path("start").asInt()); assertEquals(3000, axis.path("end").asInt()); + String before = source.getOriginal(); + service.remember(1L, 10L, "h:m:s", "s", legacy.getOriginal(), "{\"xAxis\":{\"autoScale\":false,\"start\":2000,\"end\":4000}}"); + assertEquals(before, source.getOriginal(), "Ordinary seconds edits must stay local despite a raw clock unit"); + } + + @Test void secondsPreferenceResetsAStoredClockRangeInsteadOfReinterpretingItsCoordinates() throws Exception { + service.remember(1L, 10L, "h:m:s", "s", source.getOriginal(), "{\"xAxis\":{\"autoScale\":true}}"); + var oldClock = snapshot("{\"xAxis\":{\"unit\":\"h:m:s\",\"autoScale\":false,\"start\":500,\"end\":1500,\"absoluteTimeRange\":{\"startNs\":\"1\",\"endNs\":\"2\"}}}"); + oldClock.setUnitX("h:m:s"); service.apply(oldClock); + JsonNode axis = json.readTree(oldClock.getOriginal()).path("xAxis"); + assertTrue(axis.path("autoScale").asBoolean()); assertFalse(axis.has("start")); + assertTrue(axis.path("absoluteTimeRange").isNull()); + } + + private GraphicConfigSnapshotDto snapshot(String display) { + var result = new GraphicConfigSnapshotDto(); result.setGraphicConfigId(1L); result.setProjectId(10L); + result.setUnitX("s"); result.setOriginal(display); return result; + } +} 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 525141bc..010c15c2 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(directory.toUri().toASCIIString(), + 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/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java index 36f73f15..17ea4a05 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ProjectReportLifecycleTest.java @@ -159,6 +159,16 @@ void saveViewport(long reportId, ReportChartViewportDto command) { transaction.executeWithoutResult(status -> service.saveChartViewport(10L, reportId, command)); } + @Test void viewportPersistsAbsoluteTimeStringsAndRejectsInvertedDates() throws Exception { + graphic(45L, 30L); + var report = save(draft("GENERAL", 30L)); + var choice = viewport(30L, 45L, "{\"x\":{\"mode\":\"manual\",\"start\":500,\"end\":1500,\"timeUnit\":\"h:m:s\",\"absoluteTimeRange\":{\"startNs\":\"1795075990180123456\",\"endNs\":\"1795075991180123456\"}}}"); + saveViewport(report.getId(), choice); + assertEquals(choice.getViewport(), service.chartViewports(10L, report.getId()).path("30").path("45")); + var invalid = viewport(30L, 45L, "{\"x\":{\"mode\":\"manual\",\"start\":500,\"end\":1500,\"absoluteTimeRange\":{\"startNs\":\"2\",\"endNs\":\"1\"}}}"); + assertThrows(CryBusinessException.class, () -> saveViewport(report.getId(), invalid)); + } + @Test void viewportsPersistIndependentlyAcrossReportsAndCopyWithoutChangingHistoryOrDraftRevision() throws Exception { var source = graphic(45L, 30L); graphic(46L, 30L); var first = save(draft("GENERAL", 30L)); var second = save(draft("GENERAL", 30L)); diff --git a/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ReportArchiveDocumentsTest.java b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ReportArchiveDocumentsTest.java index 7cd57d77..c0194239 100644 --- a/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ReportArchiveDocumentsTest.java +++ b/apps/backend/crydaq-service/src/test/java/com/opentest/service/report/ReportArchiveDocumentsTest.java @@ -19,6 +19,10 @@ import com.opentest.service.DashboardResultService; import com.opentest.service.VariablesService; import com.opentest.service.component.ProjectDashboardComponent; +import com.opentest.service.axis.TimeAxisPreferenceService; +import com.opentest.common.model.dto.GraphicConfigSnapshotDto; +import com.opentest.common.model.entity.GraphicConfig; +import com.opentest.dal.mapper.sqlite.GraphicConfigMapper; import com.opentest.service.dashboard.framework.PluginDashboardConfigurationResolver; import com.opentest.service.dashboard.framework.SavedProviderExecutionReader; import com.opentest.service.grpc.replay.DashboardReplayTaskService; @@ -82,7 +86,21 @@ class ReportArchiveDocumentsTest { var detail = new FlowExecuteResultDto(); detail.setId(request); detail.setProjectId(10L); detail.setResultStorageMode(ResultStorageModeEnum.LEGACY); var config = new DashboardConfigDto(); config.setId(dashboard); config.setProjectId(10L); config.setProviderId("test:measure"); config.setDashboardItemConfig(new DashboardItemConfigDto()); detail.setDashboardConfig(config); - var component = mock(ProjectDashboardComponent.class); when(component.findDashboardDtoByIdWithAllResultSets(request)).thenReturn(detail); + var timePreferences = new TimeAxisPreferenceService(); + var graphics = mock(GraphicConfigMapper.class); + var source = new GraphicConfig(); source.setId(45L); source.setProjectId(10L); + source.setOriginal("{\"timeAxisPreference\":{\"unit\":\"h:m:s\",\"axis\":{\"autoScale\":true}}}"); + when(graphics.selectById(45L)).thenReturn(source); + ReflectionTestUtils.setField(timePreferences, "graphics", graphics); + ReflectionTestUtils.setField(timePreferences, "json", mapper); + var component = mock(ProjectDashboardComponent.class); + when(component.findDashboardDtoByIdWithAllResultSets(request)).thenAnswer(call -> { + var graphic = new GraphicConfigSnapshotDto(); graphic.setGraphicConfigId(45L); graphic.setProjectId(10L); + graphic.setUnitX("s"); graphic.setOriginal("{\"xAxis\":{\"unit\":\"s\",\"autoScale\":true}}"); + timePreferences.apply(graphic); + assertEquals("s", graphic.getUnitX(), "Archiving must use the report's frozen time basis"); + return detail; + }); ObjectNode response = mapper.createObjectNode().put("id", Long.toString(request)); response.putObject("dashboardConfig").put("id", Long.toString(dashboard)).put("providerId", "test:measure") .putObject("dashboardItemConfig").putObject("signalAnalysisConfig").putObject("soundPowerConfig").put("actualStandardType", "GB_28543_2021"); @@ -95,6 +113,7 @@ class ReportArchiveDocumentsTest { var replays = mock(DashboardReplayTaskService.class); var builder = new ReportArchiveBuilder(); ReflectionTestUtils.setField(builder, "variablesService", variables); ReflectionTestUtils.setField(builder, "objectMapper", mapper); + ReflectionTestUtils.setField(builder, "timeAxisPreferenceService", timePreferences); ReflectionTestUtils.setField(builder, "dashboardComponent", component); ReflectionTestUtils.setField(builder, "historyAssembler", history); ReflectionTestUtils.setField(builder, "resultService", selectors); ReflectionTestUtils.setField(builder, "renderDataService", render); ReflectionTestUtils.setField(builder, "dashboardMapper", dashboards); ReflectionTestUtils.setField(builder, "resultMapper", rows); 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/chart-tools/axis-interval-endpoints.vue b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/chart-tools/axis-interval-endpoints.vue index 5d3e7779..12a1663f 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/chart-tools/axis-interval-endpoints.vue +++ b/apps/frontend/src/libs/charts/adapters/crychart/data-graph/components/chart-tools/axis-interval-endpoints.vue @@ -12,6 +12,9 @@ import type { } from '@/modules/shared/data-graph/types' import { formatNumber } from '@/utils/value-formatter' import AxisNumberInput from '@/modules/shared/data-graph/components/config/axis-number-input.vue' +import AxisTimeInput from '@/modules/shared/data-graph/components/config/axis-time-input.vue' +import { isClockUnit } from '@/modules/shared/data-graph/utils/time-axis' +import { captureAbsoluteTimeRange, getTimeAxisMapping, projectAbsoluteTimeRange, type TimeAxisMapping } from '@/modules/shared/data-graph/utils/time-axis-range' type AxisType = 'x' | 'y' | 'yRight' type EndpointType = 'start' | 'end' @@ -46,6 +49,9 @@ interface ChartLike { } interface ChartInstanceLike { + timeOriginNs?: bigint + getTimeCoordinateScale?: () => number + getAcquisitionTimeMapping?: () => TimeAxisMapping | undefined getXAxisDisplayMapping?: () => DataGraphXAxisDisplayMapping addEventListener?: (_event: string, _listener: () => void) => void removeEventListener?: (_event: string, _listener: () => void) => void @@ -95,6 +101,11 @@ const activeEndpoint = shallowRef(null) const endpointInputs = shallowRef>>({}) const pendingEndpointFocus = shallowRef(null) const draftEditValue = shallowRef(null) +const draftTimestamp = shallowRef() +let initialTimestamp: string | undefined +let editingClockRange: DataGraphAxisConfig['absoluteTimeRange'] +let editingClockMapping: TimeAxisMapping | undefined +let editingOriginNs: bigint | undefined let initialEditValue: number | null = null let editingXMapping: DataGraphXAxisDisplayMapping | undefined let editingXUnitType: AxisXValueType @@ -135,6 +146,7 @@ const targetAxis = computed(() => { const axisXType = computed(() => { return props.type === 'x' ? props.chartInstance?.axisXUnitType?.() : undefined }) +const isClockAxis = computed(() => props.type === 'x' && isClockUnit(axisConfig.value?.unit ?? props.config?.unitX)) function resolveYAxisDisplayMapping(): DataGraphYAxisDisplayMapping | undefined { if (props.type === 'x') { @@ -340,6 +352,12 @@ function openEditor(endpoint: EndpointType) { pendingEndpointFocus.value = endpoint editingXMapping = props.type === 'x' ? props.chartInstance?.getXAxisDisplayMapping?.() : undefined editingXUnitType = axisXType.value + editingClockMapping = isClockAxis.value ? getTimeAxisMapping(props.chartInstance) : undefined + editingOriginNs = props.chartInstance?.timeOriginNs + if (isClockAxis.value && !editingClockMapping) { closeEditor(); return } + editingClockRange = isClockAxis.value ? captureAbsoluteTimeRange(editingClockMapping, interval) : undefined + initialTimestamp = editingClockRange?.[endpoint === 'start' ? 'startNs' : 'endNs'] + draftTimestamp.value = initialTimestamp const displayValue = props.type === 'x' ? Number(toAxisDisplayX(editingXMapping?.toDisplay(interval[endpoint]) ?? interval[endpoint], editingXUnitType)) @@ -380,6 +398,11 @@ function setEndpointInput(endpoint: EndpointType, input: InputNumberLike | null) } function closeEditor() { + editingClockMapping = undefined + editingClockRange = undefined + editingOriginNs = undefined + draftTimestamp.value = undefined + initialTimestamp = undefined editingXMapping = undefined editingXUnitType = undefined pendingEndpointFocus.value = null @@ -408,8 +431,9 @@ async function confirmEdit() { closeEditor() return } + if (isClockAxis.value && editingOriginNs !== props.chartInstance?.timeOriginNs) { closeEditor(); return } const endpoint = activeEndpoint.value - const inputValue = toFiniteNumber(draftEditValue.value) + const inputValue = isClockAxis.value ? 0 : toFiniteNumber(draftEditValue.value) const currentInterval = readCurrentInterval() const config = axisConfig.value const axis = targetAxis.value @@ -418,14 +442,16 @@ async function confirmEdit() { return } - if (inputValue === initialEditValue) { + if (isClockAxis.value ? draftTimestamp.value === initialTimestamp : inputValue === initialEditValue) { closeEditor() return } const displayMapping = resolveYAxisDisplayMapping() const mappedMagnitude = displayMapping?.toRawMagnitude(inputValue) - const nextInterval = displayMapping + const clockRange = isClockAxis.value && editingClockRange ? { ...editingClockRange } : undefined + if (clockRange && draftTimestamp.value) clockRange[endpoint === 'start' ? 'startNs' : 'endNs'] = draftTimestamp.value + const nextInterval = isClockAxis.value ? projectAbsoluteTimeRange(clockRange, getTimeAxisMapping(props.chartInstance)) : displayMapping ? Number.isFinite(mappedMagnitude) ? { start: -mappedMagnitude!, end: mappedMagnitude! } : null @@ -440,6 +466,7 @@ async function confirmEdit() { } config.autoScale = false + if (clockRange) config.absoluteTimeRange = clockRange if (props.type === 'x' && editingXMapping) config.timeCoordinateSystem = 'raw' config.start = nextInterval.start config.end = nextInterval.end @@ -535,7 +562,7 @@ onUnmounted(() => { :visible="!editDisabled && activeEndpoint === endpoint.key" trigger="click" placement="top" - width="172" + :width="isClockAxis ? 380 : 172" popper-class="axis-interval-endpoint-popper" :show-arrow="false" teleported @@ -566,8 +593,14 @@ onUnmounted(() => { + type DisplaySettingsFormData = DataGraphDisplaySettings 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..9bb1e960 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 @@ -1,6 +1,6 @@ import { flushPromises, mount } from '@vue/test-utils' import { TEST_PLAYBAXK_INJECTION_KEY } from '@/constants/chart' -import { computed, h, nextTick, ref, shallowRef } from 'vue' +import { computed, h, nextTick, ref, shallowRef, toRaw } from 'vue' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import i18n from '@/locales/index' @@ -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, @@ -1647,6 +1671,7 @@ describe('ChartBox context menu', () => { mocks.axisMenuOptions.onConfig(config) + expect(toRaw(wrapper.emitted('config')?.[0]?.[1])).toBe(chartInstance) const emittedConfig = wrapper.emitted('config')?.[0]?.[0] as AxesConfigFixture expect(emittedConfig).not.toBe(config) expect(emittedConfig.graphDisplaySettings).toMatchObject({ 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..51a504b0 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/shared/data-graph/components/config/axis-view.test.ts b/apps/frontend/src/modules/shared/data-graph/components/config/axis-view.test.ts index ec9007b5..e3a383c8 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,8 +190,8 @@ function mountAxisView(modelValue, type = AXIS_TYPE_ENUM.X, config = {}, systemS ElInput: InputTextStub, ElCheckbox: CheckboxStub, DcSimpleSelect: SimpleSelectStub, - DcRangeInput: RangeInputStub, AxisRangeInput: RangeInputStub, + DcRangeInput: RangeInputStub, DcInputNumber: InputNumberStub, DcGradientColor: passthrough('DcGradientColor') } @@ -247,6 +248,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, @@ -719,6 +733,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 @@ 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..7237b00e 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 @@