@rfkit/charts 1.3.1 → 1.3.2

package/components/Markers/hooks/useMarkers.d.ts

@@ -1,3 +1,20 @@
+/**
+ * 集成 @rfkit/spectrum-analyzer 的峰值检测能力
+ *
+ * 改造要点：
+ * 1. 优先使用 SpectrumAnalyzer 预处理好的峰值数据（realData.peaks.peaks）
+ * 2. 如果没有预处理数据，回退到本地计算（findTopPeaks/findMaxPeak）
+ * 3. 保持向后兼容，现有功能不受影响
+ *
+ * 性能提升：
+ * - 消除 updateByData 中的重复峰值计算（每次数据更新都调用）
+ * - 峰值检测在 SpectrumAnalyzer 的重采样过程中完成，零额外开销
+ *
+ * 数据来源：
+ * - realData.peaks.peaks[0] = 主峰
+ * - realData.peaks.peaks[1] = 次峰
+ * - realData.peaks.peaks[n] = 第 n+1 峰（可扩展）
+ */
 import { MarkerEventType } from '../../../config';
 import type { MarkerType, SetMarker } from '../../../types';
 interface UseMarkersProps {
@@ -41,6 +58,7 @@ export declare const useMarkers: (props: UseMarkersProps) => {
     }) => string;
     resetHover: () => void;
     toggleMainSecondaryPeaks: () => void;
+    toggleMainPeak: () => void;
     moveToAdjacentPeak: (direction: "left" | "right", markerId: string) => void;
     setState: import("react").Dispatch<import("react").SetStateAction<MarkerState>>;
 };

package/components/Markers/tools.d.ts

@@ -11,6 +11,8 @@ export declare const MARKER_SELECTION_CHANGE: (id: string, func?: RecursiveFunct
     selectedId: string | null;
 }]>) => (...args: any[]) => void;
 export type MarkerCommand = {
+    type: 'main-peak';
+} | {
     type: 'main-secondary-peaks';
 } | {
     type: 'left-peak';

package/index.d.ts

@@ -7,5 +7,5 @@ RecursiveObject, // 递归对象 后期会删除
 Render, Reset, SegmentsOriginal, SeriesConfig, SetAntennaFactor, SetChannels, SetMarker, SetSegments, SetSeries, SetSpectrumBandwidth, SpectrumBandwidth, SpectrumExtraData, StationInfoType } from './types';
 export { HeatmapCaptureType, MarkerMode } from './types';
 export { SignalDataType } from './types/store';
-export { formatFrequencyUnit, formatFrequencyUnitFromHz, formatFrequencyUnitFromMHz } from './utils';
 export type { FrequencyUnitResult } from './utils';
+export { formatFrequencyUnit, formatFrequencyUnitFromHz, formatFrequencyUnitFromMHz } from './utils';

package/index.js

@@ -10812,6 +10812,10 @@ const Markers_Switch_Switch = ()=>{
                 label: "\u53F3\u5CF0\u503C",
                 disabled: !hasSelectedMarker
             },
+            {
+                value: 'main-peak',
+                label: "\u4E3B\u5CF0\u503C"
+            },
             {
                 value: 'main-secondary-peaks',
                 label: "\u4E3B\u6B21\u5CF0\u503C"
@@ -10834,6 +10838,11 @@ const Markers_Switch_Switch = ()=>{
                     selectedId: selectedMarkerId
                 });
                 break;
