From 15e6f1b6c0dd81ddfdc37f6dc360ceaa60488909 Mon Sep 17 00:00:00 2001 From: gitea Date: Fri, 14 Jun 2024 07:29:28 +0800 Subject: [PATCH 1/5] re-arrange file-organization --- .gitignore | 4 +--- aio/{ => assets}/file_version_info.txt | 0 aio/{ => assets}/icon.ico | Bin aio/{ => assets}/layout.xlsx | Bin aio/{ => assets}/requirements.txt | 0 aio/{ => assets}/vers | 0 aio/{ => assets}/workflow/brake.excalidraw | 0 aio/{ => assets}/workflow/current.excalidraw | 0 aio/{ => code}/aio.py | 0 aio/{ => code}/brake.py | 0 aio/{ => code}/current.py | 0 aio/{ => code}/iso.py | 0 12 files changed, 1 insertion(+), 3 deletions(-) rename aio/{ => assets}/file_version_info.txt (100%) rename aio/{ => assets}/icon.ico (100%) rename aio/{ => assets}/layout.xlsx (100%) rename aio/{ => assets}/requirements.txt (100%) rename aio/{ => assets}/vers (100%) rename aio/{ => assets}/workflow/brake.excalidraw (100%) rename aio/{ => assets}/workflow/current.excalidraw (100%) rename aio/{ => code}/aio.py (100%) rename aio/{ => code}/brake.py (100%) rename aio/{ => code}/current.py (100%) rename aio/{ => code}/iso.py (100%) diff --git a/.gitignore b/.gitignore index 66c8375..b5c0e34 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,5 @@ test.py .idea/ aio/.idea/ aio/__pycache__/ -aio/dist/ -aio/build/ -aio/aio.spec +aio/package/ aio/venv diff --git a/aio/file_version_info.txt b/aio/assets/file_version_info.txt similarity index 100% rename from aio/file_version_info.txt rename to aio/assets/file_version_info.txt diff --git a/aio/icon.ico b/aio/assets/icon.ico similarity index 100% rename from aio/icon.ico rename to aio/assets/icon.ico diff --git a/aio/layout.xlsx b/aio/assets/layout.xlsx similarity index 100% rename from aio/layout.xlsx rename to aio/assets/layout.xlsx diff --git a/aio/requirements.txt b/aio/assets/requirements.txt similarity index 100% rename from aio/requirements.txt rename to aio/assets/requirements.txt diff --git a/aio/vers b/aio/assets/vers similarity index 100% rename from aio/vers rename to aio/assets/vers diff --git a/aio/workflow/brake.excalidraw b/aio/assets/workflow/brake.excalidraw similarity index 100% rename from aio/workflow/brake.excalidraw rename to aio/assets/workflow/brake.excalidraw diff --git a/aio/workflow/current.excalidraw b/aio/assets/workflow/current.excalidraw similarity index 100% rename from aio/workflow/current.excalidraw rename to aio/assets/workflow/current.excalidraw diff --git a/aio/aio.py b/aio/code/aio.py similarity index 100% rename from aio/aio.py rename to aio/code/aio.py diff --git a/aio/brake.py b/aio/code/brake.py similarity index 100% rename from aio/brake.py rename to aio/code/brake.py diff --git a/aio/current.py b/aio/code/current.py similarity index 100% rename from aio/current.py rename to aio/code/current.py diff --git a/aio/iso.py b/aio/code/iso.py similarity index 100% rename from aio/iso.py rename to aio/code/iso.py From e014775972dc61b0a1a59b3758ce1afe2d91b9fd Mon Sep 17 00:00:00 2001 From: gitea Date: Fri, 14 Jun 2024 12:37:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?v0.1.5.3(2024/06/14)=20[aio.py]:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9w=5Fparam=E4=B8=BA84=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E9=85=8D14=E5=AF=B8=E7=94=B5=E8=84=91=E5=B1=8F=E5=B9=95=20[bra?= =?UTF-8?q?ke.py]:=20=E5=B0=86=E5=88=A4=E5=AE=9A=E5=90=88=E8=A7=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=A7=92=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E8=B6=85=E8=BF=87=E6=8C=87=E5=AE=9A=E8=A7=92=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E7=9A=8495%=20[README.md]:=20=E7=A8=8D=E4=BD=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8C=85=E6=8B=AC=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=8A=9F=E8=83=BD=E7=89=B9=E6=80=A7?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- aio/README.md | 21 ++++++++++----------- aio/assets/file_version_info.txt | 8 ++++---- aio/assets/vers | 2 +- aio/code/aio.py | 4 ++-- aio/code/brake.py | 10 +++++----- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index b5c0e34..ed3a239 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ test.py .idea/ aio/.idea/ -aio/__pycache__/ +aio/code/__pycache__/ aio/package/ aio/venv diff --git a/aio/README.md b/aio/README.md index 5d1d216..63caa04 100644 --- a/aio/README.md +++ b/aio/README.md @@ -1,7 +1,7 @@ ### 程序功能 自动化测试数据处理工具，减少人工处理时长，提高测试数据处理的效率和准确度： -1. 制动数据，单轴数据处理5min以内 +1. 制动数据，单轴数据处理3min以内 2. 电机电流数据，全部轴数据处理1min以内 3. ISO激光数据整理，1min以内 @@ -11,21 +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 ``` ### 打包方法 ``` pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.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 ``` --- @@ -209,4 +203,9 @@ v0.1.5.2(2024/06/13) [brake.py]: 修改了速度计算逻辑，新版本的vel列数据遵循如下规则，av = vel * 180 / pi，根据av再计算speed [brake.py]: 将threshold修改为常量50 [brake.py]: 提高了输出提示语的明确性，删除了不必要的省略号 -[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑 \ No newline at end of file +[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑 + +v0.1.5.3(2024/06/14) +[aio.py]: 修改w_param为84，适配14寸电脑屏幕 +[brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95% +[README.md]: 稍作修改，包括打包方式，功能特性等 \ No newline at end of file diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index bb0a29d..5dd49be 100644 --- a/aio/assets/file_version_info.txt +++ b/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, 2), - prodvers=(0, 1, 5, 2), + 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.2 (2024-06-13)'), + 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.2 (2024-06-13)')]) + StringStruct('ProductVersion', '0.1.5.3 (2024-06-14)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index bb7d006..4d67183 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.5.2 @ 06/13/2024 +0.1.5.3 @ 06/14/2024 diff --git a/aio/code/aio.py b/aio/code/aio.py index d613ae5..1ffd0ae 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -45,7 +45,7 @@ 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") @@ -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.2\nDate: 06/13/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') # ===================================================================== diff --git a/aio/code/brake.py b/aio/code/brake.py index 8a905dc..664944d 100644 --- a/aio/code/brake.py +++ b/aio/code/brake.py @@ -210,10 +210,10 @@ 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 = 50 + threshold = 0.95 for _row in range(row_max, -1, -1): if df.iloc[_row, estop-1] != 0: @@ -230,10 +230,10 @@ def find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, estop): else: w2t(f"数据文件 {data_file} 最后的速度未降为零 ", 0, 10, 'red') - speed_estop = abs((df.iloc[row_start-10:row_start+10, vel-1].abs().mean() * 180) / 3.1415926 * rr * 60 / 360) - if abs(speed_estop-speed_max) > threshold: + 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"[speed_estop: {speed_estop:.2f} | shouldbe: {speed_max:.2f}] 数据文件 {filename} 触发 ESTOP 时未采集到指定百分比的最大速度，需要检查", 0, 0, '#8A2BE2') + w2t(f"[av_estop: {av_estop:.2f} | shouldbe: {av_max:.2f}] 数据文件 {filename} 触发 ESTOP 时未采集到指定百分比的最大速度，需要检查", 0, 0, '#8A2BE2') return row_start, row_end From fc30fcde80509d81c094caffe1a783de6d6cc436 Mon Sep 17 00:00:00 2001 From: gitea Date: Sat, 15 Jun 2024 19:14:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?v0.1.5.4(2024/06/15)=20[aio.py]:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9Ewavelogger=E5=A4=84=E7=90=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20[wavelogger.py]:=20=E6=96=B0=E5=A2=9E=E7=B2=BE?= =?UTF-8?q?=E5=BA=A6=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 16 ++- aio/assets/file_version_info.txt | 8 +- aio/assets/vers | 2 +- aio/code/aio.py | 21 +++- aio/code/wavelogger.py | 171 +++++++++++++++++++++++++++++++ 5 files changed, 206 insertions(+), 12 deletions(-) create mode 100644 aio/code/wavelogger.py diff --git a/aio/README.md b/aio/README.md index 5d1d216..9537751 100644 --- a/aio/README.md +++ b/aio/README.md @@ -1,9 +1,10 @@ ### 程序功能 自动化测试数据处理工具，减少人工处理时长，提高测试数据处理的效率和准确度： -1. 制动数据，单轴数据处理5min以内 +1. 制动数据，单轴数据处理3min以内 2. 电机电流数据，全部轴数据处理1min以内 3. ISO激光数据整理，1min以内 +4. wavelogger波形处理，几乎不花费时间 ### 使用方法 @@ -97,6 +98,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) 进行手动修改源码实现： @@ -209,4 +217,8 @@ v0.1.5.2(2024/06/13) [brake.py]: 修改了速度计算逻辑，新版本的vel列数据遵循如下规则，av = vel * 180 / pi，根据av再计算speed [brake.py]: 将threshold修改为常量50 [brake.py]: 提高了输出提示语的明确性，删除了不必要的省略号 -[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑 \ No newline at end of file +[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑 + +v0.1.5.4(2024/06/15) +[aio.py]: 新增wavelogger处理界面 +[wavelogger.py]: 新增精度数据处理模块 \ No newline at end of file diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index bb0a29d..38c25de 100644 --- a/aio/assets/file_version_info.txt +++ b/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, 2), - prodvers=(0, 1, 5, 2), + filevers=(0, 1, 5, 4), + prodvers=(0, 1, 5, 4), # 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.2 (2024-06-13)'), + StringStruct('FileVersion', '0.1.5.4 (2024-06-15)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.5.2 (2024-06-13)')]) + StringStruct('ProductVersion', '0.1.5.4 (2024-06-15)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index bb7d006..ea2d73e 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.5.2 @ 06/13/2024 +0.1.5.4 @ 06/15/2024 diff --git a/aio/code/aio.py b/aio/code/aio.py index d613ae5..3f6c2a6 100644 --- a/aio/code/aio.py +++ b/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 @@ -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.2\nDate: 06/13/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.5.4\nDate: 06/15/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 @@ -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') @@ -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], 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="请检查对应参数是否填写正确！", ) diff --git a/aio/code/wavelogger.py b/aio/code/wavelogger.py new file mode 100644 index 0000000..80e6f5d --- /dev/null +++ b/aio/code/wavelogger.py @@ -0,0 +1,171 @@ +import os + +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 + + +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: + if df.iloc[row, 2] > 2: + if bof == 'backward': + row -= step + elif bof == 'forward': + row += step + continue + else: + row_target = row + 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: + if df.iloc[row, 2] < 2: + if bof == 'backward': + row -= step + elif bof == 'forward': + row += step + continue + else: + row_target = row + 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 + while _row < row_max: + if count not in _data.keys(): + _data[count] = [] + + if df.iloc[_row, 2] < 2: + _row_lt = find_point('forward', _step, 'c'+str(_row), data_file, 'lt', df, _row, w2t) + _start = int((_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}次精度变化" + + 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) + 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]) From 224af36bfeec2e8db23f92e4bd4326196c2b8326 Mon Sep 17 00:00:00 2001 From: gitea Date: Sat, 15 Jun 2024 19:27:31 +0800 Subject: [PATCH 4/5] change to new version because of new function added --- aio/README.md | 4 ++-- aio/assets/file_version_info.txt | 8 ++++---- aio/assets/vers | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aio/README.md b/aio/README.md index 49ddfbf..2308aee 100644 --- a/aio/README.md +++ b/aio/README.md @@ -20,7 +20,7 @@ ``` pyinstaller.exe -F --version-file file_version_info.txt -i .\icon.ico .\aio.py -p .\brake.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 +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 ``` --- @@ -218,6 +218,6 @@ v0.1.5.3(2024/06/14) [brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95% [README.md]: 稍作修改，包括打包方式，功能特性等 -v0.1.5.4(2024/06/15) +v0.1.6.0(2024/06/15) [aio.py]: 新增wavelogger处理界面 [wavelogger.py]: 新增精度数据处理模块 \ No newline at end of file diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 38c25de..8b2ae3e 100644 --- a/aio/assets/file_version_info.txt +++ b/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, 4), - prodvers=(0, 1, 5, 4), + filevers=(0, 1, 6, 0), + prodvers=(0, 1, 6, 0), # 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.4 (2024-06-15)'), + StringStruct('FileVersion', '0.1.6 (2024-06-15)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.5.4 (2024-06-15)')]) + StringStruct('ProductVersion', '0.1.6 (2024-06-15)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index 58d2b6f..f076c19 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.5.4 @ 06/15/2024 \ No newline at end of file +0.1.6.0 @ 06/15/2024 \ No newline at end of file From 5ba3c763866632e8d4217d85229ca1dc1a187661 Mon Sep 17 00:00:00 2001 From: gitea Date: Sat, 15 Jun 2024 19:32:57 +0800 Subject: [PATCH 5/5] modify vers info --- aio/code/aio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aio/code/aio.py b/aio/code/aio.py index 1cd19ac..183e5bf 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -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.4\nDate: 06/15/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.6.0\nDate: 06/15/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') # =====================================================================