fix merging conflicts

.gitignore

@@ -1,8 +1,7 @@
 test.py
 .idea/
 aio/.idea/
-aio/__pycache__/
+aio/code/__pycache__/
-aio/dist/
+aio/package/
-aio/build/
-aio/aio.spec
 aio/venv
+aio/__pycache__/

aio/README.md

@@ -1,9 +1,10 @@
 ### 程序功能
 
 自动化测试数据处理工具，减少人工处理时长，提高测试数据处理的效率和准确度：
-1. 制动数据，单轴数据处理5min以内
+1. 制动数据，单轴数据处理3min以内
 2. 电机电流数据，全部轴数据处理1min以内
 3. ISO激光数据整理，1min以内
+4. wavelogger波形处理，几乎不花费时间
 
 ### 使用方法
 
@@ -11,25 +12,15 @@
 
 ### 第三方库
 
-```commandline
+```text
-pip3 install pandas -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
+参考requirements.txt
-pip3 install openpyxl -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-pip3 install xlmx -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-pip3 install pdfplumber -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-pip3 install jinja2 -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-pip3 install Pillow -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-python.exe -m pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
 ```
 
 ### 打包方法
 
-```commandline
+```
-pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py 
 pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py -p .\current.py
-<<<<<<< HEAD
+pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file ..\assets\file_version_info.txt -i ..\assets\icon.ico ..\code\aio.py -p ..\code\brake.py -p ..\code\iso.py -p ..\code\current.py -p ..\code\wavelogger.py
-pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py .\iso.py
-pyinstaller --noconfirm --onedir --windowed --add-data "/opt/git/rokae/aio/venv/lib/python3.11/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i ./icon.ico ./aio.py -p ./brake.py -p ./iso.py -p ./current.py
-pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/AppData/Local/Programs/Python/Python312/Lib/site-packages/customtkinter;customtkinter/" --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.py -p .\iso.py -p .\current.py
 ```
 
 ---
@@ -101,6 +92,13 @@ pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/A
 	b. ISO-V1000.pdf
 	c. ISO-V100.pdf
 	d. iso-results.xlsx
