From 215e3124804dec199688efcf1c8b914d7ac425c1 Mon Sep 17 00:00:00 2001 From: gitea Date: Sun, 16 Jun 2024 14:07:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?iv0.1.6.1(2024/06/16)=201.=20[wavelogger.py?= =?UTF-8?q?]:=20bugfix=20single=5Ffile=5Fproc=E5=87=BD=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=5Fstart=E8=B5=B7=E5=A7=8B=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=202.=20[wavelogge?= =?UTF-8?q?r.py]:=20bugfix=20find=5Fpoint=E5=87=BD=E6=95=B0=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E4=B8=B4=E7=95=8C=E5=80=BC=202.0=20=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E9=92=88=E5=AF=B9forward=E5=92=8Cbackward=E4=B8=A4?= =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E5=AF=B9row=5Ftarget?= =?UTF-8?q?=E5=81=9A=E4=B8=8E=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=A4=84=E7=90=86=EF=BC=8C=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E9=81=BF=E5=85=8D=E5=BD=A2=E6=88=90=E6=AD=BB=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 36 +++++++++++++++++++------------- aio/assets/file_version_info.txt | 8 +++---- aio/assets/vers | 2 +- aio/code/aio.py | 2 +- aio/code/wavelogger.py | 29 ++++++++++++++++++------- 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/aio/README.md b/aio/README.md index 2308aee..cc7ecb8 100644 --- a/aio/README.md +++ b/aio/README.md @@ -200,24 +200,30 @@ v0.1.5(2024/06/12) 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]: 新增必要库配置文件 +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) -[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处是否达到指定百分比的判定逻辑 +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) -[aio.py]: 修改w_param为84，适配14寸电脑屏幕 -[brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95% -[README.md]: 稍作修改，包括打包方式，功能特性等 +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]: 新增精度数据处理模块 \ No newline at end of file +1. [aio.py]: 新增wavelogger处理界面 +2. [wavelogger.py]: 新增精度数据处理模块 + +v0.1.6.1(2024/06/17) +1. [wavelogger.py]: bugfix single_file_proc函数中，修改_start起始点的计算逻辑 +2. [wavelogger.py]: bugfix find_point函数中，当判断条件为临界值 2.0 的时候，针对forward和backward两种情况，对row_target做与判断逻辑相同的处理，目的是避免形成死循环 + + diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 8b2ae3e..1beffe4 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, 6, 0), - prodvers=(0, 1, 6, 0), + filevers=(0, 1, 6, 1), + prodvers=(0, 1, 6, 1), # 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.6 (2024-06-15)'), + StringStruct('FileVersion', '0.1.6.1 (2024-06-17)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.6 (2024-06-15)')]) + StringStruct('ProductVersion', '0.1.6.1 (2024-06-17)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index f076c19..e072eb3 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.6.0 @ 06/15/2024 \ No newline at end of file +0.1.6.1 @ 06/17/2024 \ No newline at end of file diff --git a/aio/code/aio.py b/aio/code/aio.py index 183e5bf..8743cec 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.6.0\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.1\nDate: 06/17/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/wavelogger.py b/aio/code/wavelogger.py index 80e6f5d..4297e85 100644 --- a/aio/code/wavelogger.py +++ b/aio/code/wavelogger.py @@ -1,4 +1,5 @@ import os +import random from pandas import read_csv from csv import reader @@ -6,7 +7,7 @@ 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): # 功能：以列表的形式分别返回指定路径下的文件和文件夹，不包含子目录 @@ -33,14 +34,18 @@ def find_point(bof, step, pos, data_file, flag, df, row, w2t): # flag: greater than or lower than if flag == 'gt': while 0 < row < df.index[-1]-100: - if df.iloc[row, 2] > 2: + _value = df.iloc[row, 2] + if _value > 2: if bof == 'backward': row -= step elif bof == 'forward': row += step continue else: - row_target = row + if bof == 'backward': + row_target = row - step + elif bof == 'forward': + row_target = row + step break else: if bof == 'backward': @@ -49,14 +54,18 @@ def find_point(bof, step, pos, data_file, flag, df, row, w2t): row_target = row + 100 elif flag == 'lt': while 0 < row < df.index[-1]-100: - if df.iloc[row, 2] < 2: + _value = df.iloc[row, 2] + if _value < 2: if bof == 'backward': row -= step elif bof == 'forward': row += step continue else: - row_target = row + if bof == 'backward': + row_target = row - step + elif bof == 'forward': + row_target = row + step break else: if bof == 'backward': @@ -117,13 +126,15 @@ def single_file_proc(ws, data_file, df, low, high, cycle, w2t): _step = 5 _data = {} row_max = df.index[-1]-100 + print(data_file) while _row < row_max: if count not in _data.keys(): _data[count] = [] - if df.iloc[_row, 2] < 2: + _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_lt - _row_gt - 50) / 2) + _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) @@ -138,6 +149,7 @@ def single_file_proc(ws, data_file, df, low, high, cycle, w2t): 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 @@ -150,6 +162,9 @@ 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('\\') From 346379ec1a99a18728b7825dd2b78f7e72b6ed26 Mon Sep 17 00:00:00 2001 From: gitea Date: Sun, 16 Jun 2024 14:09:26 +0800 Subject: [PATCH 2/2] re-commit --- aio/README.md | 2 +- aio/assets/file_version_info.txt | 4 ++-- aio/assets/vers | 2 +- aio/code/aio.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aio/README.md b/aio/README.md index cc7ecb8..a499a68 100644 --- a/aio/README.md +++ b/aio/README.md @@ -222,7 +222,7 @@ v0.1.6.0(2024/06/15) 1. [aio.py]: 新增wavelogger处理界面 2. [wavelogger.py]: 新增精度数据处理模块 -v0.1.6.1(2024/06/17) +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做与判断逻辑相同的处理，目的是避免形成死循环 diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 1beffe4..bb3b300 100644 --- a/aio/assets/file_version_info.txt +++ b/aio/assets/file_version_info.txt @@ -31,12 +31,12 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'), StringStruct('FileDescription', 'All in one automatic toolbox'), - StringStruct('FileVersion', '0.1.6.1 (2024-06-17)'), + StringStruct('FileVersion', '0.1.6.1 (2024-06-16)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.6.1 (2024-06-17)')]) + StringStruct('ProductVersion', '0.1.6.1 (2024-06-16)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index e072eb3..1f619d9 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.6.1 @ 06/17/2024 \ No newline at end of file +0.1.6.1 @ 06/16/2024 \ No newline at end of file diff --git a/aio/code/aio.py b/aio/code/aio.py index 8743cec..6f4a4fd 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.6.1\nDate: 06/17/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.1.6.1\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') # =====================================================================