qlsdk2 0.6.0a1__tar.gz → 0.6.0a3__tar.gz

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a1
+Version: 0.6.0a3
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun
@@ -16,15 +16,11 @@ Requires-Dist: bitarray>=1.5.3
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0; extra == "dev"
 Requires-Dist: twine>=3.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+
+## **v0.6.0 (2025-xx-xx)
+#### 新设备
+- C256RS设备
+
 
 ## **v0.5.1.1** (2025-08-24)
 #### 🐛 Bug Fixed

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/README.md

@@ -1,3 +1,8 @@
+## **v0.6.0 (2025-xx-xx)
+#### 新设备
+- C256RS设备
+
+
 ## **v0.5.1.1** (2025-08-24)
 #### 🐛 Bug Fixed
 - 修复仅选择一个通道时，自动保存功能异常的问题

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8' ) as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.6.0a1",
+    version="0.6.0a3",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk/core/entity/__init__.py

@@ -50,7 +50,8 @@ class RscPacket(Packet):
             for i in range(ch_num)
         ]
                 
-        # logger.trace(self)
+        logger.trace(packet)
+        
         return packet
         
     def __str__(self):
@@ -80,7 +81,7 @@ class ImpedancePacket(Packet):
         self.pkg_id = int.from_bytes(body[9: 13], 'little')
         self.channels = to_channels(body[13: 45])
         