+
+#### wavelogger波形数据
+
+1. 需要提前将 .xdt 波形数据转换成 .csv 文件
+2. 组织目录下只允许有 .csv 文件，对文件夹无要求
+3. 运行结束后，会生成 result.xlsx 文件，结果按照 .csv 文件名存放
+4. 采集数据时，不同轮次数据时间间隔最好大于 2 倍的周期时间，否则会出现采集的轮数不正确的情况，但数据是完整的
 	
 #### 其他
 customtkinter的tabview组件不支持修改字体大小，可以参考 [Changing Font of a Tabview](https://github.com/TomSchimansky/CustomTkinter/issues/2296) 进行手动修改源码实现：
@@ -190,18 +188,44 @@ v0.1.4(2024/06/06)
 6. 支持工业/协作两条产品线的电机电流数据处理，包括单轴，场景，max/avg计算
 
 v0.1.5(2024/06/12)
-1. [aio.py]: 主界面切换不同功能时保持placehold一致
+1. [aio.py] 主界面切换不同功能时保持placehold一致
-2. [brake.py]: 由于制动采集模板和内容的更改，适配了新的数据，更新了算法
+2. [brake.py] 由于制动采集模板和内容的更改，适配了新的数据，更新了算法
-3. [aio.py]: 新增tabview组件，区分数据处理和自动化测试功能
+3. [aio.py] 新增tabview组件，区分数据处理和自动化测试功能
-4. [aio.py]: 重新调整界面配色
+4. [aio.py] 重新调整界面配色
-5. [aio.py]: 修改了write2textbox函数，定制化显示每一行的颜色，针对每一行可自定义输出内容颜色
+5. [aio.py] 修改了write2textbox函数，定制化显示每一行的颜色，针对每一行可自定义输出内容颜色
-6. [brake.py/iso.py/current.py]: 由于第 5 点的更改，同时修改了其他文件相关引用的部分
+6. [brake.py/iso.py/current.py] 由于第 5 点的更改，同时修改了其他文件相关引用的部分
-7. [aio.py]: 更改label/entry/optionmenu等控件的生成方式，使用循环实现，更加简洁和容易维护
+7. [aio.py] 更改label/entry/optionmenu等控件的生成方式，使用循环实现，更加简洁和容易维护
-8. [aio.py]: 修改customtkinter库中C:\Users\Administrator\AppData\Local\Programs\Python\Python312\Lib\site-packages\customtkinter\windows\widgets\ctk_tabview.py文件，参考https://github.com/TomSchimansky/CustomTkinter/issues/2296，实现修改tabview组件的字体大小
+8. [aio.py] 修改customtkinter库中C:\Users\Administrator\AppData\Local\Programs\Python\Python312\Lib\site-packages\customtkinter\windows\widgets\ctk_tabview.py文件，参考https://github.com/TomSchimansky/CustomTkinter/issues/2296，实现修改tabview组件的字体大小
-9. [aio.py]: 修改menu_main->menu_main_dp，menu_sub->menu_sub_dp，为后续其他tab功能按钮做扩展，是针对第三点做出的相应调整
+9. [aio.py] 修改menu_main->menu_main_dp，menu_sub->menu_sub_dp，为后续其他tab功能按钮做扩展，是针对第三点做出的相应调整
-10. [layout.xlsx]: 添加了各个功能的流程图
+10. [layout.xlsx] 添加了各个功能的流程图
+
+v0.1.5.1(2024/06/12)
+1. [current.py] 修改cycle功能中，数据清理范围为70000行，并将threshold从2调整为5
+2. [current.py] 修改位置超限提示，使更清楚了解问题原因
+3. [current.py] 修改find_point函数中错误提示，增加定位信息
+4. [README.md] 精简打包命令
+5. [requirements.txt] 新增必要库配置文件
+
+v0.1.5.2(2024/06/13)
+1. [brake.py/aio.py]: 将sto修改为estop
+2. [brake.py] 修改了速度计算逻辑，新版本的vel列数据遵循如下规则，av = vel * 180 / pi，根据av再计算speed
+3. [brake.py] 将threshold修改为常量50
+4. [brake.py] 提高了输出提示语的明确性，删除了不必要的省略号
+5. [brake.py] 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑
+
+v0.1.5.3(2024/06/14)
+1. [aio.py] 修改w_param为84，适配14寸电脑屏幕
+2. [brake.py] 将判定合规逻辑修改为角速度超过指定角速度的95%
+3. [README.md] 稍作修改，包括打包方式，功能特性等
+
+v0.1.6.0(2024/06/15)
+[aio.py] 新增wavelogger处理界面
+[wavelogger.py] 新增精度数据处理模块
+
+v0.1.6.1(2024/06/16)
+1. [wavelogger.py] bugfix single_file_proc函数中，修改_start起始点的计算逻辑
+2. [wavelogger.py] bugfix find_point函数中，当判断条件为临界值 2.0 的时候，针对forward和backward两种情况，对row_target做与判断逻辑相同的处理，目的是避免形成死循环
+
+v0.1.6.2(2024/06/16)
+1. [current.py] 修改了max/avg相关功能中对于返回值的处理逻辑，并在输出框以行的形式打印出来
 
-v0.1.6(2024/06/22)
-1. [aio.py]: 
-2. [openapi.py]: 
-3. [do_brake.py]: 

aio/assets/file_version_info.txt

@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0.
-    filevers=(0, 1, 5, 0),
+    filevers=(0, 1, 6, 2),
-    prodvers=(0, 1, 5, 0),
+    prodvers=(0, 1, 6, 2),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ VSVersionInfo(
         '040904b0',
         [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'),
         StringStruct('FileDescription', 'All in one automatic toolbox'),
-        StringStruct('FileVersion', '0.1.5 (2024-06-12)'),
+        StringStruct('FileVersion', '0.1.6.2 (2024-06-16)'),
         StringStruct('InternalName', 'AIO.exe'),
         StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'),
         StringStruct('OriginalFilename', 'AIO.exe'),
         StringStruct('ProductName', 'AIO'),
-        StringStruct('ProductVersion', '0.1.5 (2024-06-12)')])
+        StringStruct('ProductVersion', '0.1.6.2 (2024-06-16)')])
       ]),
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]

aio/assets/requirements.txt

@@ -0,0 +1,9 @@
+openpyxl==3.1.2
+pdfplumber==0.11.0
+customtkinter==5.2.2
+Jinja2==3.1.4
+lxml==5.2.2
+numpy==1.26.4
+pandas==2.2.2
+pillow==10.3.0
+pyinstaller==6.7.0

aio/assets/vers

@@ -0,0 +1 @@
+0.1.6.2 @ 06/16/2024

aio/code/aio.py

@@ -3,7 +3,7 @@ from os import getcwd
 from threading import Thread
 import tkinter.messagebox
 import customtkinter
-import brake, current, iso
+import brake, current, iso, wavelogger
 from time import time, strftime, localtime
 from urllib.request import urlopen
 from socket import setdefaulttimeout
