waveform-analysis 0.1.36 → 0.1.38

package/src/components/waveformChartCases/interactionAndAnnotationCreation.test.ts

@@ -1,10 +1,18 @@
-import { flushPromises } from '@vue/test-utils'
+import { DOMWrapper, flushPromises } from '@vue/test-utils'
 import { describe, expect, it } from 'vitest'
 
 import { flushAnimationFrames, pendingAnimationFrameCount } from '../../test/setup'
 
 import { mountSizedChart } from '../../test/waveformChart'
 
+function getAnnotationEditor() {
+  const editor = Array.from(document.body.querySelectorAll<HTMLElement>('[role="dialog"]'))
+    .filter((element) => element.closest('.waveform-annotation-editor'))
+    .at(-1)
+  if (!editor) throw new Error('Expected annotation editor modal to be mounted')
+  return new DOMWrapper(editor)
+}
+
 describe('WaveformChart', () => {
   it('zooms only the active independent track and resets when the mode changes', async () => {
     const wrapper = await mountSizedChart({
@@ -172,9 +180,10 @@ describe('WaveformChart', () => {
     )
     await flushPromises()
 
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(true)
-    await wrapper.get('textarea[aria-label="标注文本"]').setValue('峰值点')
-    await wrapper.get('.waveform-annotation-editor button.is-primary').trigger('click')
+    const editor = getAnnotationEditor()
+    await editor.get('textarea[aria-label="标注文本"]').setValue('峰值点')
+    await editor.get('button.ant-btn-primary').trigger('click')
+    await flushPromises()
 
     const annotations = wrapper.emitted('update:annotations')?.at(-1)?.[0] as
       Array<{ seriesId: string; x: number; y: number; text: string }> | undefined
@@ -209,10 +218,10 @@ describe('WaveformChart', () => {
       }),
     )
     await flushPromises()
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(true)
-    expect(wrapper.get('.waveform-annotation-editor').attributes('aria-modal')).toBe('true')
-    expect(wrapper.find('.waveform-annotation-editor__panel').exists()).toBe(true)
-    const textarea = wrapper.get('textarea[aria-label="标注文本"]')
+    const editor = getAnnotationEditor()
+    expect(editor.attributes('role')).toBe('dialog')
+    expect(editor.find('.waveform-annotation-editor__content').exists()).toBe(true)
+    const textarea = editor.get('textarea[aria-label="标注文本"]')
     const textareaContextMenu = new MouseEvent('contextmenu', {
       bubbles: true,
       cancelable: true,
@@ -220,7 +229,8 @@ describe('WaveformChart', () => {
     expect(textarea.element.dispatchEvent(textareaContextMenu)).toBe(true)
     expect(textareaContextMenu.defaultPrevented).toBe(false)
     await textarea.setValue('右键标注')
-    await wrapper.get('.waveform-annotation-editor button.is-primary').trigger('click')
+    await editor.get('button.ant-btn-primary').trigger('click')
+    await flushPromises()
 
     // Annotation snaps to nearest sample point (x=1, y=5)
     expect(wrapper.emitted('update:annotations')?.at(-1)?.[0]).toMatchObject([
@@ -278,20 +288,20 @@ describe('WaveformChart', () => {
     )
     await flushPromises()
     expect(
-      wrapper
-        .find('select[aria-label="选择标注波形"]')
+      getAnnotationEditor()
+        .get('select[aria-label="选择标注波形"]')
         .findAll('option')
         .map((item) => item.text()),
     ).toEqual(['通道 A'])
 
-    await wrapper.get('button[aria-label="关闭标注编辑器"]').trigger('click')
+    await getAnnotationEditor().get('.ant-modal-close').trigger('click')
     overlays[0].element.dispatchEvent(
       new MouseEvent('contextmenu', { clientX: 356, clientY: 230, bubbles: true }),
     )
     await flushPromises()
     expect(
-      wrapper
-        .find('select[aria-label="选择标注波形"]')
+      getAnnotationEditor()
+        .get('select[aria-label="选择标注波形"]')
         .findAll('option')
         .map((item) => item.text()),
     ).toEqual(['通道 B'])

package/src/components/waveformChartCases/legendVisibility.test.ts

@@ -7,14 +7,39 @@ import WaveformChartView from '../WaveformChartView.vue'
 
 import { gridSeries, mountSizedChart, visibilitySeries } from '../../test/waveformChart'
 
+function annotationEditorExists() {
+  return Boolean(
+    Array.from(document.body.querySelectorAll<HTMLElement>('[role="dialog"]'))
+      .filter((element) => element.closest('.waveform-annotation-editor'))
+      .at(-1),
+  )
+}
+
 describe('WaveformChart', () => {
+  it('shows legends when a track contains at least two series', async () => {
+    const oneSeries = visibilitySeries()
+    if (oneSeries.kind === 'series') oneSeries.series = oneSeries.series.slice(0, 1)
+    const withoutLegend = await mountSizedChart(oneSeries, {
+      grid: { rowCount: 1, columnCount: 1 },
+    })
+    expect(withoutLegend.findAll('.waveform-chart__legend')).toHaveLength(0)
+
+    const twoSeries = visibilitySeries()
+    if (twoSeries.kind === 'series') twoSeries.series = twoSeries.series.slice(0, 2)
+    const withLegend = await mountSizedChart(twoSeries, {
+      grid: { rowCount: 1, columnCount: 1 },
+    })
+    expect(withLegend.findAll('.waveform-chart__legend')).toHaveLength(1)
+    expect(withLegend.find('.waveform-chart__legend').attributes('data-position')).toBe('top-right')
+  })
+
   it('resolves legend positions by stable track id across pages', async () => {
     const wrapper = await mountSizedChart(
       {
         kind: 'series',
-        series: Array.from({ length: 8 }, (_, index) => ({
+        series: Array.from({ length: 12 }, (_, index) => ({
           id: `series-${index}`,
-          trackId: `frame-${Math.floor(index / 2)}`,
+          trackId: `frame-${Math.floor(index / 3)}`,
           name: `series ${index}`,
           data: {
             kind: 'points' as const,
@@ -67,9 +92,9 @@ describe('WaveformChart', () => {
     const wrapper = await mountSizedChart(
       {
         kind: 'series',
-        series: Array.from({ length: 4 }, (_, index) => ({
+        series: Array.from({ length: 6 }, (_, index) => ({
           id: `series-${index}`,
-          trackId: `frame-${Math.floor(index / 2)}`,
+          trackId: `frame-${Math.floor(index / 3)}`,
           name: `series ${index}`,
           data: {
             kind: 'points',
@@ -104,7 +129,7 @@ describe('WaveformChart', () => {
     })
 
     const items = wrapper.findAll('.waveform-chart__legend-item')
-    expect(items).toHaveLength(2)
+    expect(items).toHaveLength(3)
     expect(items.every((item) => item.attributes('disabled') !== undefined)).toBe(true)
     expect(wrapper.get('.waveform-legend__panel').classes()).not.toContain(
       'waveform-legend__panel--interactive',
@@ -120,7 +145,7 @@ describe('WaveformChart', () => {
       overlayMode: 'multi-axis',
     })
 
-    expect(wrapper.findAll('.waveform-chart__axis--y')).toHaveLength(2)
+    expect(wrapper.findAll('.waveform-chart__axis--y')).toHaveLength(3)
     expect(wrapper.find('[data-annotation-id="high-note"]').exists()).toBe(true)
     const annotationLayer = wrapper.get('.waveform-annotation-layer').element
     const legendLayer = wrapper.get('.waveform-chart__legend-layer').element
@@ -135,8 +160,8 @@ describe('WaveformChart', () => {
 
     expect(
       wrapper.findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['low'])
-    expect(wrapper.findAll('.waveform-chart__axis--y')).toHaveLength(1)
+    ).toEqual(['low', 'mid'])
+    expect(wrapper.findAll('.waveform-chart__axis--y')).toHaveLength(2)
     expect(wrapper.find('[data-annotation-id="high-note"]').exists()).toBe(false)
     expect(wrapper.findAll('.waveform-chart__legend-item')[1].classes()).toContain('is-hidden')
     expect(wrapper.findAll('.waveform-chart__legend-item')[1].attributes('aria-pressed')).toBe(
@@ -162,12 +187,12 @@ describe('WaveformChart', () => {
     )
     flushAnimationFrames()
     await flushPromises()
-    expect(wrapper.findAll('.waveform-chart__tooltip-series')).toHaveLength(1)
+    expect(wrapper.findAll('.waveform-chart__tooltip-series')).toHaveLength(2)
     expect(wrapper.get('.waveform-chart__tooltip-series').text()).toContain('低量程')
 
     await wrapper.findAll('.waveform-chart__legend-item')[1].trigger('click')
     await flushPromises()
-    expect(wrapper.findAll('.waveform-chart__line')).toHaveLength(2)
+    expect(wrapper.findAll('.waveform-chart__line')).toHaveLength(3)
     expect(wrapper.find('[data-annotation-id="high-note"]').exists()).toBe(true)
     expect(wrapper.emitted('series-visibility-change')?.at(-1)).toEqual([
       { seriesId: 'high', visible: true, hiddenSeriesIds: [] },
@@ -183,20 +208,20 @@ describe('WaveformChart', () => {
 
     expect(
       wrapper.findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['low'])
+    ).toEqual(['low', 'mid'])
     await wrapper.findAll('.waveform-chart__legend-item')[0].trigger('click')
     expect(wrapper.emitted('update:hidden-series-ids')?.at(-1)).toEqual([
       ['high', 'temporarily-absent', 'low'],
     ])
     expect(
       wrapper.findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['low'])
+    ).toEqual(['low', 'mid'])
 
     await wrapper.setProps({ hiddenSeriesIds: ['low'] })
     await flushPromises()
     expect(
       wrapper.findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['high'])
+    ).toEqual(['high', 'mid'])
   })
 
   it('retains uncontrolled visibility by stable ID and clears removed IDs', async () => {
@@ -215,7 +240,7 @@ describe('WaveformChart', () => {
     await flushPromises()
     expect(
       wrapper.findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['low'])
+    ).toEqual(['mid', 'low'])
 
     await wrapper.setProps({
       data: {
@@ -226,12 +251,12 @@ describe('WaveformChart', () => {
     await flushPromises()
     await wrapper.setProps({ data: original })
     await flushPromises()
-    expect(wrapper.findAll('.waveform-chart__line')).toHaveLength(2)
+    expect(wrapper.findAll('.waveform-chart__line')).toHaveLength(3)
   })
 
   it('keeps a recoverable legend and stops chart interaction when every series is hidden', async () => {
     const wrapper = await mountSizedChart(visibilitySeries(), {
-      defaultHiddenSeriesIds: ['low', 'high'],
+      defaultHiddenSeriesIds: ['low', 'high', 'mid'],
       grid: { rowCount: 1, columnCount: 1 },
       legend: { interactive: true },
       overlayMode: 'multi-axis',
@@ -240,7 +265,7 @@ describe('WaveformChart', () => {
     expect(wrapper.findAll('.waveform-chart__line')).toHaveLength(0)
     expect(wrapper.findAll('.waveform-chart__axis')).toHaveLength(0)
     expect(wrapper.findAll('.waveform-chart__overlay')).toHaveLength(0)
-    expect(wrapper.findAll('.waveform-chart__legend-item')).toHaveLength(2)
+    expect(wrapper.findAll('.waveform-chart__legend-item')).toHaveLength(3)
     expect(wrapper.get('.waveform-track__no-visible-series').text()).toBe('暂无可见曲线')
 
     await wrapper.findAll('.waveform-chart__legend-item')[0].trigger('click')
@@ -273,7 +298,7 @@ describe('WaveformChart', () => {
     )
     flushAnimationFrames()
     await flushPromises()
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(true)
+    expect(annotationEditorExists()).toBe(true)
 
     const controller = wrapper.getComponent(WaveformChartView).props('controller') as unknown as {
       annotationInteraction: { editorDraft: { value: { annotation: { seriesId: string } } | null } }
@@ -287,7 +312,7 @@ describe('WaveformChart', () => {
     expect(item).toBeDefined()
     await item!.trigger('click')
     await flushPromises()
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(false)
+    expect(annotationEditorExists()).toBe(false)
   })
 
   it('renders independent cells with separate x axes and overlays', async () => {

package/src/components/waveformChartCases/multiAxisAndPagination.test.ts

@@ -177,6 +177,18 @@ describe('WaveformChart', () => {
               ],
             },
           },
+          {
+            id: 'reference',
+            trackId: 'frame-1',
+            name: 'REF_CH_1',
+            data: {
+              kind: 'points',
+              points: [
+                { x: 0, y: 0.25 },
+                { x: 1, y: 1.25 },
+              ],
+            },
+          },
         ],
       },
       { frameNumber: 1, grid: { rowCount: 2, columnCount: 1 } },
@@ -186,7 +198,7 @@ describe('WaveformChart', () => {
     expect(tracks).toHaveLength(2)
     expect(
       tracks[0].findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
-    ).toEqual(['primary', 'comparison'])
+    ).toEqual(['primary', 'comparison', 'reference'])
     expect(
       tracks[1].findAll('.waveform-chart__line').map((line) => line.attributes('data-series-id')),
     ).toEqual(['second-frame'])
@@ -203,12 +215,13 @@ describe('WaveformChart', () => {
     expect(legend.findAll('.waveform-chart__legend-item').map((item) => item.text())).toEqual([
       'BT2_2M',
       'TEST_CH_1',
+      'REF_CH_1',
     ])
     expect(
       legend
         .findAll('.waveform-legend__swatch')
         .map((swatch) => swatch.get('path').attributes('stroke')),
-    ).toEqual(['#0960bd', '#389e0d'])
+    ).toEqual(['#0960bd', '#2ca02c', '#d62728'])
     expect(wrapper.findAll('.waveform-chart__watermark').map((item) => item.text())).toEqual([
       '1',
       '2',
@@ -232,10 +245,11 @@ describe('WaveformChart', () => {
     await flushPromises()
 
     const tooltipSeries = wrapper.findAll('.waveform-chart__tooltip-series')
-    expect(tooltipSeries).toHaveLength(2)
+    expect(tooltipSeries).toHaveLength(3)
     expect(tooltipSeries.map((item) => item.text())).toEqual([
       expect.stringContaining('BT2_2M'),
       expect.stringContaining('TEST_CH_1'),
+      expect.stringContaining('REF_CH_1'),
     ])
   })
 
@@ -268,6 +282,18 @@ describe('WaveformChart', () => {
               ],
             },
           },
+          {
+            id: 'third',
+            trackId: 'shared',
+            name: 'third',
+            data: {
+              kind: 'points',
+              points: [
+                { x: 0, y: 2 },
+                { x: 1, y: 3 },
+              ],
+            },
+          },
         ],
       },
       { grid: { rowCount: 1, columnCount: 1 } },

package/src/components/waveformChartCases/presentationMode.test.ts

@@ -5,6 +5,14 @@ import { flushAnimationFrames } from '../../test/setup'
 import { mountSizedChart } from '../../test/waveformChart'
 import type { WaveformData, WaveformDisplayMode } from '../data/types'
 
+function annotationEditorExists() {
+  return Boolean(
+    Array.from(document.body.querySelectorAll<HTMLElement>('[role="dialog"]'))
+      .filter((element) => element.closest('.waveform-annotation-editor'))
+      .at(-1),
+  )
+}
+
 const presentationData: WaveformData = {
   kind: 'series',
   series: [
@@ -34,6 +42,19 @@ const presentationData: WaveformData = {
         ],
       },
     },
+    {
+      id: 'mid',
+      trackId: 'shared',
+      name: '中量程',
+      data: {
+        kind: 'points',
+        points: [
+          { x: 0, y: 50 },
+          { x: 1, y: 100 },
+          { x: 2, y: 75 },
+        ],
+      },
+    },
     {
       id: 'other',
       name: '其他通道',
@@ -142,9 +163,9 @@ describe('WaveformChart presentation mode', () => {
           cancelable: true,
         }),
       )
-      wrapper.get('.waveform-chart__svg').element.dispatchEvent(
-        new MouseEvent('dblclick', { bubbles: true, cancelable: true }),
-      )
+      wrapper
+        .get('.waveform-chart__svg')
+        .element.dispatchEvent(new MouseEvent('dblclick', { bubbles: true, cancelable: true }))
       await wrapper.get('[data-annotation-id="note"]').trigger('contextmenu', {
         clientX: width / 2,
         clientY: height / 2,
@@ -282,13 +303,13 @@ describe('WaveformChart presentation mode', () => {
       }),
     )
     await flushPromises()
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(true)
+    expect(annotationEditorExists()).toBe(true)
 
     await wrapper.setProps({ presentationMode: true })
     await flushPromises()
 
     expect(wrapper.find('.waveform-chart__tooltip').exists()).toBe(false)
-    expect(wrapper.find('.waveform-annotation-editor').exists()).toBe(false)
+    expect(annotationEditorExists()).toBe(false)
     expect(wrapper.emitted('point-hover')?.at(-1)).toEqual([null])
 
     await wrapper.setProps({ presentationMode: false })

package/src/components/waveformChartCases/renderingStyles.test.ts

@@ -181,7 +181,7 @@ describe('WaveformChart', () => {
     ])
     expect(stepSwatchPaths[0]?.attributes()).toMatchObject({
       d: 'M1 8H25',
-      stroke: '#389e0d',
+      stroke: '#2ca02c',
       'stroke-width': '1.5',
     })
     expect(stepSwatchPaths[1]?.attributes()).toMatchObject({

package/src/components/waveformChartCases/xDomainStrategy.test.ts

@@ -93,4 +93,64 @@ describe('WaveformChart x domain strategy', () => {
     expect(tracks[1]?.get('.waveform-chart__axis-endpoint--start').text()).toBe('10000')
     expect(tracks[1]?.get('.waveform-chart__axis-endpoint--end').text()).toBe('15000')
   })
+
+  it('keeps an explicit viewport wider than the data and leaves uncovered time blank', async () => {
+    const wrapper = await mountSizedChart(
+      {
+        kind: 'points',
+        points: [
+          { x: 0, y: 0 },
+          { x: 10, y: 1 },
+        ],
+      },
+      { timeUnit: 's', initialXDomain: [-5, 20] },
+    )
+
+    const track = wrapper.get('.waveform-chart__track')
+    const width = Number(track.attributes('data-track-width'))
+    const path = track.get('.waveform-chart__line').attributes('d') ?? ''
+    const xCoordinates = Array.from(path.matchAll(/(?:M|L)([\d.-]+)/g)).map((match) =>
+      Number(match[1]),
+    )
+
+    expect(track.get('.waveform-chart__axis-endpoint--start').text()).toBe('-5')
+    expect(track.get('.waveform-chart__axis-endpoint--end').text()).toBe('20')
+    expect(xCoordinates.length).toBeGreaterThan(0)
+    expect(Math.min(...xCoordinates)).toBeGreaterThanOrEqual(0)
+    expect(Math.max(...xCoordinates)).toBeLessThanOrEqual(width)
+  })
+
+  it('applies independent explicit viewports per track, including empty time regions', async () => {
+    const wrapper = await mountSizedChart(
+      {
+        kind: 'series',
+        series: [
+          {
+            id: 'first',
+            name: '第一轨',
+            data: { kind: 'points', points: [{ x: 0, y: 0 }, { x: 10, y: 1 }] },
+          },
+          {
+            id: 'second',
+            name: '第二轨',
+            data: { kind: 'points', points: [{ x: 100, y: 0 }, { x: 110, y: 1 }] },
+          },
+        ],
+      },
+      {
+        displayMode: 'independent',
+        grid: { rowCount: 1, columnCount: 2 },
+        timeUnit: 's',
+        initialXDomains: { first: [-5, 20], second: [95, 120] },
+      },
+    )
+
+    const tracks = wrapper.findAll('.waveform-chart__track')
+    expect(tracks[0]?.get('.waveform-chart__axis-endpoint--start').text()).toBe('-5')
+    expect(tracks[0]?.get('.waveform-chart__axis-endpoint--end').text()).toBe('20')
+    expect(tracks[1]?.get('.waveform-chart__axis-endpoint--start').text()).toBe('95')
+    expect(tracks[1]?.get('.waveform-chart__axis-endpoint--end').text()).toBe('120')
+    expect(tracks[0]?.find('.waveform-chart__line').exists()).toBe(true)
+    expect(tracks[1]?.find('.waveform-chart__line').exists()).toBe(true)
+  })
 })

package/src/data/simulatedWaveforms.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from 'vitest'
 import { createSimulatedWaveformData } from './simulatedWaveforms'
 
 describe('simulated waveform data', () => {
-  it('creates deterministic, finite six-channel data', () => {
+  it('creates deterministic, finite seven-channel data with a two-series second frame', () => {
     const first = createSimulatedWaveformData()
     const second = createSimulatedWaveformData()
 
@@ -11,8 +11,12 @@ describe('simulated waveform data', () => {
     expect(first.kind).toBe('series')
     if (first.kind !== 'series') return
 
-    expect(first.series).toHaveLength(6)
-    expect(new Set(first.series.map((series) => series.id)).size).toBe(6)
+    expect(first.series).toHaveLength(7)
+    expect(new Set(first.series.map((series) => series.id)).size).toBe(7)
+    const secondFrame = first.series.filter(
+      (series) => series.trackId === 'simulated-harmonic-frame',
+    )
+    expect(secondFrame).toHaveLength(2)
     expect(new Set(first.series.map((series) => series.shotNo))).toEqual(new Set(['13300']))
     first.series.forEach((series) => {
       expect(series.data.kind).toBe('points')

package/src/data/simulatedWaveforms.ts

@@ -13,7 +13,7 @@ type ErrorGenerator = (
 
 interface SimulatedSeriesDefinition extends Pick<
   WaveformSeries,
-  'id' | 'shotNo' | 'name' | 'unit' | 'lineType' | 'pointType' | 'errorBar'
+  'id' | 'trackId' | 'shotNo' | 'name' | 'unit' | 'color' | 'lineType' | 'pointType' | 'errorBar'
 > {
   signal: SignalGenerator
   errors?: ErrorGenerator
@@ -60,6 +60,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-harmonic',
+    trackId: 'simulated-harmonic-frame',
     shotNo: '13300',
     name: '谐波扰动',
     unit: 'V',
@@ -68,6 +69,18 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
     signal: (time) =>
       0.9 * Math.sin(TWO_PI * 0.55 * time) + 0.28 * Math.sin(TWO_PI * 2.2 * time + 0.4),
   },
+  {
+    id: 'simulated-harmonic-reference',
+    trackId: 'simulated-harmonic-frame',
+    shotNo: '13300',
+    name: '谐波对比',
+    unit: 'V',
+    color: '#2ca02c',
+    lineType: 'linear',
+    pointType: 'none',
+    signal: (time) =>
+      0.62 * Math.sin(TWO_PI * 0.55 * time + 0.55) + 0.18 * Math.sin(TWO_PI * 2.2 * time - 0.2),
+  },
   {
     id: 'simulated-damped',
     shotNo: '13300',

package/src/test/waveformChart.ts

@@ -58,6 +58,18 @@ export function visibilitySeries(): WaveformData {
           ],
         },
       },
+      {
+        id: 'mid',
+        trackId: 'shared-frame',
+        name: '中量程',
+        data: {
+          kind: 'points',
+          points: [
+            { x: 0, y: 100 },
+            { x: 1, y: 200 },
+          ],
+        },
+      },
     ],
   }
 }