+            case 'main-peak':
+                if (globalID) MARKER_COMMAND(globalID)({
+                    type: 'main-peak'
+                });
+                break;
             case 'main-secondary-peaks':
                 if (globalID) MARKER_COMMAND(globalID)({
                     type: 'main-secondary-peaks'
@@ -14030,6 +14039,7 @@ const useMarkers = (props)=>{
         onChange
     ]);
     const mainSecondaryPrevSelectedRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
+    const mainPeakPrevSelectedRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(null);
     const toggleMainSecondaryPeaks = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)(()=>{
         setState((prevState)=>{
             const hasMainSecondary = prevState.markers.some((m)=>'mainSecondary' === m.peakTracking);
@@ -14110,6 +14120,76 @@ const useMarkers = (props)=>{
         globalID,
         onChange
     ]);
+    const toggleMainPeak = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)(()=>{
+        setState((prevState)=>{
+            const hasMainPeak = prevState.markers.some((m)=>'mainSecondary' === m.peakTracking && 0 === m.peakRank);
+            if (hasMainPeak) {
+                const nextMarkers = prevState.markers.filter((m)=>!('mainSecondary' === m.peakTracking && 0 === m.peakRank));
+                const restoreId = mainPeakPrevSelectedRef.current;
+                if (restoreId) {
+                    const idx = nextMarkers.findIndex((m)=>m.id === restoreId);
+                    if (-1 !== idx) nextMarkers[idx] = {
+                        ...nextMarkers[idx],
+                        select: true
+                    };
+                }
+                mainPeakPrevSelectedRef.current = null;
+                setTimeout(()=>{
+                    onChange?.(constants_MarkerEventType.Update, nextMarkers);
+                }, 0);
+                return {
+                    ...prevState,
+                    markers: nextMarkers
+                };
+            }
+            const globalState = getGlobalStoreState(globalID);
+            const maxCount = globalState.marker.maxCount;
+            const availableSlots = maxCount - prevState.markers.length;
+            if (availableSlots < 1) return prevState;
+            mainPeakPrevSelectedRef.current = prevState.markers.find((m)=>m.select)?.id ?? null;
+            const markerId = createGUID();
+            const markerColor = markerColors[prevState.colorIndex % 20];
+            const info = formatMarker({
+                left: 50,
+                id: markerId,
+                color: markerColor,
+                select: false,
+                peak: true,
+                peakTracking: 'mainSecondary',
+                peakRank: 0,
+                frequency: 0,
+                hover: false
+            });
+            const newMarker = {
+                ...info,
+                id: markerId,
+                color: markerColor,
+                select: false,
+                peak: true,
+                peakTracking: 'mainSecondary',
+                peakRank: 0,
+                hover: false
+            };
+            const nextMarkers = [
+                ...prevState.markers,
+                newMarker
+            ].map((m)=>formatMarker(m, {
+                    data: dataRef.current
+                }));
+            setTimeout(()=>{
+                onChange?.(constants_MarkerEventType.Update, nextMarkers);
+            }, 0);
+            return {
+                ...prevState,
+                markers: nextMarkers,
+                colorIndex: prevState.colorIndex + 1
+            };
+        });
+    }, [
+        formatMarker,
+        globalID,
+        onChange
+    ]);
     const moveToAdjacentPeak = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((direction, markerId)=>{
         setState((prevState)=>{
             const target = prevState.markers.find((m)=>m.id === markerId);
@@ -14180,6 +14260,7 @@ const useMarkers = (props)=>{
         handleHover,
         resetHover,
         toggleMainSecondaryPeaks,
+        toggleMainPeak,
         moveToAdjacentPeak,
         setState
     };
@@ -14368,7 +14449,7 @@ const Markers = ({ id })=>{
     const EID = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>getEID(id), [
         id
     ]);
-    const { markers, createMarker, updateMarkerAttribute, resetMarkers, updateByData, handleHover, resetHover, toggleMainSecondaryPeaks, moveToAdjacentPeak } = useMarkers({
+    const { markers, createMarker, updateMarkerAttribute, resetMarkers, updateByData, handleHover, resetHover, toggleMainSecondaryPeaks, toggleMainPeak, moveToAdjacentPeak } = useMarkers({
         id,
         globalID,
         display,
@@ -14475,6 +14556,7 @@ const Markers = ({ id })=>{
         if (globalID && id) MARKER_COMMAND(globalID, (cmd)=>{
             if (!cmd?.type) return;
             if ('main-secondary-peaks' === cmd.type) return void toggleMainSecondaryPeaks();
+            if ('main-peak' === cmd.type) return void toggleMainPeak();
             if ('left-peak' === cmd.type) return void moveToAdjacentPeak('left', cmd.selectedId);
             if ('right-peak' === cmd.type) return void moveToAdjacentPeak('right', cmd.selectedId);
         });
@@ -14482,7 +14564,8 @@ const Markers = ({ id })=>{
         globalID,
         id,
         moveToAdjacentPeak,
-        toggleMainSecondaryPeaks
+        toggleMainSecondaryPeaks,
+        toggleMainPeak
     ]);
     if (!show) return null;
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)(Zoom_ZoomOffsetContainer, {

package/package.json

@@ -5,6 +5,6 @@
   "types": "index.d.ts",
   "author": "Hxgh",
   "license": "MIT",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "private": false
 }