@@ -31,7 +31,7 @@ widgits = {
     'vel': {'label': '', 'optionmenu': '', 'row': 3, 'col': 4, 'text': ''},
     'trq': {'label': '', 'optionmenu': '', 'row': 3, 'col': 6, 'text': ''},
     'trqh': {'label': '', 'optionmenu': '', 'row': 3, 'col': 8, 'text': ''},
-    'sto': {'label': '', 'optionmenu': '', 'row': 3, 'col': 10, 'text': ''},
+    'estop': {'label': '', 'optionmenu': '', 'row': 3, 'col': 10, 'text': ''},
     'rc1': {'label': '', 'entry': '', 'row': 4, 'col': 2, 'text': '额定电流'},
     'rc2': {'label': '', 'entry': '', 'row': 4, 'col': 4, 'text': '额定电流'},
     'rc3': {'label': '', 'entry': '', 'row': 4, 'col': 6, 'text': '额定电流'},
@@ -45,17 +45,17 @@ class App(customtkinter.CTk):
     def __init__(self):
         super().__init__()
         self.my_font = customtkinter.CTkFont(family="Consolas", size=16, weight="bold")
-        self.w_param = 90
+        self.w_param = 84
         # =====================================================================
         # configure window
         self.title("AIO - All in one automatic toolbox")
         # self.iconbitmap('./icon.ico')
-        self.geometry("1180x550+30+30")
+        self.geometry("1200x550+30+30")
         self.protocol("WM_DELETE_WINDOW", self.func_end_callback)
         self.config(bg='#E9E9E9')
         self.grid_rowconfigure(5, weight=1)
         self.grid_columnconfigure((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13), weight=1)
-        self.minsize(1180, 550)
+        self.minsize(1200, 550)
         # =====================================================================
         # create frame sidebar(left)
         self.frame_func = customtkinter.CTkFrame(self, width=120, corner_radius=0, fg_color='#E9E9E9')
@@ -72,7 +72,7 @@ class App(customtkinter.CTk):
         btns['log']['btn'].configure(command=lambda: self.thread_it(self.func_log_callback))
         btns['end']['btn'].configure(command=lambda: self.thread_it(self.func_end_callback))
         # create version info
-        self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.5\nDate: 06/12/2024", font=self.my_font, text_color="#4F4F4F")
+        self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.6.2\nDate: 06/16/2024", font=self.my_font, text_color="#4F4F4F")
         self.frame_func.rowconfigure(6, weight=1)
         self.label_version.grid(row=6, column=0, padx=20, pady=20, sticky='s')
         # =====================================================================
@@ -82,7 +82,7 @@ class App(customtkinter.CTk):
         self.tabview.add("Data Process")
         self.tabview.add("Automatic Test")
         # create main menu
-        self.menu_main_dp = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), values=["INIT", "brake", "current", "iso"], font=self.my_font, text_color='yellow', button_color='red', fg_color='green', command=self.func_main_callback)
+        self.menu_main_dp = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), values=["init", "brake", "current", "iso", "wavelogger"], font=self.my_font, text_color='yellow', button_color='red', fg_color='green', command=self.func_main_callback)
         self.menu_main_dp.grid(row=1, column=1, sticky='we', padx=5, pady=5)
         self.menu_main_dp.set("Start Here!")
         # create sub menu
@@ -102,7 +102,7 @@ class App(customtkinter.CTk):
                 widgits[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), width=self.w_param, placeholder_text=f"{widgits[widgit]['text']}", font=self.my_font)
                 widgits[widgit]['entry'].grid(row=widgits[widgit]['row'], column=widgits[widgit]['col']+1, padx=(5, 10), pady=5, sticky='w')
                 widgits[widgit]['entry'].configure(state='disabled')
-            elif widgit in ['axis', 'vel', 'trq', 'trqh', 'sto']:
+            elif widgit in ['axis', 'vel', 'trq', 'trqh', 'estop']:
                 widgits[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widgit.upper()}", font=self.my_font)
                 widgits[widgit]['label'].grid(row=widgits[widgit]['row'], column=widgits[widgit]['col'], sticky='e', pady=5)
                 widgits[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), button_color='#708090', fg_color='#778899', values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font)
