@rfkit/charts 1.4.3 → 1.5.0

package/README.md

@@ -94,6 +94,8 @@ export function GaugeDemo() {
 - `SetSegments`
 - `SetMarker`
 
+`PublishSpectrum` 支持推送内置频谱数据线，包括 `data`、`maxData`、`minData`、`avgData`、`thresholdData`、`templateData`、`backgroundNoiseData` 和 `extraData`。
+
 工具栏相关命名统一使用：
 
 - 工具栏枚举使用 `ToolbarItemType`

package/index.js

@@ -4183,6 +4183,7 @@ const getDefaultData = ()=>({
                 maxData: new Float32Array(),
                 minData: new Float32Array(),
                 avgData: new Float32Array(),
+                thresholdData: new Float32Array(),
                 templateData: new Float32Array(),
                 backgroundNoiseData: new Float32Array(),
                 waterfallData: [],
@@ -4354,7 +4355,7 @@ const UI_CONFIG = {
     ZOOM_MIN_RANGE: 10,
     POPOVER_MARGIN: 16
 };
-const defaultConfig = {
+const setting_defaultConfig = {
     line: {
         realData: {
             name: 'realData',
@@ -4389,7 +4390,7 @@ const defaultConfig = {
             color: '#FF4C2A',
             thickness: 1,
             label: "\u95E8\u9650\u503C",
-            display: false
+            display: true
         },
         templateData: {
             name: 'templateData',
@@ -4493,17 +4494,17 @@ const defaultConfig = {
 const setConfig = (c = {})=>{
     const currentConfig = JSON.parse(localStorage.getItem(KEY) || '{}');
     const newConfig = {
-        ...defaultConfig,
+        ...setting_defaultConfig,
         ...currentConfig,
         ...c
     };
     localStorage.setItem(KEY, JSON.stringify(newConfig));
 };
 function getConfig(name) {
-    let config = defaultConfig ?? JSON.parse(localStorage.getItem(KEY) || 'null');
+    let config = setting_defaultConfig ?? JSON.parse(localStorage.getItem(KEY) || 'null');
     if (!config) {
         setConfig();
-        config = defaultConfig;
+        config = setting_defaultConfig;
     }
     return name ? config[name] : config;
 }
@@ -18490,7 +18491,7 @@ const resolveCursorIndexByLeft = (left, outputLength, maxPoints)=>{
         globalIndex: spectrum_analyzer_leftToIndex(safeLeft, maxPoints)
     };
 };
-const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outputPoints, realData, maxData, minData, avgData, templateData, backgroundNoiseData, fluorescenceData, occupancyData, enablePeakStats = false, maxPeaks = 2, outputRangeStart = 0 })=>{
+const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outputPoints, realData, maxData, minData, avgData, templateData, backgroundNoiseData, thresholdData, fluorescenceData, occupancyData, enablePeakStats = false, maxPeaks = 2, outputRangeStart = 0 })=>{
     const realDataLength = realData.length;
     const isLessThanDataLength = realDataLength <= outputPoints;
     const outputLength = isLessThanDataLength ? realDataLength : outputPoints;
@@ -18500,6 +18501,7 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
     const hasTemplateData = templateData && templateData.length > 0;
     const hasOccupancyData = occupancyData && occupancyData.length > 0;
     const hasBackgroundNoiseData = backgroundNoiseData && backgroundNoiseData.length > 0;
+    const hasThresholdData = thresholdData && thresholdData.length > 0;
     const hasFluorescenceStats = fluorescenceData && fluorescenceData.length > 0;
     const candidatePeaks = [];
     const applyAntennaFactor = antennaFactorSwitch ? (value1, index)=>value1 + antennaFactorData[index] : (value1)=>value1;
@@ -18511,6 +18513,7 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
     const templateOutputData = new Float32Array(hasTemplateData ? outputLength : 0);
     const occupancyOutputData = new Float32Array(hasOccupancyData ? outputLength : 0);
     const backgroundNoiseOutputData = new Float32Array(hasBackgroundNoiseData ? outputLength : 0);
+    const thresholdOutputData = new Float32Array(hasThresholdData ? outputLength : 0);
     let fluorescenceOutputData = new Array(hasFluorescenceStats ? outputLength : 0).fill(null);
     const srcIndexCache = new Uint32Array(outputLength);
     if (isLessThanDataLength) {
@@ -18524,6 +18527,7 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
             if (hasTemplateData) templateOutputData[i] = templateData[i] + antennaFactor;
             if (hasOccupancyData) occupancyOutputData[i] = occupancyData[i];
             if (hasBackgroundNoiseData) backgroundNoiseOutputData[i] = backgroundNoiseData[i] + antennaFactor;
+            if (hasThresholdData) thresholdOutputData[i] = thresholdData[i] + antennaFactor;
             if (hasFluorescenceStats) {
                 const fluorescence = fluorescenceData[i];
                 const newFluorescence = new Map;
@@ -18539,6 +18543,7 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
             if (hasTemplateData) templateOutputData.set(templateData);
             if (hasOccupancyData) occupancyOutputData.set(occupancyData);
             if (hasBackgroundNoiseData) backgroundNoiseOutputData.set(backgroundNoiseData);
+            if (hasThresholdData) thresholdOutputData.set(thresholdData);
             if (hasFluorescenceStats) fluorescenceOutputData = fluorescenceData;
         }
         if (enablePeakStats) for(let i = 0; i < realDataLength; i++){
@@ -18600,6 +18605,10 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
                 const backgroundNoiseValue = backgroundNoiseData[realMaxIdx];
                 backgroundNoiseOutputData[i] = applyAntennaFactor(backgroundNoiseValue, realMaxIdx);
             }
+            if (hasThresholdData) {
+                const thresholdValue = thresholdData[realMaxIdx];
+                thresholdOutputData[i] = applyAntennaFactor(thresholdValue, realMaxIdx);
+            }
             if (hasFluorescenceStats) {
                 const fluorescence = fluorescenceData[realMaxIdx];
                 const newFluorescence = new Map;
@@ -18625,6 +18634,7 @@ const resampleMultiple = ({ antennaFactorData, antennaFactorSwitch = false, outp
         templateOutputData,
         occupancyOutputData,
         backgroundNoiseOutputData,
+        thresholdOutputData,
         srcIndexCache,
         fluorescenceOutputData
     };
@@ -18777,6 +18787,7 @@ class SpectrumAnalyzer {
     templateData;
     occupancyData;
     backgroundNoiseData;
+    thresholdData;
     waterfallData;
     srcIndexCache;
     realOutputData;
@@ -18786,6 +18797,7 @@ class SpectrumAnalyzer {
     templateOutputData;
     occupancyOutputData;
     backgroundNoiseOutputData;
+    thresholdOutputData;
     waterfallOutputData;
     scanProgress;
     lastIndex;
@@ -18801,6 +18813,7 @@ class SpectrumAnalyzer {
         ["occupancy"]: false,
         ["template"]: false,
         ["backgroundNoise"]: false,
+        ["threshold"]: false,
         ["extra"]: false
     };
     hasPendingData = false;
@@ -19121,6 +19134,7 @@ class SpectrumAnalyzer {
         this.clearMetricsBuffers();
         this.templateData = new Float32Array;
         this.backgroundNoiseData = new Float32Array;
+        this.thresholdData = new Float32Array;
         this.waterfallData = Array.from({
             length: waterfallMaxFrames
         }, ()=>{
@@ -19142,6 +19156,7 @@ 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;
@@ -19157,6 +19172,7 @@ class SpectrumAnalyzer {
             ["occupancy"]: false,
             ["template"]: false,
             ["backgroundNoise"]: false,
+            ["threshold"]: false,
             ["extra"]: false
         };
         this.hasPendingData = false;
@@ -19168,6 +19184,7 @@ class SpectrumAnalyzer {
             avgData: this.avgData,
             templateData: this.templateData,
             backgroundNoiseData: this.backgroundNoiseData,
+            thresholdData: this.thresholdData,
             extraData: this.extraData,
             srcIndexCache: this.srcIndexCache,
             processTimes: 0,
@@ -19236,6 +19253,19 @@ class SpectrumAnalyzer {
         });
         this.setPendingFlag("backgroundNoise", false);
     }
+    setThresholdData(data) {
+        if (!data || 0 === data.length) {
+            this.thresholdData = new Float32Array(0);
+            this.setPendingFlag("threshold", false);
+            return;
+        }
+        this.thresholdData = new Float32Array(data);
+        if (!this.hasProcessedData || this.isProcessing) return void this.setPendingFlag("threshold", true);
+        this.notifySpectrumUpdate({
+            thresholdData: this.resampleSingleData(this.thresholdData)
+        });
+        this.setPendingFlag("threshold", false);
+    }
     updateTemplateOverData(forceFullCalculation = false, incrementalRange) {
         if (!this.templateData || 0 === this.templateData.length) {
             this.cachedExceedingDatas = [];
@@ -19267,9 +19297,9 @@ class SpectrumAnalyzer {
         return templateOverData;
     }
     resampleDataSeries() {
-        const { antennaFactorData, antennaFactorSwitch, maxData, minData, avgData, templateData, occupancyData, backgroundNoiseData, config: { maxPoints, outputPoints } } = this;
+        const { antennaFactorData, antennaFactorSwitch, maxData, minData, avgData, templateData, occupancyData, backgroundNoiseData, thresholdData, config: { maxPoints, outputPoints } } = this;
         const activeAntennaFactorData = antennaFactorSwitch ? antennaFactorData : new Float32Array(maxPoints);
-        const { realOutputData, srcIndexCache, maxOutputData, minOutputData, avgOutputData, templateOutputData, occupancyOutputData, backgroundNoiseOutputData } = resampleMultiple({
+        const { realOutputData, srcIndexCache, maxOutputData, minOutputData, avgOutputData, templateOutputData, occupancyOutputData, backgroundNoiseOutputData, thresholdOutputData } = resampleMultiple({
             antennaFactorData: activeAntennaFactorData,
             antennaFactorSwitch,
             outputPoints,
@@ -19280,6 +19310,7 @@ class SpectrumAnalyzer {
             templateData: templateData && templateData.length > 0 ? this.getOutputData(templateData) : void 0,
             occupancyData: occupancyData && occupancyData.length > 0 ? this.getOutputData(occupancyData) : void 0,
             backgroundNoiseData: backgroundNoiseData && backgroundNoiseData.length > 0 ? this.getOutputData(backgroundNoiseData) : void 0,
+            thresholdData: thresholdData && thresholdData.length > 0 ? this.getOutputData(thresholdData) : void 0,
             enablePeakStats: this.config.processing.enablePeakStats,
             maxPeaks: this.config.peakDetection.maxPeaks,
             outputRangeStart: this.config.outputRange.start
@@ -19292,6 +19323,7 @@ class SpectrumAnalyzer {
         this.templateOutputData = templateOutputData || new Float32Array;
         this.occupancyOutputData = occupancyOutputData || new Float32Array;
         this.backgroundNoiseOutputData = backgroundNoiseOutputData || new Float32Array;
+        this.thresholdOutputData = thresholdOutputData || new Float32Array;
         const fluorescenceOutput = this.getFluorescenceOutputData(realOutputData.length);
         return {
             realData: realOutputData,
@@ -19301,6 +19333,7 @@ class SpectrumAnalyzer {
             templateData: templateOutputData,
             occupancyData: occupancyOutputData,
             backgroundNoiseData: backgroundNoiseOutputData,
+            thresholdData: thresholdOutputData,
             fluorescenceData: fluorescenceOutput,
             fluorescenceMaxCount: this.fluorescenceMaxCount,
             extraData: this.extraOutputData,
@@ -19390,7 +19423,7 @@ class SpectrumAnalyzer {
     }
     setPendingFlag(type, value1) {
         this.pendingDataFlags[type] = value1;
-        this.hasPendingData = this.pendingDataFlags["occupancy"] || this.pendingDataFlags["template"] || this.pendingDataFlags["backgroundNoise"] || this.pendingDataFlags["extra"];
+        this.hasPendingData = this.pendingDataFlags["occupancy"] || this.pendingDataFlags["template"] || this.pendingDataFlags["backgroundNoise"] || this.pendingDataFlags["threshold"] || this.pendingDataFlags["extra"];
     }
     resampleSingleData(sourceData) {
         const { srcIndexCache } = this;
@@ -19418,6 +19451,10 @@ class SpectrumAnalyzer {
             pendingOutput.backgroundNoiseData = this.resampleSingleData(this.backgroundNoiseData);
             this.setPendingFlag("backgroundNoise", false);
         }
+        if (this.pendingDataFlags["threshold"] && this.thresholdData.length > 0) {
+            pendingOutput.thresholdData = this.resampleSingleData(this.thresholdData);
+            this.setPendingFlag("threshold", false);
+        }
         if (this.pendingDataFlags["extra"] && Object.keys(this.extraData).length > 0) {
             this.extraOutputData = resampleExtraData(this.extraData, this.antennaFactorData, this.antennaFactorSwitch, this.srcIndexCache, this.getOutputData.bind(this));
             pendingOutput.extraData = this.extraOutputData;
@@ -19458,7 +19495,7 @@ class SpectrumAnalyzer {
         return outputData;
     }
     getAllRawData(left) {
-        const { realOutputData, maxOutputData, minOutputData, avgOutputData, templateOutputData, occupancyOutputData, backgroundNoiseOutputData, waterfallOutputData, extraOutputData, srcIndexCache } = this;
+        const { realOutputData, maxOutputData, minOutputData, avgOutputData, templateOutputData, occupancyOutputData, backgroundNoiseOutputData, thresholdOutputData, waterfallOutputData, extraOutputData, srcIndexCache } = this;
         realOutputData.timestamp = this.realData.timestamp;
         const rawData = {
             realData: this.realData,
@@ -19468,6 +19505,7 @@ class SpectrumAnalyzer {
             templateData: this.templateData,
             occupancyData: this.occupancyData,
             backgroundNoiseData: this.backgroundNoiseData,
+            thresholdData: this.thresholdData,
             waterfallData: this.waterfallData,
             extraData: this.extraData
         };
@@ -19480,6 +19518,7 @@ class SpectrumAnalyzer {
             templateData: templateOutputData,
             occupancyData: occupancyOutputData,
             backgroundNoiseData: backgroundNoiseOutputData,
+            thresholdData: thresholdOutputData,
             fluorescenceData: this.getFluorescenceOutputData(realOutputData.length),
             waterfallData: waterfallOutputData,
             extraData: extraOutputData,
@@ -19638,7 +19677,7 @@ class SeriesManager {
         return true;
     }
 }
-const events_SeriesEventName = {
+const SeriesEventName = {
     UPDATED: 'series:updated',
     ADDED: 'series:added',
     REMOVED: 'series:removed',
@@ -19689,7 +19728,7 @@ function subscribeToSeries(globalID, event, listener) {
         if (data.globalID === globalID) listener(data);
     });
 }
-function events_emitSeriesEvent(event, data) {
+function emitSeriesEvent(event, data) {
     seriesEvents.emit(event, data);
 }
 var modes_SeriesMode = /*#__PURE__*/ function(SeriesMode) {
@@ -19750,7 +19789,7 @@ function getNextMode(currentMode) {
 function setSeriesMode(globalID, mode) {
     seriesModes.set(globalID, mode);
     const modeConfig = SERIES_MODES[mode];
-    events_emitSeriesEvent(events_SeriesEventName.MODE_CHANGED, {
+    emitSeriesEvent(SeriesEventName.MODE_CHANGED, {
         globalID,
         mode,
         config: modeConfig
@@ -19768,7 +19807,7 @@ function initSeriesSubscription(renderer) {
         return null;
     }
     const subscriptions = [];
-    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.UPDATED, (data)=>{
+    subscriptions.push(subscribeToSeries(globalID, SeriesEventName.UPDATED, (data)=>{
         const correctType = getCorrectSeriesType(globalID, data.seriesName);
         const configWithCorrectType = {
             ...data.config,
@@ -19777,13 +19816,13 @@ function initSeriesSubscription(renderer) {
         renderer.setSeries(configWithCorrectType, true);
         renderer.state.chart?.draw();
     }));
-    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.MODE_CHANGED, ()=>{
+    subscriptions.push(subscribeToSeries(globalID, SeriesEventName.MODE_CHANGED, ()=>{
         renderer.initSeries();
     }));
-    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.TYPE_OVERRIDE_CHANGED, ()=>{
+    subscriptions.push(subscribeToSeries(globalID, SeriesEventName.TYPE_OVERRIDE_CHANGED, ()=>{
         renderer.initSeries();
     }));
-    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.BATCH_UPDATED, (data)=>{
+    subscriptions.push(subscribeToSeries(globalID, SeriesEventName.BATCH_UPDATED, (data)=>{
         data.configs.forEach((config)=>{
             const correctType = getCorrectSeriesType(globalID, config.name);
             const configWithCorrectType = {
@@ -19794,7 +19833,7 @@ function initSeriesSubscription(renderer) {
         });
         renderer.state.chart?.draw();
     }));
-    subscriptions.push(subscribeToSeries(globalID, events_SeriesEventName.RESET, ()=>{
+    subscriptions.push(subscribeToSeries(globalID, SeriesEventName.RESET, ()=>{
         if (renderer.state.series) renderer.state.series = {};
         renderer.initSeries();
     }));
@@ -19806,7 +19845,7 @@ const chartTypeSeriesOverrides = new Map();
 function setChartTypeSeriesOverride(globalID, seriesName, type) {
     if (!chartTypeSeriesOverrides.has(globalID)) chartTypeSeriesOverrides.set(globalID, new Map());
     chartTypeSeriesOverrides.get(globalID)?.set(seriesName, type);
-    events_emitSeriesEvent(events_SeriesEventName.TYPE_OVERRIDE_CHANGED, {
+    emitSeriesEvent(SeriesEventName.TYPE_OVERRIDE_CHANGED, {
         globalID,
         seriesName,
         type
@@ -19815,7 +19854,7 @@ function setChartTypeSeriesOverride(globalID, seriesName, type) {
 function clearChartTypeSeriesOverrides(globalID) {
     const hadOverrides = chartTypeSeriesOverrides.has(globalID);
     chartTypeSeriesOverrides.delete(globalID);
-    if (hadOverrides) events_emitSeriesEvent(events_SeriesEventName.TYPE_OVERRIDE_CHANGED, {
+    if (hadOverrides) emitSeriesEvent(SeriesEventName.TYPE_OVERRIDE_CHANGED, {
         globalID
     });
 }
@@ -19879,16 +19918,18 @@ function getSeriesMap(globalID) {
     return seriesMap;
 }
 function mergeSeriesConfig(config, existing) {
+    const defaultConfig = getSeriesConfig()[config.name];
     const defaults = {
-        label: '',
-        display: true,
+        label: defaultConfig?.label ?? '',
+        color: defaultConfig?.color,
+        display: defaultConfig?.display ?? true,
         type: __WEBPACK_EXTERNAL_MODULE__rfkit_renderer_d3372451__.GraphicType.Line,
-        thickness: 1
+        thickness: defaultConfig?.thickness ?? 1
     };
     return {
         name: config.name,
         label: config.label ?? existing?.label ?? defaults.label,
-        color: config.color ?? existing?.color ?? (()=>{
+        color: config.color ?? existing?.color ?? defaults.color ?? (()=>{
             throw new Error(`Series "${config.name}" does not exist and must have a color defined`);
         })(),
         display: config.display ?? existing?.display ?? defaults.display,
@@ -19896,14 +19937,21 @@ function mergeSeriesConfig(config, existing) {
         thickness: config.thickness ?? existing?.thickness ?? defaults.thickness
     };
 }
+function upsertSeriesConfig(manager, finalConfig, existing) {
+    if (!existing) return void manager.addSeries(finalConfig);
+    manager.setSeriesProperty(finalConfig.name, 'label', finalConfig.label);
+    manager.setSeriesProperty(finalConfig.name, 'color', finalConfig.color);
+    manager.setSeriesProperty(finalConfig.name, 'thickness', finalConfig.thickness);
+    manager.setSeriesProperty(finalConfig.name, 'display', finalConfig.display);
+    manager.setSeriesProperty(finalConfig.name, 'type', finalConfig.type);
+}
 function updateSeries(globalID, config) {
     if (!config?.name) return;
     const manager = getSeriesManager(globalID);
     const existing = manager.getSeries(config.name);
     const finalConfig = mergeSeriesConfig(config, existing);
-    if (existing) manager.removeSeries(config.name);
-    manager.addSeries(finalConfig);
-    events_emitSeriesEvent(events_SeriesEventName.UPDATED, {
+    upsertSeriesConfig(manager, finalConfig, existing);
+    emitSeriesEvent(SeriesEventName.UPDATED, {
         globalID,
         seriesName: config.name,
         config: {
@@ -19930,10 +19978,32 @@ function resetSeries(globalID) {
             thickness: config.thickness
         });
     });
-    events_emitSeriesEvent(events_SeriesEventName.RESET, {
+    emitSeriesEvent(SeriesEventName.RESET, {
         globalID
     });
 }
+function batchUpdateSeries(globalID, configs) {
+    const manager = getSeriesManager(globalID);
+    const updatedConfigs = [];
+    configs.forEach((config)=>{
+        if (!config?.name) return;
+        const existing = manager.getSeries(config.name);
+        const finalConfig = mergeSeriesConfig(config, existing);
+        upsertSeriesConfig(manager, finalConfig, existing);
+        updatedConfigs.push({
+            name: finalConfig.name,
+            label: finalConfig.label,
+            color: finalConfig.color,
+            thickness: finalConfig.thickness,
+            display: finalConfig.display,
+            type: finalConfig.type
+        });
+    });
+    if (updatedConfigs.length > 0) emitSeriesEvent(SeriesEventName.BATCH_UPDATED, {
+        globalID,
+        configs: updatedConfigs
+    });
+}
 function getSeriesWithGraphicType(globalID) {
     const seriesMap = getSeriesMap(globalID);
     const result = new Map();
@@ -20522,32 +20592,32 @@ function useSeriesManager(globalID, options = {}) {
         const unsubscribers = [];
         if (subscribeToMode) {
             setMode(getSeriesMode(globalID));
-            const unsubscribeMode = subscribeToSeries(globalID, events_SeriesEventName.MODE_CHANGED, (data)=>{
+            const unsubscribeMode = subscribeToSeries(globalID, SeriesEventName.MODE_CHANGED, (data)=>{
                 setMode(data.mode);
             });
             unsubscribers.push(unsubscribeMode);
         }
         if (subscribeToData) {
-            const unsubscribeUpdated = subscribeToSeries(globalID, events_SeriesEventName.UPDATED, (data)=>{
+            const unsubscribeUpdated = subscribeToSeries(globalID, SeriesEventName.UPDATED, (data)=>{
                 if (watchSeries && !watchSeries.includes(data.seriesName)) return;
                 forceUpdate();
             });
             unsubscribers.push(unsubscribeUpdated);
-            const unsubscribeAdded = subscribeToSeries(globalID, events_SeriesEventName.ADDED, (data)=>{
+            const unsubscribeAdded = subscribeToSeries(globalID, SeriesEventName.ADDED, (data)=>{
                 if (watchSeries && !watchSeries.includes(data.seriesName)) return;
                 forceUpdate();
             });
             unsubscribers.push(unsubscribeAdded);
-            const unsubscribeRemoved = subscribeToSeries(globalID, events_SeriesEventName.REMOVED, (data)=>{
+            const unsubscribeRemoved = subscribeToSeries(globalID, SeriesEventName.REMOVED, (data)=>{
                 if (watchSeries && !watchSeries.includes(data.seriesName)) return;
                 forceUpdate();
             });
             unsubscribers.push(unsubscribeRemoved);
-            const unsubscribeBatchUpdated = subscribeToSeries(globalID, events_SeriesEventName.BATCH_UPDATED, ()=>{
+            const unsubscribeBatchUpdated = subscribeToSeries(globalID, SeriesEventName.BATCH_UPDATED, ()=>{
                 forceUpdate();
             });
             unsubscribers.push(unsubscribeBatchUpdated);
-            const unsubscribeReset = subscribeToSeries(globalID, events_SeriesEventName.RESET, ()=>{
+            const unsubscribeReset = subscribeToSeries(globalID, SeriesEventName.RESET, ()=>{
                 forceUpdate();
             });
             unsubscribers.push(unsubscribeReset);
@@ -20576,21 +20646,14 @@ function useSeriesForComponent(globalID) {
         subscribeToData: true
     });
 }
-const stableOrderMap = new Map();
-function getStableOrder(globalID, currentNames) {
-    const stored = stableOrderMap.get(globalID) || [];
-    const needsUpdate = 0 === stored.length || currentNames.some((name)=>!stored.includes(name)) || stored.some((name)=>!currentNames.includes(name));
-    if (needsUpdate) {
-        const newOrder = [
-            ...stored.filter((name)=>currentNames.includes(name)),
-            ...currentNames.filter((name)=>!stored.includes(name))
-        ];
-        stableOrderMap.set(globalID, newOrder);
-        return newOrder;
-    }
-    return stored;
+const DEFAULT_SERIES_ORDER = Object.values(getSeriesConfig()).map((config)=>config.name);
+function getStableOrder(currentNames) {
+    return [
+        ...DEFAULT_SERIES_ORDER.filter((name)=>currentNames.includes(name)),
+        ...currentNames.filter((name)=>!DEFAULT_SERIES_ORDER.includes(name))
+    ];
 }
-function useFilteredSeries(globalID, filter) {
+function useFilteredSeries_useFilteredSeries(globalID, filter) {
     const { series } = useSeriesManager(globalID);
     const { state: { series: { legendExternal } } } = useStore_useStore();
     const filteredData = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>{
@@ -20599,12 +20662,8 @@ function useFilteredSeries(globalID, filter) {
             if (config.name === constants_SeriesType.TemplateData) return false;
             return filter ? filter(config) : true;
         });
-        if (!globalID) return filtered.map((config, index)=>({
-                ...config,
-                originalIndex: index
-            }));
         const currentNames = filtered.map((s)=>s.name);
-        const stableOrder = getStableOrder(globalID, currentNames);
+        const stableOrder = getStableOrder(currentNames);
         const orderMap = new Map(stableOrder.map((name, i)=>[
                 name,
                 i
@@ -20620,8 +20679,7 @@ function useFilteredSeries(globalID, filter) {
     }, [
         series,
         legendExternal,
-        filter,
-        globalID
+        filter
     ]);
     return filteredData;
 }
@@ -21153,7 +21211,7 @@ const StationInfoPanel = ({ stationInfo })=>{
 const panels_StationInfoPanel = /*#__PURE__*/ __WEBPACK_EXTERNAL_MODULE_react__["default"].memo(StationInfoPanel);
 const FrequencyDataBoard = ({ left, updateKey, onChange, showStationInfo = true })=>{
     const { state: { axisY, axisX: { frequencyFormat, unit }, globalID } } = useStore_useStore();
-    const filteredSeries = useFilteredSeries(globalID, (config)=>false !== config.display);
+    const filteredSeries = useFilteredSeries_useFilteredSeries(globalID, (config)=>false !== config.display);
     const calculateIndex = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((values, series, sampledIndex, rawValue)=>{
         if (!values || 0 === values.length) return null;
         const safeSampledIndex = Math.max(0, Math.min(values.length - 1, Math.floor(sampledIndex)));
@@ -21207,6 +21265,7 @@ const FrequencyDataBoard = ({ left, updateKey, onChange, showStationInfo = true
             maxData: snapshot.maxData,
             minData: snapshot.minData,
             avgData: snapshot.avgData,
+            thresholdData: snapshot.thresholdData,
             templateData: snapshot.templateData,
             occupancyData: snapshot.occupancyData,
             backgroundNoiseData: snapshot.backgroundNoiseData,
@@ -21217,6 +21276,7 @@ const FrequencyDataBoard = ({ left, updateKey, onChange, showStationInfo = true
             maxData: snapshot.rawData?.maxData,
             minData: snapshot.rawData?.minData,
             avgData: snapshot.rawData?.avgData,
+            thresholdData: snapshot.rawData?.thresholdData,
             templateData: snapshot.rawData?.templateData,
             occupancyData: snapshot.rawData?.occupancyData,
             backgroundNoiseData: snapshot.rawData?.backgroundNoiseData,
@@ -23483,7 +23543,7 @@ class Spectrum extends BaseRenderer {
         const { color = SERIES[name]?.color, thickness = 1, display = false } = merged;
         const nextSeriesConfig = {
             name,
-            label: config.label,
+            label: merged.label,
             type: resolvedType || __WEBPACK_EXTERNAL_MODULE__rfkit_renderer_d3372451__.GraphicType.Line,
             color,
             thickness,
@@ -23497,7 +23557,7 @@ class Spectrum extends BaseRenderer {
         if (!skipEventEmit && globalID) try {
             updateSeries(globalID, {
                 name,
-                label: config.label || name,
+                label: nextSeriesConfig.label || name,
                 color,
                 thickness,
                 display,
@@ -23915,36 +23975,24 @@ const SeriesControl_SeriesControl = ({ type })=>{
 const SeriesControl = SeriesControl_SeriesControl;
 const SeriesDisplayControl = ()=>{
     const { state: { globalID, series: seriesConfig } } = useStore_useStore();
-    const filteredSeries = useFilteredSeries(globalID);
-    const { forceUpdate } = useSeriesForComponent(globalID);
+    const filteredSeries = useFilteredSeries_useFilteredSeries(globalID);
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
         if (!globalID || !seriesConfig?.forceDisplay) return;
         const hiddenSeries = filteredSeries.filter((item)=>!item.display);
-        if (hiddenSeries.length > 0) {
-            hiddenSeries.forEach(({ name })=>{
-                updateSeries(globalID, {
-                    name,
-                    display: true
-                });
-            });
-            forceUpdate();
-        }
+        if (hiddenSeries.length > 0) batchUpdateSeries(globalID, hiddenSeries.map(({ name })=>({
+                name,
+                display: true
+            })));
     }, [
         globalID,
         seriesConfig?.forceDisplay,
         filteredSeries.length
     ]);
     const updateSeriesDisplay = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((updates)=>{
-        updates.forEach(({ name, display })=>{
-            updateSeries(globalID, {
-                name,
-                display
-            });
-        });
-        forceUpdate();
+        if (!globalID || 0 === updates.length) return;
+        batchUpdateSeries(globalID, updates);
     }, [
-        globalID,
-        forceUpdate
+        globalID
     ]);
     const handleSeriesToggle = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((seriesName, display)=>{
         updateSeriesDisplay([
@@ -29617,10 +29665,11 @@ function useSpectrumAnalyzer(props) {
     }, []);
     const { updateTemplateOverData } = useTemplateComparison();
     const handleSpectrumUpdate = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((data)=>{
-        if (data.realData || data.templateData || data.backgroundNoiseData) updateSpectrum({
+        if (data.realData || data.templateData || data.backgroundNoiseData || 'thresholdData' in data) updateSpectrum({
             minData: data.minData,
             maxData: data.maxData,
             avgData: data.avgData,
+            thresholdData: data.thresholdData,
             backgroundNoiseData: data.backgroundNoiseData,
             realData: data.realData,
             templateData: data.templateData
@@ -29715,6 +29764,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);
                 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/package.json

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

package/types/publish.d.ts

@@ -53,6 +53,7 @@ export interface PublishSpectrum {
     maxData?: Float32Array;
     minData?: Float32Array;
     avgData?: Float32Array;
+    thresholdData?: Float32Array;
     backgroundNoiseData?: Float32Array;
     templateData?: Float32Array;
     templateTolerance?: number;