@rfkit/charts 1.5.0 → 1.5.1

package/README.md

@@ -94,7 +94,7 @@ export function GaugeDemo() {
 - `SetSegments`
 - `SetMarker`
 
-`PublishSpectrum` 支持推送内置频谱数据线，包括 `data`、`maxData`、`minData`、`avgData`、`thresholdData`、`templateData`、`backgroundNoiseData` 和 `extraData`。
+`PublishSpectrum` 支持推送内置频谱数据线，包括 `data`、`maxData`、`minData`、`avgData`、`thresholdData`、`templateData`、`backgroundNoiseData` 和 `extraData`。`thresholdData` 不传 `segmentOffset` / `offset` 时按整条门限替换；传入 `segmentOffset` 或 `offset` 时按局部门限写入。
 
 工具栏相关命名统一使用：
 

package/config/setting.d.ts

@@ -7,6 +7,7 @@ export declare const UI_CONFIG: {
     /** Popover 边距 */
     readonly POPOVER_MARGIN: 16;
 };
+export declare const SPECTRUM_THRESHOLD_COLOR = "#A855F7";
 export interface LineConfig {
     name: string;
     color: string;

package/index.js

@@ -1413,6 +1413,10 @@ var __webpack_modules__ = {
   }
 }
 
+[data-rfkit-charts-root] .border-primary\\/50 {
+  border-color: var(--primary);
+}
+
 @supports (color: color-mix(in lab, red, red)) {
   [data-rfkit-charts-root] .border-primary\\/50 {
     border-color: color-mix(in oklab, var(--primary) 50%, transparent);
@@ -4355,6 +4359,7 @@ const UI_CONFIG = {
     ZOOM_MIN_RANGE: 10,
     POPOVER_MARGIN: 16
 };
+const SPECTRUM_THRESHOLD_COLOR = '#A855F7';
 const setting_defaultConfig = {
     line: {
         realData: {
@@ -4387,7 +4392,7 @@ const setting_defaultConfig = {
         },
         thresholdData: {
             name: 'thresholdData',
-            color: '#FF4C2A',
+            color: SPECTRUM_THRESHOLD_COLOR,
             thickness: 1,
             label: "\u95E8\u9650\u503C",
             display: true
@@ -18847,13 +18852,9 @@ class SpectrumAnalyzer {
             if (!data?.length) return;
             this.isProcessing = true;
             this.hasProcessedData = true;
-            let index = offset;
-            if (this.segments.length) {
-                const segment = this.segments[segmentOffset];
-                if (!segment) throw new DataValidationError(ERROR_MESSAGES.INVALID_SEGMENT(segmentOffset));
-                index = segment.startIndex + offset;
-                this.scanProgress = (index + data.length) / this.config.maxPoints;
-            } else if (data.length !== this.config.maxPoints) this.updateMaxPoints(data.length);
+            const index = this.resolveGlobalIndex(segmentOffset, offset);
+            if (this.segments.length) this.scanProgress = (index + data.length) / this.config.maxPoints;
+            else if (data.length !== this.config.maxPoints) this.updateMaxPoints(data.length);
             if (fluorescenceData && void 0 !== fluorescenceMaxCount) {
                 this.fluorescenceData = fluorescenceData;
                 this.fluorescenceMaxCount = fluorescenceMaxCount;
@@ -18893,6 +18894,7 @@ class SpectrumAnalyzer {
     }
     initializeSegments(segments) {
         if (!segments?.length) throw new DataValidationError(ERROR_MESSAGES.EMPTY_SEGMENTS);
+        const prevMaxPoints = this.config.maxPoints;
         let totalPoints = 0;
         this.segments = segments.map((segment)=>{
             const { startFrequency, stopFrequency, stepFrequency } = segment;
@@ -18909,7 +18911,17 @@ class SpectrumAnalyzer {
                 startIndex
             };
         });
-        this.updateMaxPoints(totalPoints);
+        this.updateMaxPoints(totalPoints, false);
+        if (prevMaxPoints === totalPoints) {
+            this.config = {
+                ...this.config,
+                outputRange: {
+                    start: 0,
+                    end: totalPoints
+                }
+            };
+            this.reset(false);
+        }
     }
     setAntennaFactor(d) {
         const { antennaFactorData, config: { maxPoints } } = this;
@@ -19133,8 +19145,9 @@ class SpectrumAnalyzer {
         this.allocateMetricsBuffers();
         this.clearMetricsBuffers();
         this.templateData = new Float32Array;
+        this.occupancyData = new Float32Array;
         this.backgroundNoiseData = new Float32Array;
-        this.thresholdData = new Float32Array;
+        this.clearThresholdDataState();
         this.waterfallData = Array.from({
             length: waterfallMaxFrames
         }, ()=>{
@@ -19156,7 +19169,6 @@ class SpectrumAnalyzer {
         this.templateOutputData = new Float32Array;
         this.occupancyOutputData = new Float32Array;
         this.backgroundNoiseOutputData = new Float32Array;
-        this.thresholdOutputData = new Float32Array;
         this.fluorescenceData = enableFluorescence ? new Uint32Array(maxPoints * FLUORESCENCE.LEVEL_RANGE) : new Uint32Array(0);
         this.fluorescenceMaxCount = 0;
         this.fluorescenceUpdateCounter = 0;
@@ -19253,16 +19265,30 @@ class SpectrumAnalyzer {
         });
         this.setPendingFlag("backgroundNoise", false);
     }
-    setThresholdData(data) {
-        if (!data || 0 === data.length) {
-            this.thresholdData = new Float32Array(0);
-            this.setPendingFlag("threshold", false);
-            return;
+    setThresholdData(data, options) {
+        if (!data || 0 === data.length) return void this.clearThresholdDataState();
+        const sourceData = data instanceof Float32Array ? data : new Float32Array(data);
+        if (options) {
+            const index = this.resolveGlobalIndex(options.segmentOffset ?? 0, options.offset ?? 0);
+            this.validateInput(sourceData, index);
+            if (this.thresholdData.length !== this.config.maxPoints) {
+                const next = new Float32Array(this.config.maxPoints);
+                next.fill(SPECTRUM.INITIAL_VALUE);
+                if (this.thresholdData.length > 0) next.set(this.thresholdData.subarray(0, this.config.maxPoints));
+                this.thresholdData = next;
+            }
+            this.thresholdData.set(sourceData, index);
+        } else {
+            const normalized = new Float32Array(this.config.maxPoints);
+            normalized.fill(SPECTRUM.INITIAL_VALUE);
+            normalized.set(sourceData.subarray(0, this.config.maxPoints));
+            this.thresholdData = normalized;
         }
-        this.thresholdData = new Float32Array(data);
         if (!this.hasProcessedData || this.isProcessing) return void this.setPendingFlag("threshold", true);
+        const thresholdOutputData = this.resampleSingleData(this.thresholdData);
+        this.thresholdOutputData = thresholdOutputData;
         this.notifySpectrumUpdate({
-            thresholdData: this.resampleSingleData(this.thresholdData)
+            thresholdData: thresholdOutputData
         });
         this.setPendingFlag("threshold", false);
     }
@@ -19296,6 +19322,19 @@ class SpectrumAnalyzer {
         }
         return templateOverData;
     }
+    resolveGlobalIndex(segmentOffset = 0, offset = 0) {
+        if (this.segments.length) {
+            const segment = this.segments[segmentOffset];
+            if (!segment) throw new DataValidationError(ERROR_MESSAGES.INVALID_SEGMENT(segmentOffset));
+            return segment.startIndex + offset;
+        }
+        return offset;
+    }
+    clearThresholdDataState() {
+        this.thresholdData = new Float32Array(0);
+        this.thresholdOutputData = new Float32Array(0);
+        this.setPendingFlag("threshold", false);
+    }
     resampleDataSeries() {
         const { antennaFactorData, antennaFactorSwitch, maxData, minData, avgData, templateData, occupancyData, backgroundNoiseData, thresholdData, config: { maxPoints, outputPoints } } = this;
         const activeAntennaFactorData = antennaFactorSwitch ? antennaFactorData : new Float32Array(maxPoints);
@@ -19368,7 +19407,7 @@ class SpectrumAnalyzer {
         this.waterfallData.push(newData);
         this.waterfallOutputData.push(outputData);
     }
-    updateMaxPoints(maxPoints) {
+    updateMaxPoints(maxPoints, preserveProcessedFlag = true) {
         if (this.config.maxPoints === maxPoints) return;
         this.config = {
             ...this.config,
@@ -19378,7 +19417,7 @@ class SpectrumAnalyzer {
                 end: maxPoints
             }
         };
-        this.reset(true);
+        this.reset(preserveProcessedFlag);
     }
     validateInput(data, index) {
         if (index < 0 || index + data.length > this.config.maxPoints) throw new IndexOutOfBoundsError(ERROR_MESSAGES.INDEX_OUT_OF_BOUNDS(index), index);
@@ -19452,7 +19491,9 @@ class SpectrumAnalyzer {
             this.setPendingFlag("backgroundNoise", false);
         }
         if (this.pendingDataFlags["threshold"] && this.thresholdData.length > 0) {
-            pendingOutput.thresholdData = this.resampleSingleData(this.thresholdData);
+            const thresholdOutputData = this.resampleSingleData(this.thresholdData);
+            this.thresholdOutputData = thresholdOutputData;
+            pendingOutput.thresholdData = thresholdOutputData;
             this.setPendingFlag("threshold", false);
         }
         if (this.pendingDataFlags["extra"] && Object.keys(this.extraData).length > 0) {
@@ -26950,6 +26991,12 @@ const FrequencyTagLine_FrequencyTagLine = (props)=>{
     });
 };
 const FrequencyTagLine = /*#__PURE__*/ __WEBPACK_EXTERNAL_MODULE_react__["default"].memo(FrequencyTagLine_FrequencyTagLine);
+const LIMIT_THRESHOLD_TEXT_STYLE = {
+    color: SPECTRUM_THRESHOLD_COLOR
+};
+const LIMIT_THRESHOLD_LINE_STYLE = {
+    borderColor: SPECTRUM_THRESHOLD_COLOR
+};
 const Item_Item = ({ value: value1, onChange })=>{
     const { state: { axisY, limit } } = useStore_useStore();
     const { label, disabled } = limit;
@@ -27014,6 +27061,7 @@ const Item_Item = ({ value: value1, onChange })=>{
                     type: "button",
                     disabled: disabled,
                     className: "pointer-events-auto absolute right-7 top-[-28px] z-[8] flex h-6 appearance-none items-center justify-center rounded-[var(--radius-control)] border-0 bg-secondary px-2 text-xs text-foreground",
+                    style: LIMIT_THRESHOLD_TEXT_STYLE,
                     onClick: ()=>setIsEdit(true),
                     children: [
                         label,
@@ -27023,6 +27071,7 @@ const Item_Item = ({ value: value1, onChange })=>{
                     ]
                 }) : /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsxs)("div", {
                     className: "pointer-events-auto absolute right-7 top-[-28px] z-[8] flex h-6 items-center justify-between bg-secondary px-2 text-xs text-foreground",
+                    style: LIMIT_THRESHOLD_TEXT_STYLE,
                     children: [
                         label,
                         "\xa0",
@@ -27034,7 +27083,8 @@ const Item_Item = ({ value: value1, onChange })=>{
                             min: min,
                             max: max,
                             step: step / 5,
-                            className: "h-auto w-14 border-none bg-transparent p-0 text-center text-primary outline-none [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none",
+                            className: "h-auto w-14 border-none bg-transparent p-0 text-center outline-none [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none",
+                            style: LIMIT_THRESHOLD_TEXT_STYLE,
                             onKeyDown: onEnter
                         }),
                         /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
@@ -27044,7 +27094,8 @@ const Item_Item = ({ value: value1, onChange })=>{
                     ]
                 }),
                 /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("div", {
-                    className: "absolute right-0 top-[-0.5px] z-[8] h-0 w-full border-b border-dashed border-primary"
+                    className: "absolute right-0 top-[-0.5px] z-[8] h-0 w-full border-b border-dashed",
+                    style: LIMIT_THRESHOLD_LINE_STYLE
                 })
             ]
         })
@@ -29587,6 +29638,16 @@ const useMarkerPublish_useMarkerPublish = ({ globalID })=>{
     };
 };
 const useMarkerPublish = useMarkerPublish_useMarkerPublish;
+function resolveThresholdDataOptions({ segmentOffset, offset }) {
+    const options = {};
+    if (void 0 !== segmentOffset) options.segmentOffset = segmentOffset;
+    if (void 0 !== offset) options.offset = offset;
+    return void 0 !== options.segmentOffset || void 0 !== options.offset ? options : void 0;
+}
+function setAnalyzerThresholdData(analyzer, payload) {
+    if (!('thresholdData' in payload)) return;
+    analyzer.setThresholdData(payload.thresholdData, resolveThresholdDataOptions(payload));
+}
 function useTemplateComparison() {
     const { state: { globalID, axisX: { frequencyFormat }, signal: { onChange } } } = useStore_useStore();
     const frequencyFormatRef = (0, __WEBPACK_EXTERNAL_MODULE_react__.useRef)(frequencyFormat);
@@ -29764,7 +29825,7 @@ function useSpectrumAnalyzer(props) {
                 break;
             case constants_PSType.Spectrum:
                 if (e.data) analyzer.current.process(e);
-                if ('thresholdData' in e) analyzer.current.setThresholdData(e.thresholdData);
+                setAnalyzerThresholdData(analyzer.current, e);
                 if (e.maxData) analyzer.current.setMaxData(e.maxData);
                 if (e.minData) analyzer.current.setMinData(e.minData);
                 if (e.avgData) analyzer.current.setAvgData(e.avgData);

package/modules/Spectrum/Limit/thresholdStyle.d.ts

@@ -0,0 +1,6 @@
+export declare const LIMIT_THRESHOLD_TEXT_STYLE: {
+    color: "#A855F7";
+};
+export declare const LIMIT_THRESHOLD_LINE_STYLE: {
+    borderColor: "#A855F7";
+};

package/modules/Spectrum/useSpectrumAnalyzer/thresholdData.d.ts

@@ -0,0 +1,8 @@
+import type { PublishSpectrum } from '../../../types';
+export type SpectrumThresholdDataOptions = Pick<PublishSpectrum, 'segmentOffset' | 'offset'>;
+export declare function resolveThresholdDataOptions({ segmentOffset, offset }: SpectrumThresholdDataOptions): SpectrumThresholdDataOptions | undefined;
+type ThresholdDataTarget = {
+    setThresholdData: (data?: PublishSpectrum['thresholdData'], options?: SpectrumThresholdDataOptions) => void;
+};
+export declare function setAnalyzerThresholdData(analyzer: ThresholdDataTarget, payload: PublishSpectrum): void;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rfkit/charts",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "type": "module",
   "description": "Chart components for wireless monitoring web applications",
   "exports": {