@@ -136,7 +136,7 @@ class App(customtkinter.CTk):
             if widgit in ['path', 'av', 'rc', 'rpm', 'rr', 'dur', 'rc1', 'rc2', 'rc3', 'rc4', 'rc5', 'rc6']:
                 widgits[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black')
                 widgits[widgit]['entry'].configure(placeholder_text=widgits[widgit]['text'], state='disabled')
-            elif widgit in ['axis', 'vel', 'trq', 'trqh', 'sto']:
+            elif widgit in ['axis', 'vel', 'trq', 'trqh', 'estop']:
                 widgits[widgit]['label'].configure(text=f'{widgit.upper()}', text_color="black")
                 widgits[widgit]['optionmenu'].configure(state='disabled')
 
@@ -152,7 +152,7 @@ class App(customtkinter.CTk):
                 if widgit in ['path', 'av', 'rr']:
                     widgits[widgit]['label'].configure(text_color='red')
                     widgits[widgit]['entry'].configure(state='normal')
-                elif widgit in ['axis', 'vel', 'trq', 'sto']:
+                elif widgit in ['axis', 'vel', 'trq', 'estop']:
                     widgits[widgit]['label'].configure(text_color="red")
                     widgits[widgit]['optionmenu'].configure(state='normal')
         elif func_name == 'current':
@@ -169,7 +169,7 @@ class App(customtkinter.CTk):
                 elif widgit in ['trqh',]:
                     widgits[widgit]['label'].configure(text_color="red")
                     widgits[widgit]['optionmenu'].configure(state='normal')
-        elif func_name == 'iso':
+        elif func_name == 'iso' or func_name == 'wavelogger':
             for widgit in widgits:
                 if widgit in ['path',]:
                     widgits[widgit]['label'].configure(text_color='red')
@@ -245,14 +245,14 @@ class App(customtkinter.CTk):
             axis = widgits['axis']['optionmenu'].get()
             vel = widgits['vel']['optionmenu'].get()
             trq = widgits['trq']['optionmenu'].get()
-            sto = widgits['sto']['optionmenu'].get()
+            estop = widgits['estop']['optionmenu'].get()
 
             c1 = exists(path)
             c2 = self.is_float('required', av, rr)
-            c3 = True if len({vel, trq, sto}) == 3 else False
+            c3 = True if len({vel, trq, estop}) == 3 else False
 
             if c1 and c2 and c3:
-                return 1, path, float(av), float(rr), int(axis), int(vel), int(trq), int(sto)
+                return 1, path, float(av), float(rr), int(axis), int(vel), int(trq), int(estop)
             else:
                 return 0, 0
         # =======================================================
@@ -301,6 +301,15 @@ class App(customtkinter.CTk):
                 return 3, path
             else:
                 return 0, 0
+        # =======================================================
+        elif func_name == 'wavelogger':
+            path = widgits['path']['entry'].get().strip()
+            c1 = exists(path)
+            if c1:
+                return 4, path
+            else:
+                return 0, 0
+        # =======================================================
         else:
             return 0, 0
 
@@ -309,13 +318,15 @@ class App(customtkinter.CTk):
         self.textbox.delete(index1='1.0', index2='end')
 
         flag, *args = self.check_param()
-        func_dict = {1: brake.main, 2: current.main, 3: iso.main}
+        func_dict = {1: brake.main, 2: current.main, 3: iso.main, 4: wavelogger.main}
         if flag == 1:
-            func_dict[flag](path=args[0], av=args[1], rr=args[2],  axis=args[3], vel=args[4], trq=args[5], sto=args[6], w2t=self.write2textbox)
+            func_dict[flag](path=args[0], av=args[1], rr=args[2],  axis=args[3], vel=args[4], trq=args[5], estop=args[6], w2t=self.write2textbox)
         elif flag == 2:
             func_dict[flag](path=args[0], sub=args[1], rcs=args[2], vel=args[3], trq=args[4], trqh=args[5], dur=args[6], rpm=args[7], w2t=self.write2textbox)
         elif flag == 3:
             func_dict[flag](path=args[0], w2t=self.write2textbox)
+        elif flag == 4:
+            func_dict[flag](path=args[0], w2t=self.write2textbox)
         else:
             tkinter.messagebox.showerror(title="参数错误", message="请检查对应参数是否填写正确！", )
 

aio/code/brake.py

@@ -27,12 +27,12 @@ class GetThreadResult(Thread):
             return None
 
 
-def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto):
+def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, estop):
     # 功能：完成一个结果文件的数据处理
     # 参数：结果文件，数据目录，以及预读取的参数
     # 返回值：-
     file_name = result_file.split('\\')[-1]
-    w2t(f"打开文件 {file_name} 需要 1min 左右", 1, 0, 'orange')
+    w2t(f"正在打开文件 {file_name} 需要 1min 左右", 1, 0, 'orange')
 
     global stop
     stop = 0
@@ -55,21 +55,21 @@ def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto):
             # count = 1
             # for data_file in data_files:
             #     now_doing_msg(data_file, 'start', w2t)
-            #     single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, sto)
+            #     single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, estop)
             #     count += 1
             #     now_doing_msg(data_file, 'done', w2t)
             # ---------------------------------------------------
             # 数据文件并行处理模式---------------------------------
-            threads = [Thread(target=single_file_process, args=(data_files[0], wb_result, 1, av, rr, axis, vel, trq, w2t, sto)),
+            threads = [Thread(target=single_file_process, args=(data_files[0], wb_result, 1, av, rr, axis, vel, trq, w2t, estop)),
-                       Thread(target=single_file_process, args=(data_files[1], wb_result, 2, av, rr, axis, vel, trq, w2t, sto)),
+                       Thread(target=single_file_process, args=(data_files[1], wb_result, 2, av, rr, axis, vel, trq, w2t, estop)),
-                       Thread(target=single_file_process, args=(data_files[2], wb_result, 3, av, rr, axis, vel, trq, w2t, sto))]
+                       Thread(target=single_file_process, args=(data_files[2], wb_result, 3, av, rr, axis, vel, trq, w2t, estop))]
             [t.start() for t in threads]
             [t.join() for t in threads]
             # ---------------------------------------------------
             now_doing_msg(raw_data_dir, 'done', w2t)
 
     now_doing_msg(result_file, 'done', w2t)
-    w2t(f"保存文件 {file_name} 需要 1min 左右", 1, 0, 'orange')
+    w2t(f"正在保存文件 {file_name} 需要 1min 左右", 1, 0, 'orange')
     stop = 0
     t_excel = Thread(target=wb_result.save, args=(result_file, ))
     t_wait = Thread(target=w2t_local, args=('.', 1, w2t))
@@ -138,9 +138,9 @@ def now_doing_msg(docs, flag, w2t):
     elif flag == 'start' and file_type == 'file':
         w2t(f"[{now}] 正在处理文件 {docs} 中的数据......")
     elif flag == 'done' and file_type == 'dir':
-        w2t(f"[{now}] 目录 {docs} 数据文件已处理完毕......")
+        w2t(f"[{now}] 目录 {docs} 数据文件已处理完毕")
     elif flag == 'done' and file_type == 'file':
