v0.1.5.3(2024/06/14)

[aio.py]: 修改w_param为84，适配14寸电脑屏幕
[brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95%
[README.md]: 稍作修改，包括打包方式，功能特性等

.gitignore

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

aio/README.md

@@ -1,7 +1,7 @@
 ### 程序功能
 
 自动化测试数据处理工具，减少人工处理时长，提高测试数据处理的效率和准确度：
-1. 制动数据，单轴数据处理5min以内
+1. 制动数据，单轴数据处理3min以内
 2. 电机电流数据，全部轴数据处理1min以内
 3. ISO激光数据整理，1min以内
 
@@ -11,25 +11,15 @@
 
 ### 第三方库
 
-```commandline
-pip3 install pandas -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn
-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
+```text
+参考requirements.txt
 ```
 
 ### 打包方法
 
-```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 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
+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
 ```
 
 ---
@@ -102,6 +92,13 @@ pyinstaller --noconfirm --onedir --windowed --add-data "C:/Users/Administrator/A
 	c. ISO-V100.pdf
 	d. iso-results.xlsx
 	
+#### 其他
+customtkinter的tabview组件不支持修改字体大小，可以参考 [Changing Font of a Tabview](https://github.com/TomSchimansky/CustomTkinter/issues/2296) 进行手动修改源码实现：
+	a. 运行 `pip show customtkinter`，获取到库的路径
+	b. 修改.../windows/widgets/ctk_tabview.py
+	c. 增加 from .font.ctk_font import CTkFont
+	d. 在大概 78 行的位置，增加 font=CTkFont(family="Consolas", size=18, weight='bold')
+
 ---
 
 RELEASE CHANGES
@@ -193,3 +190,22 @@ v0.1.5(2024/06/12)
 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功能按钮做扩展，是针对第三点做出的相应调整
 10. [layout.xlsx]: 添加了各个功能的流程图
+
+v0.1.5.1(2024/06/12)
+[current.py]:  修改cycle功能中，数据清理范围为70000行，并将threshold从2调整为5
+[current.py]:  修改位置超限提示，使更清楚了解问题原因
+[current.py]:  修改find_point函数中错误提示，增加定位信息
+[README.md]: 精简打包命令
+[requirements.txt]: 新增必要库配置文件
+
+v0.1.5.2(2024/06/13)
+[brake.py/aio.py]: 将sto修改为estop
+[brake.py]: 修改了速度计算逻辑，新版本的vel列数据遵循如下规则，av = vel * 180 / pi，根据av再计算speed
+[brake.py]: 将threshold修改为常量50
+[brake.py]: 提高了输出提示语的明确性，删除了不必要的省略号
+[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑
+
+v0.1.5.3(2024/06/14)
+[aio.py]: 修改w_param为84，适配14寸电脑屏幕
+[brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95%
+[README.md]: 稍作修改，包括打包方式，功能特性等

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),
-    prodvers=(0, 1, 5, 0),
+    filevers=(0, 1, 5, 3),
+    prodvers=(0, 1, 5, 3),
     # 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.5.3 (2024-06-14)'),
         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.5.3 (2024-06-14)')])
       ]),
     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.5.3 @ 06/14/2024

aio/code/aio.py

@@ -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.5.3\nDate: 06/14/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')
         # =====================================================================
@@ -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':
@@ -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
         # =======================================================
@@ -311,7 +311,7 @@ class App(customtkinter.CTk):
         flag, *args = self.check_param()
         func_dict = {1: brake.main, 2: current.main, 3: iso.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:

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)),
-                       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[2], wb_result, 3, 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, estop)),
+                       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)
-    copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, 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, 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=0).value = data[i+1]
-            ws_result.cell(row=_row, column=0).value = data[i+2]
+            ws_result.cell(row=_row, column=1).value = data[i]
+            ws_result.cell(row=_row, column=2).value = data[i+1]
+            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=0).value = None
-            ws_result.cell(row=_row, column=0).value = None
+            ws_result.cell(row=_row, column=1).value = None
+            ws_result.cell(row=_row, column=2).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:
-            row_start = _row-100 if _row-100 > 0 else 0
+        if df.iloc[_row, estop-1] != 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:
-        w2t(f"数据文件 {data_file} 未采集到指定百分比的最大速度，需要检查......")
+    av_estop = abs((df.iloc[row_start-10:row_start+10, vel-1].abs().mean() * 180) / 3.1415926)
+    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

@@ -181,7 +181,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 +192,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 +203,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 +245,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 +275,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 +317,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 +325,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/vers

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