Compare commits
2 Commits
wavelogger
...
2f2f0d430d
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f2f0d430d | |||
| 78a79e4aa0 |
@ -200,30 +200,27 @@ v0.1.5(2024/06/12)
|
||||
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]: 新增必要库配置文件
|
||||
[current.py]: 修改cycle功能中，数据清理范围为70000行，并将threshold从2调整为5
|
||||
[current.py]: 修改位置超限提示，使更清楚了解问题原因
|
||||
[current.py]: 修改find_point函数中错误提示，增加定位信息
|
||||
[README.md]: 精简打包命令
|
||||
[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处是否达到指定百分比的判定逻辑
|
||||
[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)
|
||||
1. [aio.py]: 修改w_param为84，适配14寸电脑屏幕
|
||||
2. [brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95%
|
||||
3. [README.md]: 稍作修改，包括打包方式，功能特性等
|
||||
[aio.py]: 修改w_param为84，适配14寸电脑屏幕
|
||||
[brake.py]: 将判定合规逻辑修改为角速度超过指定角速度的95%
|
||||
[README.md]: 稍作修改，包括打包方式，功能特性等
|
||||
|
||||
v0.1.6.0(2024/06/15)
|
||||
1. [aio.py]: 新增wavelogger处理界面
|
||||
2. [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做与判断逻辑相同的处理，目的是避免形成死循环
|
||||
|
||||
[aio.py]: 新增wavelogger处理界面
|
||||
[wavelogger.py]: 新增精度数据处理模块
|
||||
|
||||
v0.1.6.2(2024/06/16)
|
||||
1. [current.py] 修改了max/avg相关功能中对于返回值的处理逻辑，并在输出框以行的形式打印出来
|
||||
|
||||
@ -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, 1),
|
||||
prodvers=(0, 1, 6, 1),
|
||||
filevers=(0, 1, 6, 2),
|
||||
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.6.1 (2024-06-16)'),
|
||||
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.6.1 (2024-06-16)')])
|
||||
StringStruct('ProductVersion', '0.1.6.2 (2024-06-16)')])
|
||||
]),
|
||||
VarFileInfo([VarStruct('Translation', [1033, 1200])])
|
||||
]
|
||||
|
||||
@ -1 +1 @@
|
||||
0.1.6.1 @ 06/16/2024
|
||||
0.1.6.2 @ 06/16/2024
|
||||
@ -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/16/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')
|
||||
# =====================================================================
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
import os
|
||||
import random
|
||||
|
||||
from pandas import read_csv
|
||||
from csv import reader
|
||||
@ -7,7 +6,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):
|
||||
# 功能：以列表的形式分别返回指定路径下的文件和文件夹，不包含子目录
|
||||
@ -34,18 +33,14 @@ 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:
|
||||
_value = df.iloc[row, 2]
|
||||
if _value > 2:
|
||||
if df.iloc[row, 2] > 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
|
||||
row_target = row
|
||||
break
|
||||
else:
|
||||
if bof == 'backward':
|
||||
@ -54,18 +49,14 @@ 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:
|
||||
_value = df.iloc[row, 2]
|
||||
if _value < 2:
|
||||
if df.iloc[row, 2] < 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
|
||||
row_target = row
|
||||
break
|
||||
else:
|
||||
if bof == 'backward':
|
||||
@ -126,15 +117,13 @@ 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] = []
|
||||
|
||||
_value = df.iloc[_row, 2]
|
||||
if _value < 2:
|
||||
if df.iloc[_row, 2] < 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)
|
||||
_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)
|
||||
@ -149,7 +138,6 @@ 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
|
||||
@ -162,9 +150,6 @@ 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('\\')
|
||||
|
||||
Reference in New Issue
Block a user