-        w2t(f"[{now}] 文件 {docs} 数据已处理完毕......")
+        w2t(f"[{now}] 文件 {docs} 数据已处理完毕")
 
 
 def w2t_local(msg, wait, w2t):
@@ -153,7 +153,7 @@ def w2t_local(msg, wait, w2t):
             break
 
 
-def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, sto):
+def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, estop):
     # 功能：完成单个数据文件的处理
     # 参数：如上
     # 返回值：-
@@ -163,11 +163,11 @@ def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t
     result_sheet_name = find_result_sheet_name(conditions, count)
     ws_result = wb_result[result_sheet_name]
 
-    row_start, row_end = find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, sto)
+    row_start, row_end = find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, estop)
-    copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto)
+    copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, estop)
 
 
-def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto):
+def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, estop):
     # 功能：将数据文件中有效数据拷贝至结果文件对应的 sheet
     # 参数：如上
     # 返回值：-
@@ -177,20 +177,20 @@ def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto):
     for _row in range(row_start, row_end + 1):
         data.append(df.iloc[_row, vel-1])
         data.append(df.iloc[_row, trq-1])
-        data.append(df.iloc[_row, trq-1])
+        data.append(df.iloc[_row, estop-1])
 
     i = 0
     row_max = 2000 if row_end-row_start < 2000 else row_end-row_start+20
     for _row in range(2, row_max):
         try:
-            ws_result.cell(row=_row, column=0).value = data[i]
+            ws_result.cell(row=_row, column=1).value = data[i]
-            ws_result.cell(row=_row, column=0).value = data[i+1]
+            ws_result.cell(row=_row, column=2).value = data[i+1]
-            ws_result.cell(row=_row, column=0).value = data[i+2]
+            ws_result.cell(row=_row, column=3).value = data[i+2]
             i += 3
         except:
-            ws_result.cell(row=_row, column=0).value = None
+            ws_result.cell(row=_row, column=1).value = None
-            ws_result.cell(row=_row, column=0).value = None
+            ws_result.cell(row=_row, column=2).value = None
-            ws_result.cell(row=_row, column=0).value = None
+            ws_result.cell(row=_row, column=3).value = None
 
 
 def find_result_sheet_name(conditions, count):
@@ -205,31 +205,35 @@ def find_result_sheet_name(conditions, count):
     return result_sheet_name
 
 
-def find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, sto):
+def find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, estop):
     # 功能：查找数据文件中有效数据的行号，也即最后一个速度下降的点位
     # 参数：如上
     # 返回值：速度下降点位，最后的数据点位
     ratio = float(conditions[2].removeprefix('speed'))/100
-    speed_max = av * rr * ratio * 60 / 360
+    av_max = av * ratio
     row_max = df.index[-1]
-    threshold = 30 if axis == 2 and conditions[0].removeprefix('load') == '100' else 10
+    # threshold = 30 if axis == 2 and conditions[0].removeprefix('load') == '100' else 10
+    threshold = 0.95
 
     for _row in range(row_max, -1, -1):
-        if df.iloc[_row, sto-1] != 0:
+        if df.iloc[_row, estop-1] != 0:
-            row_start = _row-100 if _row-100 > 0 else 0
+            row_start = _row-20 if _row-20 > 0 else 0
             break
     else:
-        w2t(f"数据文件 {data_file} 采集的数据中没有 STO 为非 0 的情况，需要确认......", 0, 9, 'red')
+        w2t(f"数据文件 {data_file} 采集的数据中没有 ESTOP 为非 0 的情况，需要确认", 0, 9, 'red')
 
     for _row in range(row_start, row_max):
-        if abs(df.iloc[_row, vel-1]) < 1:
+        speed_row = (df.iloc[_row, vel-1] * 180) / 3.1415926 * rr * 60 / 360
+        if abs(speed_row) < 1:
             row_end = _row+100 if _row+100 <= row_max else row_max
             break
     else:
         w2t(f"数据文件 {data_file} 最后的速度未降为零 ", 0, 10, 'red')
 
-    if abs(df.iloc[row_start+50]-speed_max) > threshold:
+    av_estop = abs((df.iloc[row_start-10:row_start+10, vel-1].abs().mean() * 180) / 3.1415926)
-        w2t(f"数据文件 {data_file} 未采集到指定百分比的最大速度，需要检查......")
+    if abs(av_estop/av_max) < threshold:
+        filename = data_file.split('\\')[-1]
+        w2t(f"[av_estop: {av_estop:.2f} | shouldbe: {av_max:.2f}] 数据文件 {filename} 触发 ESTOP 时未采集到指定百分比的最大速度，需要检查", 0, 0, '#8A2BE2')
 
     return row_start, row_end
 
@@ -253,7 +257,7 @@ def traversal_files(path, w2t):
         return dirs, files
 
 
-def main(path, av, rr, axis, vel, trq, sto, w2t):
+def main(path, av, rr, axis, vel, trq, estop, w2t):
     # 功能：执行处理所有数据文件
     # 参数：initialization函数的返回值
     # 返回值：-
