Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@antv/x6-plugin-minimap": "2.0.7",
"@antv/x6-vue-shape": "2.1.2",
"@element-plus/icons-vue": "2.3.1",
"@crysound/crychart": "1.0.1",
"@crysound/crychart": "1.0.2",
"@number-flow/vue": "0.5.2",
"@vueuse/core": "12.7.0",
"axios": "1.7.9",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { mount } from '@vue/test-utils'
import { computed, nextTick, ref, toValue, useTemplateRef, watch, watchEffect } from 'vue'
import { computed, nextTick, ref, shallowRef, toValue, useTemplateRef, watch, watchEffect } from 'vue'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import WaveformView from '../index.vue'
import { WaveformTimeIndexLoadError } from '@/modules/shared/data-graph/utils/waveform-time-index-error'
import type { DataGraphAxisConfig, DataGraphConfig } from '../../../../../../../../../modules/shared/data-graph/types'

const mocks = vi.hoisted(() => {
Expand All @@ -27,11 +28,13 @@ const mocks = vi.hoisted(() => {
}
const chartInstance = chartInstanceBase as typeof chartInstanceBase & {
getSeriesDataComplete: (_seriesId: string) => boolean
timeOriginNs?: bigint
}

return {
axisX,
chartInstance,
chartRef: null,
createRef,
loadGraphicData: vi.fn(),
cryChartOptions: null,
Expand Down Expand Up @@ -88,7 +91,7 @@ vi.mock('@/libs/charts/adapters/crychart/data-graph/hooks/use-cry-chart', () =>
useCryChart: vi.fn(options => {
mocks.cryChartOptions = options
return {
chartInstance: mocks.createRef(mocks.chartInstance),
chartInstance: mocks.chartRef,
updateChartData: mocks.updateChartData,
clearPendingUpdates: vi.fn()
}
Expand Down Expand Up @@ -277,6 +280,8 @@ describe('WaveformView clearData', () => {

beforeEach(() => {
vi.clearAllMocks()
mocks.chartInstance.timeOriginNs = undefined
mocks.chartRef = shallowRef(mocks.chartInstance)
mocks.cryChartOptions = null
mocks.calibrationOptions = null
mocks.playbackRunning = ref(false)
Expand All @@ -297,6 +302,33 @@ describe('WaveformView clearData', () => {
vi.unstubAllGlobals()
})

it('gives a chart created after the index the same origin used for loading windows', async () => {
mocks.chartRef.value = null
const wrapper = mount(WaveformView, { props: { config: createPreviewConfig() } })
mocks.waveformDataOptions.onIndexLoaded({
later: [{ timeOriginNs: '1794312010000000123' }],
earlier: [{ timeOriginNs: '1794312000000000123' }]
})
expect(mocks.waveformDataOptions.getTimeOriginNsFn()).toBe(1794312000000000123n)
mocks.chartRef.value = mocks.chartInstance
await nextTick()
expect(mocks.chartInstance.timeOriginNs).toBe(1794312000000000123n)
wrapper.unmount()
})

it('shows a file error for an invalid time index until a valid index is loaded', async () => {
const wrapper = mount(WaveformView, { props: { config: createPreviewConfig() } })
const alert = '[data-testid="waveform-index-load-error"]'
expect(wrapper.find(alert).exists()).toBe(false)
mocks.waveformDataOptions.onError(new WaveformTimeIndexLoadError('series-1', new Error('decreasing timestamps')))
await nextTick()
expect(wrapper.get(alert).attributes('role')).toBe('alert')
mocks.waveformDataOptions.onIndexLoaded({ 'series-1': [{ timeOriginNs: '1794312000000000123' }] })
await nextTick()
expect(wrapper.find(alert).exists()).toBe(false)
wrapper.unmount()
})

it('fits an Enhancement Waveform overwrite frame to its sample duration', () => {
const wrapper = mount(WaveformView, {
props: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,25 @@ describe('waveform and preview clock', () => {
expect(main.timeOriginNs).toBeUndefined()
})

it('keeps the indexed origin when the preview and main chart are created after the index', () => {
const context = createWaveformTimeAxisContext()
context.initializeFromIndex({
late: [{ timeOriginNs: '1794312010000000123' }],
early: [{ timeOriginNs: '1794312000000000123' }]
})
expect(context.origin.value).toBe(1794312000000000123n)
const preview = { timeOriginNs: undefined as bigint | undefined }
const main = { timeOriginNs: 1n as bigint | undefined }
context.apply(preview, { timeOriginNs: '1794312010000000123', start: 0, step: 1, yValues: [1, 2] })
context.apply(main)
expect(main.timeOriginNs).toBe(1794312000000000123n)
expect(preview.timeOriginNs).toBe(main.timeOriginNs)
context.reset()
context.initializeFromIndex({ replacement: [{ timeOriginNs: '1794312020000000123' }] })
context.apply(main)
expect(main.timeOriginNs).toBe(1794312020000000123n)
})

it('derives the shared clock from realtime acquisition timestamps, excluding rejected batches', () => {
const context = createWaveformTimeAxisContext()
const chart = { timeOriginNs: undefined as bigint | undefined }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@
/>
</div>
<div
v-if="hasMissingCalibration"
v-if="waveformIndexError"
class="waveform-load-error"
data-testid="waveform-index-load-error"
role="alert"
>
{{ translate('chart.config.fileReadError') }}
</div>
<div
v-else-if="hasMissingCalibration"
class="calibration-message"
data-testid="missing-waveform-calibration"
role="status"
Expand All @@ -41,8 +49,12 @@ import ChartBox from '@/libs/charts/adapters/crychart/data-graph/components/core
import { useCryChart } from '@/libs/charts/adapters/crychart/data-graph/hooks/use-cry-chart'
import { useWaveformData } from '@/modules/shared/data-graph/components/views/waveform/use-waveform-data'
import { useDataLoadTask } from '@/modules/shared/data-graph/hooks/use-data-load-task'
import { WaveformTimeIndexLoadError } from '@/modules/shared/data-graph/utils/waveform-time-index-error'
import { useWaveformDisplayMappingCalibration } from '@/modules/shared/data-graph/hooks/use-waveform-display-mapping-calibration'
import { createWaveformCoordinateProjector, type WaveformCoordinateMetadata } from '@/modules/shared/data-graph/utils/waveform-coordinates'
import {
createWaveformCoordinateProjector,
type WaveformCoordinateMetadata
} from '@/modules/shared/data-graph/utils/waveform-coordinates'
import { useWaveformInterpolation } from '@/modules/shared/data-graph/components/views/waveform/use-waveform-interpolation'
import { useWaveformRender } from '@/modules/shared/data-graph/components/views/waveform/use-waveform-render'
import { useElementSize } from '@vueuse/core'
Expand Down Expand Up @@ -74,7 +86,15 @@ const timeSourceKey = () => waveformTimeSourceKey(props.config.renderDatas)
let loadedTimeSourceKey = timeSourceKey()
let previewDataSourceKey = createDataSourceFingerprint(props.config.renderDatas ?? [])
const timeAxisContext = createWaveformTimeAxisContext()
watch(timeSourceKey, () => timeAxisContext.reset(), { flush: 'sync' })
const waveformIndexError = shallowRef(false)
watch(
timeSourceKey,
() => {
timeAxisContext.reset()
waveformIndexError.value = false
},
{ flush: 'sync' }
)

const { playbackRunning, playbackTime, playbackEnabled, playbackWaveformInterval } = usePlaybackInfo()

Expand Down Expand Up @@ -121,15 +141,15 @@ const applyWaveformDisplayUnitReference = (result: WaveformDisplayReference) =>
}
pendingDisplayReferences.delete(key)
const wasMissing = missingCalibrationSeriesIds.value.has(key)
const sourceUnit = result.sourceUnitY?.trim() ?? (
unitConversion?.displayOnly ? unitConversion.sourceUnit?.trim() : unitConversion?.targetUnit?.trim()
)
const sourceUnit =
result.sourceUnitY?.trim() ??
(unitConversion?.displayOnly ? unitConversion.sourceUnit?.trim() : unitConversion?.targetUnit?.trim())
const targetUnit = result.targetUnitY?.trim() ?? unitConversion?.targetUnit?.trim()
const isCalibratedDbTarget = ['dBV', 'dBSPL'].includes(targetUnit)
const requiresCalibration = result.displayOnly === true || unitConversion?.displayOnly === true || (
isCalibratedDbTarget
&& (!sourceUnit || sourceUnit.toUpperCase() === 'FS')
)
const requiresCalibration =
result.displayOnly === true ||
unitConversion?.displayOnly === true ||
(isCalibratedDbTarget && (!sourceUnit || sourceUnit.toUpperCase() === 'FS'))

if (sourceUnit !== undefined) {
chartInstance.value?.setWaveformSourceUnit?.(seriesId, sourceUnit)
Expand Down Expand Up @@ -225,7 +245,11 @@ const waveformDisplayMappingCalibration = useWaveformDisplayMappingCalibration({
inferRealtimeDisplayCoordinateUnit: true
})

const { chartInstance, updateChartData: submitChartData, clearPendingUpdates } = useCryChart({
const {
chartInstance,
updateChartData: submitChartData,
clearPendingUpdates
} = useCryChart({
config: () => props.config,
containerRef,
loadDataFn: () => requestDataLoad(),
Expand All @@ -252,14 +276,22 @@ watch([chartInstance, timeAxisContext.origin], ([instance]) => timeAxisContext.a
flush: 'sync'
})

watch(chartInstance, instance => {
if (instance) pendingDisplayReferences.forEach(applyWaveformDisplayUnitReference)
}, { flush: 'sync' })
watch(() => createDataSourceFingerprint(props.config.renderDatas ?? []), () => {
pendingDisplayReferences.clear()
// 未建图时通用配置更新尚不能重载,清掉旧样本并使用现有请求代际加载新来源。
if (!chartInstance.value) reloadMainData()
}, { flush: 'sync' })
watch(
chartInstance,
instance => {
if (instance) pendingDisplayReferences.forEach(applyWaveformDisplayUnitReference)
},
{ flush: 'sync' }
)
watch(
() => createDataSourceFingerprint(props.config.renderDatas ?? []),
() => {
pendingDisplayReferences.clear()
// 未建图时通用配置更新尚不能重载,清掉旧样本并使用现有请求代际加载新来源。
if (!chartInstance.value) reloadMainData()
},
{ flush: 'sync' }
)

const getSeriesDataComplete = (seriesId: string | number) => {
if (isRealtime.value || showPreview.value) {
Expand Down Expand Up @@ -357,10 +389,16 @@ const updateData = (seriesId: string | number, data: DataGraphSeriesData, isAppe
renderData,
frame: data,
replay: mappedData => {
waveformCoordinates.submit(seriesId, mappedData, mappedData, (projected, metadata) => {
if (!applyWaveformDisplayUnitReference({ seriesId, ...metadata })) return
renderWaveformData(seriesId, projected, isAppend)
}, isAppend && !props.config.isRealtime)
waveformCoordinates.submit(
seriesId,
mappedData,
mappedData,
(projected, metadata) => {
if (!applyWaveformDisplayUnitReference({ seriesId, ...metadata })) return
renderWaveformData(seriesId, projected, isAppend)
},
isAppend && !props.config.isRealtime
)
}
})
}
Expand All @@ -369,6 +407,7 @@ const { isLoading, loadGraphicData, xDataMax } = useWaveformData({
config: () => props.config,
lazy: showPreview,
getSeriesTimeOffsetFn: seriesId => chartInstance.value?.getSeriesTimeOffset?.(seriesId) ?? 0,
getTimeOriginNsFn: () => timeAxisContext.origin.value,
getIntervalFn: () => {
const axis = chartInstance.value?.getDefaultAxisX()
if (axis) {
Expand All @@ -381,18 +420,36 @@ const { isLoading, loadGraphicData, xDataMax } = useWaveformData({
},
onDataLoaded: (data, result) => {
const { seriesId, step, isAppend, start } = result
waveformCoordinates.submit(seriesId, { ...data, timeOriginNs: typeof result.timeOriginNs === 'string' ? result.timeOriginNs : data.timeOriginNs, yValues: data.yValues, step, start }, result, (projected, metadata) => {
if (!applyWaveformDisplayUnitReference({ seriesId, ...metadata })) return
mainDataLoadTask.markDataLoaded(seriesId, projected)
renderWaveformData(seriesId, projected, isAppend)
}, isAppend)
waveformCoordinates.submit(
seriesId,
{
...data,
timeOriginNs: typeof result.timeOriginNs === 'string' ? result.timeOriginNs : data.timeOriginNs,
yValues: data.yValues,
step,
start
},
result,
(projected, metadata) => {
if (!applyWaveformDisplayUnitReference({ seriesId, ...metadata })) return
mainDataLoadTask.markDataLoaded(seriesId, projected)
renderWaveformData(seriesId, projected, isAppend)
},
isAppend
)
},
onIndexLoaded: indexMap => {
const indexEntries = Object.entries(indexMap ?? {})
waveformIndexError.value = false
timeAxisContext.initializeFromIndex(indexMap)
timeAxisContext.apply(chartInstance.value)
seriesFileCompleteness.value = new Map(indexEntries.map(([seriesId]) => [String(seriesId), false]))
const hasMultipleShards = indexEntries.some(([, files]) => Array.isArray(files) && files.length > 1)
hasMultipleMainShards.value = hasMultipleShards
},
onError: error => {
if (error instanceof WaveformTimeIndexLoadError) waveformIndexError.value = true
},
onSeriesDataComplete: (seriesId, complete) => {
const nextCompleteness = new Map(seriesFileCompleteness.value)
nextCompleteness.set(String(seriesId), complete === true)
Expand All @@ -406,9 +463,7 @@ const mainDataLoadTask = useDataLoadTask({
execute: async ({ mode, resetPreviewState, preserveTimeOrigin, ...loadOptions }) => {
if (mode === 'refresh') clearLoadedData(resetPreviewState === true, preserveTimeOrigin === true)
try {
const result = await loadGraphicData(
mode === 'poll' ? { ...loadOptions, poll: true } : mode === 'refresh'
)
const result = await loadGraphicData(mode === 'poll' ? { ...loadOptions, poll: true } : mode === 'refresh')
if (result?.error) throw result.error
} finally {
waveformCoordinates.finish()
Expand All @@ -417,9 +472,13 @@ const mainDataLoadTask = useDataLoadTask({
})

// 包括缩放、预览拖动和播放参与者触发的内部加载,均在队列结束时释放待校准块。
watch(isLoading, loading => {
if (!loading) waveformCoordinates.finish()
}, { flush: 'sync' })
watch(
isLoading,
loading => {
if (!loading) waveformCoordinates.finish()
},
{ flush: 'sync' }
)

const aggregateWaveformTasks = tasks => {
const settled = Promise.all(tasks.map(task => task.settled)).then(
Expand Down Expand Up @@ -647,6 +706,7 @@ defineExpose({
max-height: 80px;
}

.waveform-load-error,
.calibration-message {
position: absolute;
top: 8px;
Expand All @@ -660,5 +720,9 @@ defineExpose({
border-radius: 4px;
transform: translateX(-50%);
}

.waveform-load-error {
color: var(--el-color-danger);
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ export function createWaveformTimeAxisContext() {
const origin = shallowRef<bigint>()
return {
origin,
initializeFromIndex(files: Record<string, ReadonlyArray<{ timeOriginNs?: string }>> = {}) {
if (origin.value !== undefined) return
let earliest: bigint | undefined
for (const series of Object.values(files)) {
for (const file of series) {
const candidate = parseTimeOrigin(file.timeOriginNs)
if (candidate !== undefined && (earliest === undefined || candidate < earliest)) earliest = candidate
}
}
origin.value = earliest
},
apply(chart?: Pick<DataGraphChartInstance, 'timeOriginNs'> | null, data?: DataGraphSeriesData, fallbackOrigin?: string) {
const timed = data && resolveTimestampData(data, { waveform: true })
if (origin.value === undefined && timed && increasingTimeRange(timed)) {
Expand Down
Loading
Loading