-        logger.debug(f"impedance: {self}")
+        logger.trace(f"impedance: {self}")
         
     def __str__(self):
         return f"""

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk/persist/rsc_edf.py

@@ -15,7 +15,7 @@ EDF_FILE_TYPE = {
 }
 
 class EDFStreamWriter(Thread):
-    def __init__(self, channels, sample_frequency, physical_max, digital_min, file_type, file_path, record_duration=None):
+    def __init__(self, channels, sample_frequency, physical_max, physical_min, file_type, file_path, record_duration=None):
         
         super().__init__()
         self._writer : EdfWriter = None
@@ -32,7 +32,7 @@ class EDFStreamWriter(Thread):
         self._n_channels = len(channels)
         self.sample_frequency = sample_frequency
         self.physical_max = physical_max
-        self.physical_min = digital_min
+        self.physical_min = physical_min
         # 和位数相关，edf 16 bits/bdf  24 bits
         self.digital_max = 8388607 if file_type == EDF_FILE_TYPE['bdf'] else 32767
         self.digital_min = -8388608 if file_type == EDF_FILE_TYPE['bdf'] else -32768
@@ -46,6 +46,7 @@ class EDFStreamWriter(Thread):
         self.equipment = "equipment"
         self.patient_code = "patient_code"
         self.patient_name = "patient_name"
+        logger.info(f'digital_max:{self.digital_max}, digital_min:{self.digital_min}, physical_max:{self.physical_max}, physical_min:{self.physical_min}')
         
     def set_channels(self, channels):
         self._channels = channels
@@ -127,6 +128,7 @@ class EDFStreamWriter(Thread):
         
         # 配置通道参数
         signal_headers = []
+        logger.trace(f"sf: {self.sample_frequency}, pm: {self.physical_max}, pn: {self.physical_min}, dm: {self.digital_max}, dn: {self.digital_min}")
         for ch in range(self._n_channels):
             signal_headers.append({
                 "label": f'channels {self._channels[ch]}',
@@ -169,14 +171,16 @@ class EDFStreamWriter(Thread):
     # 写入1秒的数据
     def _write_block(self, block):
         logger.trace(f"写入数据: {block}")
-        # 转换数据类型为float64
-        data_float64 = block.astype(np.float64)
+        # 转换数据类型为float64-物理信号uV int32-数字信号
+        data_input = block.astype(np.int32)
+        logger.trace(f"写入数据-real: {data_input}")
         # 写入时转置为(样本数, 通道数)格式
-        self._writer.writeSamples(data_float64)
+        self._writer.writeSamples(data_input, digital=True)
         self._duration += 1
         
         if self._duration % 10 == 0:  # 每10秒打印一次进度
             logger.info(f"数据记录中... 文件名：{self.file_path}, 已记录时长: {self._duration}秒")
+            
 
 # 用作数据结构一致化处理，通过调用公共类写入edf文件
 # 入参包含写入edf的全部前置参数
@@ -200,7 +204,7 @@ class RscEDFHandler(object):
         self.physical_max = physical_max
         self.physical_min = physical_min
         self.digital_max = 8388607 if resolution == 24 else 32767
-        self.digital_min = -8388607 if resolution == 24 else - 32768
+        self.digital_min = -8388608 if resolution == 24 else - 32768
         self.file_type = EDF_FILE_TYPE["bdf"] if resolution == 24 else EDF_FILE_TYPE["edf"]
         # 点分辨率
         self.resolution = resolution
@@ -226,8 +230,8 @@ class RscEDFHandler(object):
         self._end_time = None
         self._patient_code = "patient_code"
         self._patient_name = "patient_name"
-        self._device_type = "24130032"
-        self._device_no = "24130032"
+        self._device_type = "0000"
+        self._device_no = "00000000"
         self._total_packets = 0
         self._lost_packets = 0
         self._storage_path = storage_path
@@ -242,7 +246,7 @@ class RscEDFHandler(object):
         suffix = "bdf" if self.resolution == 24 else "edf"
         
         # 文件名称
-        file_name = f"{self._file_prefix}_{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}" if self._file_prefix else f"{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}"
+        file_name = f"{self._file_prefix}_{self._device_no}_{self._start_time.strftime('%y%m%d%H%M%S')}.{suffix}" if self._file_prefix else f"{self._device_no}_{self._start_time.strftime('%y%m%d%H%I%M')}.{suffix}"
         
         if self._storage_path:
             try:
@@ -260,6 +264,8 @@ class RscEDFHandler(object):
             self._device_type = "C64RS"
         elif device_type == 0x40:
             self._device_type = "LJ64S1"
+        elif device_type == 0x45:
+            self._device_type = "C256RS"
         elif device_type == 0x51:
             self._device_type = "C256RS"
         elif device_type == 0x60:
@@ -312,6 +318,7 @@ class RscEDFHandler(object):
                 self._edf_writer_thread.set_start_time(self._start_time)
                 self._edf_writer_thread.start()
                 logger.info(f"开始写入数据: {self.file_name}")
+                self._edf_writer_thread.equipment = f'{self._device_type}_{self._device_no}'
                 
             self._edf_writer_thread.append(packet.eeg)
             
@@ -331,5 +338,4 @@ class RscEDFHandler(object):
             else: onset = 0
         else:
             onset = cur_time - self._first_timestamp
-        self._edf_writer_thread.trigger(onset, desc)     
-    
+        self._edf_writer_thread.trigger(onset, desc)     

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk/rsc/device/base.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, Literal
 
 from loguru import logger
 import numpy as np
-from qlsdk.core.entity import RscPacket
+from qlsdk.core.entity import RscPacket, ImpedancePacket
 from qlsdk.core.utils import to_bytes
 from qlsdk.rsc.interface import IDevice, IParser
 from qlsdk.rsc.command import StartImpedanceCommand, StopImpedanceCommand, StartStimulationCommand, StopStimulationCommand, SetAcquisitionParamCommand, StartAcquisitionCommand, StopAcquisitionCommand
@@ -136,7 +136,24 @@ class QLBaseDevice(IDevice):
     
     # 数据包处理
     def produce(self, body: bytes, type:Literal['signal', 'impedance']="signal"):
-        if body is None: return     
+        if body is None: return      
+        
+        if type == "signal":
+            self._produce_signal(body)
+        elif type == "impedance":
+            self._produce_impedance(body)       
+        
+    def _produce_impedance(self, body: bytes):
+        packet = ImpedancePacket().transfer(body)
+        # 分发阻抗数据包给订阅者
+        if len(self._impedance_consumer) > 0:
+            for topic, q in self._impedance_consumer.items():
+                try:
+                    q.put(packet, timeout=1)
+                except Exception as e:
+                    logger.error(f"impedance data put to queue exception: {str(e)}")
+    
+    def _produce_signal(self, body: bytes):        
         
         # 处理信号数据
         data = self._signal_wrapper(body)   
@@ -152,8 +169,10 @@ class QLBaseDevice(IDevice):
             self._write_signal(data)
                         
         if len(self.signal_consumers) > 0 :
+            logger.trace(f"dg eeg: {data.eeg}")
             # 信号数字值转物理值
             data.eeg = self.eeg2phy(np.array(data.eeg))
+            logger.trace(f"ph eeg: {data.eeg}")
             
             # 发送数据包到订阅者
             for q in list(self.signal_consumers.values()):
@@ -161,7 +180,7 @@ class QLBaseDevice(IDevice):
                 if q.full(): 
                     q.get()
                     
-                q.put(data)
+                q.put(data)        
                 
     # 信号数据转换
     def _signal_wrapper(self, body: bytes):

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk/rsc/device/c256_rs.py

@@ -12,8 +12,9 @@ from qlsdk.rsc.command import *
 from qlsdk.rsc.device.base import QLBaseDevice
 
 class C256RS(QLBaseDevice):
-    
-    device_type = 0x51  # C64RS设备类型标识符
+    # C256RS设备类型标识符
+    device_type_001 = 0x51  
+    device_type = 0x45  
     
     def __init__(self, socket):
         super().__init__(socket)
@@ -188,19 +189,7 @@ class C256RS(QLBaseDevice):
        
     # 设置记录文件名称前缀 
     def set_file_prefix(self, prefix):
-        self._file_prefix = prefix
-        
-    # 接收socket消息
-    def accept(self):
-        pass
-        # while True:
-        #     # 缓冲去4M
-        #     data = self.socket.recv(4096*1024)
-        #     if not data:
-        #         logger.warning(f"设备{self.device_name}连接结束")
-        #         break
-            
-        #     self._parser.append(data)            
+        self._file_prefix = prefix              
        
     # socket发送数据    
     def send(self, data):
@@ -355,4 +344,5 @@ class C256RS(QLBaseDevice):
         return hash((self.device_name, self.device_type, self.device_id))    
     
     
-DeviceFactory.register(C256RS.device_type, C256RS) 
+DeviceFactory.register(C256RS.device_type, C256RS) 
+DeviceFactory.register(C256RS.device_type_001, C256RS) 

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a1
+Version: 0.6.0a3
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun
@@ -16,15 +16,11 @@ Requires-Dist: bitarray>=1.5.3
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0; extra == "dev"
 Requires-Dist: twine>=3.0; extra == "dev"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+
+## **v0.6.0 (2025-xx-xx)
+#### 新设备
+- C256RS设备
+
 
 ## **v0.5.1.1** (2025-08-24)
 #### 🐛 Bug Fixed

{qlsdk2-0.6.0a1 → qlsdk2-0.6.0a3}/src/qlsdk2.egg-info/SOURCES.txt

@@ -77,4 +77,5 @@ src/qlsdk/x8/__init__.py
 src/qlsdk/x8m/__init__.py
 test/test.222.py
 test/test.py
-test/test_ar4m.py
+test/test_ar4m.py
+test/test_bdf.py

qlsdk2-0.6.0a3/test/test_bdf.py

@@ -0,0 +1,212 @@
+# 使用示例
+from read_bdf import BDFEDFReader
+
+
+def main():
+    """主函数示例"""
+    
+    # 1. 创建读取器
+    filepath = r"E:\project\qlsdk-project\C256RS_450025430001_251223182657.bdf"  # 或 "sample.edf"
+    
+    try:
+        # 使用上下文管理器自动管理文件
+        with BDFEDFReader(filepath) as reader:
+            
+            # 2. 获取文件信息
+            file_info = reader.get_file_info()
+            print("=== 文件信息 ===")
+            for key, value in file_info.items():
+                print(f"{key}: {value}")
+            print()
+            
+            # 3. 获取通道信息
+            channel_info = reader.get_channel_info()
+            print("=== 通道信息 (前3个) ===")
+            for i in range(min(3, len(channel_info))):
+                info = channel_info[i]
+                print(f"通道 {i} ({info['label']}):")
+                print(f"  采样率: {info['sample_frequency']} Hz")
+                print(f"  物理范围: [{info['physical_min']}, {info['physical_max']}] {info['physical_dimension']}")
+                print(f"  数字范围: [{info['digital_min']}, {info['digital_max']}]")
+                print(f"  增益: {info['gain']:.6f}, 偏移: {info['offset']:.6f}")
+                print()
+            
+            # 4. 读取指定时间段的数据
+            start_time = 20.0  # 10秒
+            end_time = 30.0    # 12秒
+            
+            print(f"=== 读取 {start_time}s 到 {end_time}s 的数据 ===")
+            
+            # 读取所有通道的物理值
+            data_physical = reader.read_data(
+                start_time=start_time,
+                end_time=end_time,
+                output_type='digital',  # 或 'digital'/'physical'
+                return_as_dataframe=True
+            )
+            
+            # 5. 显示统计信息
+            stats = reader.get_channel_statistics(data_physical)
+            print("=== 统计信息 ===")
+            for channel_idx, stat in stats.items():
+                print(f"通道 {channel_idx} ({stat['label']}):")
+                print(f"  样本数: {stat['count']}")
+                print(f"  范围: [{stat['min']:.2f}, {stat['max']:.2f}]")
+                print(f"  均值: {stat['mean']:.2f} ± {stat['std']:.2f}")
+                print()
+            
+            # 6. 获取DataFrame
+            if 'dataframe' in data_physical:
+                df = data_physical['dataframe']
+                print("=== DataFrame 前5行 ===")
+                print(df.head())
+                print()
+                print("=== DataFrame 信息 ===")
+                print(df.info())
+            
+            # 7. 导出为CSV
+            reader.export_to_csv(data_physical, "output_data.csv")
+            
+            # 8. 读取特定通道
+            print("\n=== 读取特定通道 ===")
+            channel_indices = [0, 1, 2]  # 前3个通道
+            data_channels = reader.read_data(
+                start_time=15.0,
+                end_time=16.0,
+                channel_indices=channel_indices,
+                output_type='digital'  # 数字值
+            )
+            
+            for channel_idx, channel_data in data_channels['channels'].items():
+                print(f"通道 {channel_idx} 前5个数字值: {channel_data['data'][:5]}")
+            
+            # 9. 通过标签获取通道
+            try:
+                eeg_channel_idx = reader.get_channel_by_label("EEG")
+                print(f"\nEEG通道索引: {eeg_channel_idx}")
+            except ValueError as e:
+                print(f"未找到EEG通道: {e}")
+            
+            # 10. 读取标注
+            annotations = reader.read_annotations()
+            if annotations:
+                print("\n=== 文件标注 ===")
+                for i, annot in enumerate(annotations[:5]):  # 显示前5个
+                    print(f"{i+1}. 时间: {annot['onset']:.2f}s, "
+                          f"时长: {annot['duration']:.2f}s, "
+                          f"描述: {annot['description']}")
+            
+            # 11. 绘制图形
+            try:
+                reader.plot_segment(
+                    data_dict=data_physical,
+                    channel_indices=[0, 1, 2],
+                    figsize=(12, 8),
+                    save_path="plot.png"
+                )
+            except Exception as e:
+                print(f"绘图失败: {e}")
+    
+    except FileNotFoundError:
+        print(f"文件不存在: {filepath}")
+    except Exception as e:
+        print(f"处理文件时出错: {e}")
+
+def batch_process_files(file_list, output_dir="output"):
+    """
+    批量处理多个文件
+    """
+    import os
+    
+    if not os.path.exists(output_dir):
+        os.makedirs(output_dir)
+    
+    for filepath in file_list:
+        if not os.path.exists(filepath):
+            print(f"文件不存在: {filepath}")
+            continue
+        
+        print(f"\n处理文件: {filepath}")
+        
+        try:
+            reader = BDFEDFReader(filepath)
+            reader.open()
+            
+            # 获取文件名
+            filename = os.path.basename(filepath)
+            base_name = os.path.splitext(filename)[0]
+            
+            # 读取前30秒的数据
+            data = reader.read_data(
+                start_time=0,
+                end_time=30,
+                output_type='physical',
+                return_as_dataframe=True
+            )
+            
+            # 导出CSV
+            csv_path = os.path.join(output_dir, f"{base_name}.csv")
+            reader.export_to_csv(data, csv_path)
+            
+            # 导出统计信息
+            stats = reader.get_channel_statistics(data)
+            stats_path = os.path.join(output_dir, f"{base_name}_stats.json")
+            
+            import json
+            with open(stats_path, 'w') as f:
+                json.dump(stats, f, indent=2, default=str)
+            
+            print(f"  已保存: {csv_path}")
+            print(f"  已保存: {stats_path}")
+            
+            reader.close()
+            
+        except Exception as e:
+            print(f"  处理失败: {e}")
+
+# 命令行接口
+if __name__ == "__main__":
+    main()
+    # import argparse
+    
+    # parser = argparse.ArgumentParser(description='读取BDF/EDF文件并提取数据')
+    # parser.add_argument('filepath', help='BDF/EDF文件路径')
+    # parser.add_argument('--start', type=float, default=0, help='开始时间(秒)')
+    # parser.add_argument('--end', type=float, default=10, help='结束时间(秒)')
+    # parser.add_argument('--channels', type=str, default=1 help='通道索引(逗号分隔)')
+    # parser.add_argument('--output-type', choices=['physical', 'digital'], default='physical',
+    #                    help='输出类型: physical(物理值) 或 digital(数字值)')
+    # parser.add_argument('--output', help='输出CSV文件路径')
+    # parser.add_argument('--plot', action='store_true', help='绘制图表')
+    
+    # args = parser.parse_args()
+    
+    # # 解析通道参数
+    # channel_indices = None
+    # if args.channels:
+    #     channel_indices = [int(c.strip()) for c in args.channels.split(',')]
+    
+    # # 处理文件
+    # with BDFEDFReader(args.filepath) as reader:
+    #     data = reader.read_data(
+    #         start_time=args.start,
+    #         end_time=args.end,
+    #         channel_indices=channel_indices,
+    #         output_type=args.output_type,
+    #         return_as_dataframe=True
+    #     )
+        
+    #     # 输出到控制台
+    #     if 'dataframe' in data:
+    #         print(f"读取了 {len(data['dataframe'])} 个样本")
+    #         print("\n前10个样本:")
+    #         print(data['dataframe'].head(10))
+        
+    #     # 导出到CSV
+    #     if args.output:
+    #         reader.export_to_csv(data, args.output)
+    #         print(f"\n数据已导出到: {args.output}")
+        
+    #     # 绘制图表
+    #     if args.plot:
+    #         reader.plot_segment(data, channel_indices=channel_indices)