@@ -273,7 +277,7 @@ def main(path, av, rr, axis, vel, trq, sto, w2t):
                 continue
             else:
                 now_doing_msg(result_file, 'start', w2t)
-                data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto)
+                data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, estop)
             # threads.append(Thread(target=data_process, args=(result_file, raw_data_dirs, AV, RR, RC, AXIS)))
         # [t.start() for t in threads]
         # [t.join() for t in threads]
@@ -291,4 +295,4 @@ def main(path, av, rr, axis, vel, trq, sto, w2t):
 
 if __name__ == "__main__":
     stop = 0
-    main(path=argv[1], av=argv[2], rr=argv[3], axis=argv[4], vel=argv[5], trq=argv[6], sto=argv[7], w2t=argv[8])
+    main(path=argv[1], av=argv[2], rr=argv[3], axis=argv[4], vel=argv[5], trq=argv[6], estop=argv[7], w2t=argv[8])

aio/code/current.py

@@ -81,7 +81,7 @@ def initialization(path, sub, w2t):
 
 
 def current_max(data_files, rcs, trqh, w2t):
-    current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0}
+    current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []}
     for data_file in data_files:
         if data_file.endswith('.data'):
             df = read_csv(data_file, sep='\t')
@@ -96,15 +96,23 @@ def current_max(data_files, rcs, trqh, w2t):
 
         scale = 1 if data_file.endswith('.csv') else 1000
         _ = abs(c_max/scale*rca)
-        current[axis] = _
+        current[axis].append(_)
         w2t(f"{data_file}: {_:.4f}")
 
-    w2t("【MAX】数据处理完毕......")
+    for axis, cur in current.items():
+        if not cur:
+            continue
+        else:
+            w2t(f"{axis}轴数据：", 1, 0, 'purple')
+            for value in cur:
+                w2t(f"{value:.4f} ", 1, 0, 'purple')
+            w2t('')
+    w2t("\n【MAX】数据处理完毕......")
     return current
 
 
 def current_avg(data_files, rcs, trqh, w2t):
-    current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0}
+    current = {1: [], 2: [], 3: [], 4: [], 5: [], 6: [], 7: []}
     for data_file in data_files:
         if data_file.endswith('.data'):
             df = read_csv(data_file, sep='\t')
@@ -120,10 +128,18 @@ def current_avg(data_files, rcs, trqh, w2t):
 
         scale = 1 if data_file.endswith('.csv') else 1000
         _ = (abs(c_avg)+c_std)/scale*rca
-        current[axis] = _
+        current[axis].append(_)
         w2t(f"{data_file}: {_:.4f}")
 
-    w2t("【AVG】数据处理完毕......")
+    for axis, cur in current.items():
+        if not cur:
+            continue
+        else:
+            w2t(f"{axis}轴数据：", 1, 0, 'purple')
+            for value in cur:
+                w2t(f"{value:.4f} ", 1, 0, 'purple')
+            w2t('')
+    w2t("\n【AVG】数据处理完毕......")
     return current
 
 
@@ -181,7 +197,7 @@ def current_cycle(dur, data_files, rcs, vel, trq, trqh, rpm, w2t):
     w2t("全部处理完毕")
 
 
-def find_point(flag, df, _row_s, _row_e, w2t, exitcode, threshold, step, end_point):
+def find_point(data_file, pos, flag, df, _row_s, _row_e, w2t, exitcode, threshold, step, end_point):
     if flag == 'lt':
         while _row_e > end_point:
             speed_avg = df.iloc[_row_s:_row_e, 0].abs().mean()
