waveform-analysis 0.1.32 → 0.1.36

package/src/components/interaction/WaveformTooltip.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { computed } from 'vue'
-import { resolveWaveformPointErrors } from '../../core'
 import { formatTooltipNumber, formatTooltipTime } from '../../utils'
 import type { WaveformPoint } from '../data/types'
 
 interface SeriesPoint {
   trackIndex: number
   name: string
+  shotNo?: string
   color: string
   unit?: string
   point: WaveformPoint
@@ -34,7 +34,7 @@ const props = defineProps<Props>()
 const tooltipGap = 12
 const containerPadding = 8
 const tooltipPlacementWidth = 238
-const tooltipMaxWidth = 320
+const tooltipMaxWidth = 560
 const tooltipHorizontalPadding = 20
 const tooltipLineHeight = 20
 
@@ -45,18 +45,18 @@ function estimateLineCount(text: string, width: number): number {
 }
 
 function formatSeriesText(seriesPoint: SeriesPoint): string {
-  const error = formatError(seriesPoint.point)
-  return `${seriesPoint.name ? `${seriesPoint.name}: ` : ''}${formatTooltipNumber(seriesPoint.point.y)}${
-    seriesPoint.unit ? ` ${seriesPoint.unit}` : ''
-  }${error ? ` ${error}` : ''}`
+  const timeText = formatTooltipTime(props.hoveredPoint?.x ?? seriesPoint.point.x, props.timeUnit)
+  return `${seriesPoint.shotNo?.trim() || '未配置炮号'}： ${seriesPoint.name}${
+    seriesPoint.unit ? `(${seriesPoint.unit})` : ''
+  }  (x:${timeText} y:${formatTooltipNumber(seriesPoint.point.y)})`
 }
 
-function estimateTooltipHeight(width: number, timeText: string): number {
+function estimateTooltipHeight(width: number): number {
   const seriesLines = props.seriesPoints.reduce(
     (total, seriesPoint) => total + estimateLineCount(formatSeriesText(seriesPoint), width),
     0,
   )
-  return 16 + tooltipLineHeight * (estimateLineCount(timeText, width) + seriesLines) + 5
+  return 16 + tooltipLineHeight * seriesLines + 5
 }
 
 const tooltipStyle = computed(() => {
@@ -84,25 +84,18 @@ const tooltipStyle = computed(() => {
         : { left: `${containerPadding}px`, maxWidth: `${availableWidth}px` }
 
   const maxWidth = Number.parseFloat(horizontalStyle.maxWidth)
-  const timeText = `${props.timeUnit}: ${formatTooltipTime(props.hoveredPoint.x, props.timeUnit)}`
-
   return {
     ...horizontalStyle,
     top: `${Math.max(
       8,
       Math.min(
         props.position.y - 18,
-        props.containerHeight - estimateTooltipHeight(maxWidth, timeText) - 8,
+        props.containerHeight - estimateTooltipHeight(maxWidth) - 8,
       ),
     )}px`,
   }
 })
 
-function formatError(point: WaveformPoint): string | null {
-  const { lower, upper } = resolveWaveformPointErrors(point)
-  if (lower === 0 && upper === 0) return null
-  return `(+${formatTooltipNumber(upper)} / -${formatTooltipNumber(lower)})`
-}
 </script>
 
 <template>
@@ -111,9 +104,6 @@ function formatError(point: WaveformPoint): string | null {
     class="waveform-tooltip waveform-chart__tooltip"
     :style="tooltipStyle"
   >
-    <span class="waveform-tooltip__time waveform-chart__tooltip-time">
-      {{ timeUnit }}: {{ formatTooltipTime(hoveredPoint.x, timeUnit) }}
-    </span>
     <span
       v-for="seriesPoint in seriesPoints"
       :key="`${seriesPoint.trackIndex}-${seriesPoint.name}`"
@@ -121,12 +111,12 @@ function formatError(point: WaveformPoint): string | null {
     >
       <i :style="{ backgroundColor: seriesPoint.color }" />
       <span class="waveform-tooltip__series-content">
-        <strong v-if="seriesPoint.name">{{ seriesPoint.name }}:</strong>
-        <span class="waveform-tooltip__value">
-          {{ formatTooltipNumber(seriesPoint.point.y)
-          }}{{ seriesPoint.unit ? ` ${seriesPoint.unit}` : '' }}
-          <small v-if="formatError(seriesPoint.point)">{{ formatError(seriesPoint.point) }}</small>
-        </span>
+        <span class="waveform-tooltip__series-label">{{ seriesPoint.shotNo?.trim() || '未配置炮号' }}： {{
+          seriesPoint.name
+        }}<template v-if="seriesPoint.unit">({{ seriesPoint.unit }})</template></span>
+        <span class="waveform-tooltip__value">(x:{{ formatTooltipTime(hoveredPoint.x, timeUnit) }} y:{{
+          formatTooltipNumber(seriesPoint.point.y)
+        }})</span>
       </span>
     </span>
   </div>
@@ -138,26 +128,17 @@ function formatError(point: WaveformPoint): string | null {
   position: absolute;
   z-index: 2;
   display: grid;
-  gap: 3px;
+  gap: 2px;
   width: max-content;
-  max-width: min(320px, calc(100% - 16px));
-  padding: 8px 10px;
-  color: #333;
-  font:
-    12px/1.45 ui-monospace,
-    SFMono-Regular,
-    Consolas,
-    monospace;
+  max-width: min(560px, calc(100% - 16px));
+  padding: 9px 12px;
+  color: #505050;
+  font: 14px/1.35 Arial, sans-serif;
   pointer-events: none;
   background: #fff;
-  border: 1px solid #d9d9d9;
-  border-radius: 2px;
-  box-shadow: 0 4px 12px rgb(16 24 40 / 12%);
-}
-
-.waveform-tooltip__time {
-  padding-bottom: 4px;
-  border-bottom: 1px solid #f0f0f0;
+  border: 1px solid #e3e7eb;
+  border-radius: 4px;
+  box-shadow: 0 3px 10px rgb(16 24 40 / 15%);
 }
 
 .waveform-tooltip__series {
@@ -176,9 +157,24 @@ function formatError(point: WaveformPoint): string | null {
 }
 
 .waveform-tooltip__series-content {
+  display: flex;
+  flex-wrap: nowrap;
+  gap: 12px;
+  align-items: baseline;
+  min-width: 0;
+}
+
+.waveform-tooltip__series-label {
+  flex: 1 1 auto;
   min-width: 0;
-  overflow-wrap: anywhere;
-  white-space: normal;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.waveform-tooltip__value {
+  flex: 0 0 auto;
+  white-space: nowrap;
 }
 
 .waveform-tooltip__series strong {
@@ -186,7 +182,7 @@ function formatError(point: WaveformPoint): string | null {
 }
 
 .waveform-tooltip__value {
-  overflow-wrap: anywhere;
+  color: #555;
 }
 
 .waveform-tooltip__series small {

package/src/components/interaction/useWaveformHover.ts

@@ -85,6 +85,7 @@ export function useWaveformHover(context: HoverContext) {
     point: WaveformPoint,
   ): HoveredSeriesPoint => ({
     id: series.id,
+    shotNo: series.shotNo,
     name: series.name,
     color: series.color,
     unit: series.unit,

package/src/components/waveform.ts

@@ -9,6 +9,7 @@ export type {
   WaveformDisplayMode,
   WaveformOverlayMode,
   WaveformInteractionMode,
+  WaveformXDomainStrategy,
   WaveformAnnotationStyle,
   WaveformAnnotation,
   WaveformRenderingOptions,

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

@@ -179,10 +179,10 @@ describe('WaveformChart', () => {
     await flushPromises()
 
     const tooltip = wrapper.get('.waveform-chart__tooltip')
-    expect(tooltip.text()).toContain('BT2_2M:')
-    expect(tooltip.text()).toContain('2 T')
-    expect(tooltip.text()).toContain('BT1_2M:')
-    expect(tooltip.text()).toContain('4 T')
+    expect(tooltip.text()).toContain('未配置炮号： BT2_2M')
+    expect(tooltip.text()).toContain('(x:1,000 y:2)')
+    expect(tooltip.text()).toContain('未配置炮号： BT1_2M')
+    expect(tooltip.text()).toContain('(x:1,000 y:4)')
     const crosshairLines = wrapper.findAll('.waveform-chart__crosshair line')
     expect(crosshairLines).toHaveLength(2)
     crosshairLines.forEach((line) => {

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

@@ -178,7 +178,7 @@ describe('WaveformChart', () => {
     await flushPromises()
     expect(wrapper.emitted('point-hover')?.at(-1)).toEqual([{ x: 1, y: 5 }])
     expect(wrapper.find('.waveform-chart__tooltip').exists()).toBe(true)
-    expect(wrapper.get('.waveform-chart__tooltip-time').text()).toBe('ms: 1,000')
+    expect(wrapper.get('.waveform-tooltip__series-label').text()).toContain('未配置炮号：')
     const crosshairLines = wrapper.findAll('.waveform-chart__crosshair line')
     expect(crosshairLines).toHaveLength(1)
     expect(crosshairLines[0].attributes('x1')).toBe(crosshairLines[0].attributes('x2'))
@@ -303,7 +303,7 @@ describe('WaveformChart', () => {
     flushAnimationFrames()
     await flushPromises()
 
-    expect(wrapper.get('.waveform-chart__tooltip-time').text()).toBe('ms: 1,000')
+    expect(wrapper.get('.waveform-tooltip__series-label').text()).toContain('未配置炮号：')
     expect(wrapper.findAll('.waveform-chart__crosshair line')).toHaveLength(1)
     expect(wrapper.get('.waveform-chart__line').element).toBe(pathBeforeHover)
     expect(chartUpdate).not.toHaveBeenCalled()

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

@@ -5,6 +5,13 @@ import { flushAnimationFrames } from '../../test/setup'
 import { gridSeries, mountSizedChart } from '../../test/waveformChart'
 
 describe('WaveformChart viewport reset', () => {
+  const niceExplicitStrategy = {
+    type: 'nice' as const,
+    bounds: 'end' as const,
+    tickCount: 10,
+    includeExplicit: true,
+  }
+
   it('resets a shared viewport on double-click and emits a global payload', async () => {
     const wrapper = await mountSizedChart(
       {
@@ -111,4 +118,32 @@ describe('WaveformChart viewport reset', () => {
     expect(wrapper.findAll('.waveform-chart__axis-endpoint--start')[0].text()).toBe('0')
     expect(wrapper.findAll('.waveform-chart__axis-endpoint--end')[0].text()).toBe('1000')
   })
+
+  it('resets shared and independent explicit domains to their included nice bounds', async () => {
+    const shared = await mountSizedChart(
+      {
+        kind: 'points',
+        points: [
+          { x: 0, y: 0 },
+          { x: 4.999999, y: 1 },
+        ],
+      },
+      { initialXDomain: [0, 4.999999], xDomainStrategy: niceExplicitStrategy },
+    )
+    const independent = await mountSizedChart(gridSeries(2), {
+      displayMode: 'independent',
+      initialXDomains: { 'channel-0': [0, 4.999999] },
+      xDomainStrategy: niceExplicitStrategy,
+    })
+
+    ;(shared.vm as unknown as { resetViewport: () => void }).resetViewport()
+    ;(independent.vm as unknown as { resetViewport: () => void }).resetViewport()
+    await flushPromises()
+
+    expect(shared.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(shared.get('.waveform-chart__axis-endpoint--end').text()).toBe('5000')
+    const firstTrack = independent.findAll('.waveform-chart__track')[0]
+    expect(firstTrack.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(firstTrack.get('.waveform-chart__axis-endpoint--end').text()).toBe('5000')
+  })
 })

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

@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest'
+
+import { gridSeries, mountSizedChart } from '../../test/waveformChart'
+
+describe('WaveformChart x domain strategy', () => {
+  it('expands automatic x domains without changing source seconds', async () => {
+    const data = {
+      kind: 'points' as const,
+      points: [
+        { x: 0, y: 0 },
+        { x: 4.999999, y: 1 },
+      ],
+    }
+    const wrapper = await mountSizedChart(data, {
+      timeUnit: 'ms',
+      xDomainStrategy: { type: 'nice', bounds: 'end' },
+    })
+
+    expect(wrapper.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(wrapper.get('.waveform-chart__axis-endpoint--end').text()).toBe('5000')
+    expect(data.points[1]?.x).toBe(4.999999)
+  })
+
+  it('keeps explicit initial x domains exact by default', async () => {
+    const wrapper = await mountSizedChart(
+      {
+        kind: 'points',
+        points: [
+          { x: 123, y: 0 },
+          { x: 456, y: 1 },
+        ],
+      },
+      {
+        timeUnit: 's',
+        initialXDomain: [120, 460],
+        xDomainStrategy: { type: 'nice' },
+      },
+    )
+
+    expect(wrapper.get('.waveform-chart__axis-endpoint--start').text()).toBe('120')
+    expect(wrapper.get('.waveform-chart__axis-endpoint--end').text()).toBe('460')
+  })
+
+  it('keeps explicit per-track initial x domains exact by default', async () => {
+    const wrapper = await mountSizedChart(gridSeries(1), {
+      displayMode: 'independent',
+      initialXDomains: { 'channel-0': [0, 4.999999] },
+      xDomainStrategy: { type: 'nice', bounds: 'end' },
+    })
+
+    expect(wrapper.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(wrapper.get('.waveform-chart__axis-endpoint--end').text()).toBe('4999.999')
+  })
+
+  it('includes an explicit shared initial x domain when requested', async () => {
+    const wrapper = await mountSizedChart(
+      {
+        kind: 'points',
+        points: [
+          { x: 0, y: 0 },
+          { x: 4.999999, y: 1 },
+        ],
+      },
+      {
+        initialXDomain: [0, 4.999999],
+        xDomainStrategy: {
+          type: 'nice',
+          bounds: 'end',
+          tickCount: 10,
+          includeExplicit: true,
+        },
+      },
+    )
+
+    expect(wrapper.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(wrapper.get('.waveform-chart__axis-endpoint--end').text()).toBe('5000')
+  })
+
+  it('includes explicit per-track initial x domains in independent mode', async () => {
+    const wrapper = await mountSizedChart(gridSeries(2), {
+      displayMode: 'independent',
+      grid: { rowCount: 1, columnCount: 2 },
+      initialXDomains: {
+        'channel-0': [0, 4.999999],
+        'channel-1': [10, 14.999999],
+      },
+      xDomainStrategy: { type: 'nice', bounds: 'end', tickCount: 10, includeExplicit: true },
+    })
+
+    const tracks = wrapper.findAll('.waveform-chart__track')
+    expect(tracks[0]?.get('.waveform-chart__axis-endpoint--start').text()).toBe('0')
+    expect(tracks[0]?.get('.waveform-chart__axis-endpoint--end').text()).toBe('5000')
+    expect(tracks[1]?.get('.waveform-chart__axis-endpoint--start').text()).toBe('10000')
+    expect(tracks[1]?.get('.waveform-chart__axis-endpoint--end').text()).toBe('15000')
+  })
+})

package/src/core/data.test.ts

@@ -102,4 +102,26 @@ describe('waveform data normalization', () => {
       'solid',
     ])
   })
+
+  it('preserves trimmed shot numbers and omits blank values', () => {
+    const result = normalizeWaveformSeries({
+      kind: 'series',
+      series: [
+        {
+          id: 'with-shot',
+          shotNo: '  13300  ',
+          name: '通道 A',
+          data: { kind: 'points', points: [{ x: 0, y: 1 }] },
+        },
+        {
+          id: 'without-shot',
+          shotNo: '   ',
+          name: '通道 B',
+          data: { kind: 'points', points: [{ x: 0, y: 2 }] },
+        },
+      ],
+    })
+
+    expect(result.map((series) => series.shotNo)).toEqual(['13300', undefined])
+  })
 })

package/src/core/data.ts

@@ -132,6 +132,7 @@ export function normalizeWaveformSeries(data: WaveformData): NormalizedWaveformS
 
       return {
         id: uniqueId,
+        shotNo: series.shotNo?.trim() || undefined,
         trackId: series.trackId?.trim() || undefined,
         name: series.name,
         unit: series.unit,

package/src/data/simulatedWaveforms.test.ts

@@ -13,6 +13,7 @@ describe('simulated waveform data', () => {
 
     expect(first.series).toHaveLength(6)
     expect(new Set(first.series.map((series) => series.id)).size).toBe(6)
+    expect(new Set(first.series.map((series) => series.shotNo))).toEqual(new Set(['13300']))
     first.series.forEach((series) => {
       expect(series.data.kind).toBe('points')
       if (series.data.kind !== 'points') return

package/src/data/simulatedWaveforms.ts

@@ -13,7 +13,7 @@ type ErrorGenerator = (
 
 interface SimulatedSeriesDefinition extends Pick<
   WaveformSeries,
-  'id' | 'name' | 'unit' | 'lineType' | 'pointType' | 'errorBar'
+  'id' | 'shotNo' | 'name' | 'unit' | 'lineType' | 'pointType' | 'errorBar'
 > {
   signal: SignalGenerator
   errors?: ErrorGenerator
@@ -46,6 +46,7 @@ function createPoints(
 const seriesDefinitions: SimulatedSeriesDefinition[] = [
   {
     id: 'simulated-sine',
+    shotNo: '13300',
     name: '正弦基波',
     unit: 'V',
     lineType: 'none',
@@ -59,6 +60,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-harmonic',
+    shotNo: '13300',
     name: '谐波扰动',
     unit: 'V',
     lineType: 'linear',
@@ -68,6 +70,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-damped',
+    shotNo: '13300',
     name: '阻尼振荡',
     unit: 'A',
     lineType: 'linear',
@@ -79,6 +82,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-step',
+    shotNo: '13300',
     name: '阶跃响应',
     unit: 'V',
     lineType: 'linear',
@@ -87,6 +91,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-pulse',
+    shotNo: '13300',
     name: '脉冲响应',
     unit: 'V',
     lineType: 'linear',
@@ -95,6 +100,7 @@ const seriesDefinitions: SimulatedSeriesDefinition[] = [
   },
   {
     id: 'simulated-noise',
+    shotNo: '13300',
     name: '带噪信号',
     unit: 'A',
     lineType: 'linear',

package/src/index.ts

@@ -13,6 +13,7 @@ export type {
   WaveformDisplayMode,
   WaveformOverlayMode,
   WaveformInteractionMode,
+  WaveformXDomainStrategy,
   WaveformZoomEndPayload,
   WaveformZoomResetPayload,
   WaveformAnnotationStyle,

package/src/types/chart.ts

@@ -26,6 +26,17 @@ export type WaveformOverlayMode = 'single-axis' | 'multi-axis'
 /** 标注工具模式 */
 export type WaveformInteractionMode = 'zoom' | 'annotation'
 
+/** Controls how the initial X viewport is derived when no explicit domain is configured. */
+export interface WaveformXDomainStrategy {
+  type: 'data' | 'nice'
+  /** Selects which bounds are expanded when type is `nice`. Defaults to `both`. */
+  bounds?: 'both' | 'end'
+  /** Stable tick count used to calculate nice bounds. Defaults to 10. */
+  tickCount?: number
+  /** Applies the strategy to explicit initial domains. Defaults to false. */
+  includeExplicit?: boolean
+}
+
 /** Describes the X-axis viewport after a zoom gesture completes. */
 export interface WaveformZoomEndPayload {
   start: number

package/src/types/data.ts

@@ -47,6 +47,8 @@ export type SingleWaveformData =
  */
 export interface WaveformSeries {
   id?: string
+  /** 炮号，未提供时 Tooltip 显示“未配置炮号”。 */
+  shotNo?: string
   /** 相同 trackId 的系列叠加在同一图框中；默认每个系列独占一个图框。 */
   trackId?: string
   name: string
@@ -74,6 +76,7 @@ export type WaveformData =
  */
 export interface NormalizedWaveformSeries {
   id: string
+  shotNo?: string
   trackId?: string
   name: string
   unit?: string

package/src/types/index.ts

@@ -8,6 +8,7 @@ export type {
   WaveformDisplayMode,
   WaveformOverlayMode,
   WaveformInteractionMode,
+  WaveformXDomainStrategy,
   WaveformZoomEndPayload,
   WaveformZoomResetPayload,
   WaveformAnnotationStyle,

package/src/views/FixedYDomainDemo.vue

@@ -19,6 +19,7 @@ const chartData: WaveformData = {
   series: [
     {
       id: 'voltage',
+      shotNo: '13300',
       name: '电压',
       unit: 'V',
       color: '#1677ff',
@@ -33,6 +34,7 @@ const chartData: WaveformData = {
     },
     {
       id: 'current',
+      shotNo: '13300',
       name: '电流',
       unit: 'mA',
       color: '#d4380d',