v0.1.5.4(2024/06/15)
[aio.py]: 新增wavelogger处理界面 [wavelogger.py]: 新增精度数据处理模块
This commit is contained in:
parent
15e6f1b6c0
commit
fc30fcde80
@ -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处是否达到指定百分比的判定逻辑
|
||||
[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑
|
||||
|
||||
v0.1.5.4(2024/06/15)
|
||||
[aio.py]: 新增wavelogger处理界面
|
||||
[wavelogger.py]: 新增精度数据处理模块
|
||||
@ -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])])
|
||||
]
|
||||
|
||||
@ -1 +1 @@
|
||||
0.1.5.2 @ 06/13/2024
|
||||
0.1.5.4 @ 06/15/2024
|
||||
|
||||
@ -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="请检查对应参数是否填写正确！", )
|
||||
|
||||
|
||||
171
aio/code/wavelogger.py
Normal file
171
aio/code/wavelogger.py
Normal file
@ -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])
|
||||
Reference in New Issue
Block a user