@@ -192,7 +208,7 @@ def find_point(flag, df, _row_s, _row_e, w2t, exitcode, threshold, step, end_poi
             else:
                 return _row_s, _row_e
         else:
-            w2t(f"数据有误，需要检查，无法找到第{exitcode}个有效点...", 0, exitcode, 'red')
+            w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到第{exitcode}个有效点...", 0, exitcode, 'red')
     elif flag == 'gt':
         while _row_e > end_point:
             speed_avg = df.iloc[_row_s:_row_e, 0].abs().mean()
@@ -203,7 +219,7 @@ def find_point(flag, df, _row_s, _row_e, w2t, exitcode, threshold, step, end_poi
             else:
                 return _row_s, _row_e
         else:
-            w2t(f"数据有误，需要检查，无法找到有效起始点或结束点...", 0, exitcode, 'red')
+            w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到有效起始点或结束点...", 0, exitcode, 'red')
 
 
 def p_single(wb, single, vel, trq, rpm, w2t):
@@ -245,28 +261,28 @@ def p_single(wb, single, vel, trq, rpm, w2t):
         speed_avg = df.iloc[_row_s:_row_e, 0].abs().mean()
         if speed_avg < 2:
             # 过滤尾部为零无效数据
-            _row_s, _row_e = find_point('lt', df, _row_s, _row_e, w2t, 1, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'a1', 'lt', df, _row_s, _row_e, w2t, 1, threshold=5, step=_step, end_point=_end_point)
             # 找到第一个起始点 row_end，继续找到有数据的部分，后面有一段有效数据区
             row_end = _row_e - _adjust
             _row_e -= _end_point
             _row_s -= _end_point
-            _row_s, _row_e = find_point('gt', df, _row_s, _row_e, w2t, 3, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'a2', 'gt', df, _row_s, _row_e, w2t, 3, threshold=5, step=_step, end_point=_end_point)
             # 速度已经快要降为零了，继续寻找下一个速度上升点
             _row_e -= _end_point
             _row_s -= _end_point
-            _row_s, _row_e = find_point('lt', df, _row_s, _row_e, w2t, 3, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'a3', 'lt', df, _row_s, _row_e, w2t, 3, threshold=5, step=_step, end_point=_end_point)
         elif speed_avg > 2:
             # 过滤尾部非零无效数据
-            _row_s, _row_e = find_point('gt', df, _row_s, _row_e, w2t, 2, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'b1', 'gt', df, _row_s, _row_e, w2t, 2, threshold=5, step=_step, end_point=_end_point)
             # 找到第一个起始点 row_end，继续找到有数据的部分，后面有一段零数据区
             row_end = _row_e - _adjust
             _row_e -= _end_point
             _row_s -= _end_point
-            _row_s, _row_e = find_point('lt', df, _row_s, _row_e, w2t, 4, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'b2', 'lt', df, _row_s, _row_e, w2t, 4, threshold=5, step=_step, end_point=_end_point)
             # 目前已经有一点的速度值了，继续往前搜寻下一个速度为零的点
             _row_e -= _end_point
             _row_s -= _end_point
-            _row_s, _row_e = find_point('gt', df, _row_s, _row_e, w2t, 4, threshold=2, step=_step, end_point=_end_point)
+            _row_s, _row_e = find_point(data_file, 'b3', 'gt', df, _row_s, _row_e, w2t, 4, threshold=5, step=_step, end_point=_end_point)
 
         row_start = _row_s + _adjust
         data = []
@@ -275,7 +291,7 @@ def p_single(wb, single, vel, trq, rpm, w2t):
             data.append(df.iloc[row, 1])
 
         i = 0
-        for row in ws.iter_rows(min_row=2, min_col=2, max_row=15000, max_col=3):
+        for row in ws.iter_rows(min_row=2, min_col=2, max_row=70000, max_col=3):
             for cell in row:
                 try:
                     _ = f"{data[i]:.2f}"
@@ -317,7 +333,7 @@ def p_scenario(wb, single, vel, trq, rpm, dur, w2t):
         row_start = 300
         row_end = row_start + int(dur/cycle)
         if row_end > df.index[-1]:
-            w2t(f"位置超限：{data_file} 共有 {df.index[-1]} 条数据，无法取到第 {row_end} 条数据...", 0, 9, 'red')
+            w2t(f"位置超限：{data_file} 共有 {df.index[-1]} 条数据，无法取到第 {row_end} 条数据，需要确认场景周期时间...", 0, 9, 'red')
 
         data = []
         for row in range(row_start, row_end):
@@ -325,7 +341,7 @@ def p_scenario(wb, single, vel, trq, rpm, dur, w2t):
             data.append(df.iloc[row, 1])
 
         i = 0
-        for row in ws.iter_rows(min_row=2, min_col=2, max_row=15000, max_col=3):
+        for row in ws.iter_rows(min_row=2, min_col=2, max_row=70000, max_col=3):
             for cell in row:
                 try:
                     _ = f"{data[i]:.2f}"

aio/code/wavelogger.py

@@ -0,0 +1,186 @@
+import os
+import random
+
+from pandas import read_csv
+from csv import reader
+from sys import argv
+from os.path import exists
+from os import scandir, remove
+from openpyxl import Workbook
+from random import randint
+
+def traversal_files(path, w2t):
+    # 功能：以列表的形式分别返回指定路径下的文件和文件夹，不包含子目录
+    # 参数：路径
+    # 返回值：路径下的文件夹列表 路径下的文件列表
+    if not exists(path):
+        msg = f'数据文件夹{path}不存在，请确认后重试......'
+        w2t(msg, 0, 1, 'red')
+    else:
+        dirs = []
+        files = []
+        for item in scandir(path):
+            if item.is_dir():
+                dirs.append(item.path)
+            elif item.is_file():
+                files.append(item.path)
+
+        return dirs, files
+
+
+def find_point(bof, step, pos, data_file, flag, df, row, w2t):
+    # bof: backward or forward
+    # pos: used for debug
+    # flag: greater than or lower than
+    if flag == 'gt':
+        while 0 < row < df.index[-1]-100:
+            _value = df.iloc[row, 2]
+            if _value > 2:
+                if bof == 'backward':
+                    row -= step
+                elif bof == 'forward':
+                    row += step
+                continue
+            else:
+                if bof == 'backward':
+                    row_target = row - step
+                elif bof == 'forward':
+                    row_target = row + step
+                break
+        else:
+            if bof == 'backward':
+                w2t(f"[{pos}] 在 {data_file} 中，无法正确识别数据，需要确认...", 0, 2, 'red')
+            elif bof == 'forward':
+                row_target = row + 100
+    elif flag == 'lt':
+        while 0 < row < df.index[-1]-100:
+            _value = df.iloc[row, 2]
+            if _value < 2:
+                if bof == 'backward':
+                    row -= step
+                elif bof == 'forward':
+                    row += step
+                continue
+            else:
+                if bof == 'backward':
+                    row_target = row - step
+                elif bof == 'forward':
+                    row_target = row + step
+                break
+        else:
+            if bof == 'backward':
+                w2t(f"[{pos}] 在 {data_file} 中，无法正确识别数据，需要确认...", 0, 3, 'red')
+            elif bof == 'forward':
+                row_target = row + 100
+
+    return row_target
+
+
+def get_cycle_info(data_file, df, row, step, w2t):
+    # end -> middle: low
+    # middle -> start: high
+    # 1. 从最后读取数据，无论是大于1还是小于1，都舍弃，找到相反的值的起始点
+    # 2. 从起始点，继续往前寻找，找到与之数值相反的中间点
+    # 3. 从中间点，继续往前寻找，找到与之数值相反的结束点，至此，得到了高低数值的时间区间以及一轮的周期时间
+    if df.iloc[row, 2] < 2:
+        row = find_point('backward', step, 'a1', data_file, 'lt', df, row, w2t)
+
+    _row = find_point('backward', step, 'a2', data_file, 'gt', df, row, w2t)
+    _row = find_point('backward', step, 'a3', data_file, 'lt', df, _row, w2t)
+    row_end = find_point('backward', step, 'a4', data_file, 'gt', df, _row, w2t)
+    row_middle = find_point('backward', step, 'a5', data_file, 'lt', df, row_end, w2t)
+    row_start = find_point('backward', step, 'a6', data_file, 'gt', df, row_middle, w2t)
+
+    return row_end-row_middle, row_middle-row_start, row_end-row_start
+
+
+def initialization(path, w2t):
+    _, data_files = traversal_files(path, w2t)
+
+    for data_file in data_files:
+        if not data_file.lower().endswith('.csv'):
+            w2t(f"{data_file} 文件后缀错误，只允许 .csv 文件，需要确认！", 0, 1, 'red')
+
+    return data_files
+
+
+def preparation(data_file, wb, w2t):
+    shtname = data_file.split('\\')[-1].split('.')[0]
+    ws = wb.create_sheet(shtname)
+    csv_reader = reader(open(data_file))
+    i = 0
+    begin = 70
+    for row in csv_reader:
+        i += 1
+        if i == 1:
+            begin = int(row[1])
+            break
+    df = read_csv(data_file, sep=',', encoding='gbk', skip_blank_lines=False, header=begin - 1, on_bad_lines='warn')
+    low, high, cycle = get_cycle_info(data_file, df, df.index[-1]-110, 5, w2t)
+
+    return ws, df, low, high, cycle
+
+
+def single_file_proc(ws, data_file, df, low, high, cycle, w2t):
+    _row = _row_lt = _row_gt = count = 1
+    _step = 5
+    _data = {}
+    row_max = df.index[-1]-100
+    print(data_file)
+    while _row < row_max:
+        if count not in _data.keys():
+            _data[count] = []
+
+        _value = df.iloc[_row, 2]
+        if _value < 2:
+            _row_lt = find_point('forward', _step, 'c'+str(_row), data_file, 'lt', df, _row, w2t)
+            _start = int(_row_gt + (_row_lt - _row_gt - 50) / 2)
+            _end = _start + 50
+            value = df.iloc[_start:_end, 2].mean() + df.iloc[_start:_end, 2].std()
+            _data[count].append(value)
+        else:
+            _row_gt = find_point('forward', _step, 'c'+str(_row), data_file, 'gt', df, _row, w2t)
+            if _row_gt - _row_lt > cycle * 2:
+                count += 1
+
+        _row = max(_row_gt, _row_lt)
+
+    for i in range(2, 10):
+        ws.cell(row=1, column=i).value = f"第{i-1}次测试"
+        ws.cell(row=i, column=1).value = f"第{i-1}次精度变化"
+
+    print(_data)
+    for i in sorted(_data.keys()):
+        _row = 2
+        _column = i + 1
+        for value in _data[i]:
+            ws.cell(row=_row, column=_column).value = float(value)
+            _row += 1
+
+
+def execution(data_files, w2t):
+    wb = Workbook()
+    for data_file in data_files:
+        ws, df, low, high, cycle = preparation(data_file, wb, w2t)
+        print(f"low = {low}")
+        print(f"high = {high}")
+        print(f"cycle = {cycle}")
+        single_file_proc(ws, data_file, df, low, high, cycle, w2t)
+
+    wd = data_files[0].split('\\')
+    del wd[-1]
+    wd = '\\'.join(wd)
+    filename = wd + '\\result.xlsx'
+    wb.save(filename)
+    wb.close()
+    w2t('----------------------------------------')
+    w2t('所有文件均已处理完毕')
+
+
+def main(path, w2t):
+    data_files = initialization(path, w2t)
+    execution(data_files, w2t)
+
+
+if __name__ == '__main__':
+    main(path=argv[1], w2t=argv[2])

aio/vers

@@ -1 +0,0 @@
-0.1.5 @ 06/12/2024