From 97ba8ffc51b2d9697bbd8cafa6e78ff65b7900ca Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 5 Jun 2024 21:27:11 +0800 Subject: [PATCH] [modify] support single axis cycle data process --- aio/aio.py | 197 +++++++++++++++++++++++++++++++++--------------- aio/current.py | 188 +++++++++++++++++++++++++++++++++++++++------ aio/layout.xlsx | Bin 10323 -> 10272 bytes 3 files changed, 300 insertions(+), 85 deletions(-) diff --git a/aio/aio.py b/aio/aio.py index 2e7d441..93e14eb 100644 --- a/aio/aio.py +++ b/aio/aio.py @@ -24,17 +24,12 @@ class App(customtkinter.CTk): # configure window self.title("AIO - All in one automatic toolbox") # self.iconbitmap('./icon.ico') - # screen_width = self.winfo_screenwidth() - # screen_height = self.winfo_screenheight() - # width = screen_width - 200 - # height = screen_height - 200 - # self.geometry(f"{width}x{height}+{100}+{100}") - self.geometry("1100x500+100+100") + self.geometry("1180x550+100+100") self.protocol("WM_DELETE_WINDOW", self.func_end_call_back) - self.grid_rowconfigure(3, weight=1) - self.grid_columnconfigure((1, 2, 3, 4, 5, 6, 7, 8, 9), weight=1) - self.minsize(1100, 500) + self.grid_rowconfigure(4, weight=1) + self.grid_columnconfigure((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13), weight=1) + self.minsize(1180, 550) # ===================================================================== # create frame sidebar(left) @@ -62,8 +57,8 @@ class App(customtkinter.CTk): # ===================================================================== # create frame - self.frame_param = customtkinter.CTkFrame(self, height=240, corner_radius=10) - self.frame_param.grid(row=0, column=1, rowspan=3, columnspan=11, sticky='new', ipadx=20, ipady=10, padx=10, pady=(10, 5)) + self.frame_param = customtkinter.CTkFrame(self, corner_radius=10) + self.frame_param.grid(row=0, column=1, rowspan=3, columnspan=13, sticky='new', ipadx=20, ipady=10, padx=10, pady=(10, 5)) # create main menu self.menu_main = customtkinter.CTkOptionMenu(self.frame_param, values=["INIT", "brake", "current", "iso"], font=self.my_font, command=self.func_main_callback) self.menu_main.grid(row=0, column=1, sticky='we', padx=(20, 10), pady=(10, 5)) @@ -74,7 +69,7 @@ class App(customtkinter.CTk): self.label_path = customtkinter.CTkLabel(self.frame_param, text="Path", font=self.my_font) self.label_path.grid(row=0, column=2, sticky='e', pady=(10, 5)) self.entry_path = customtkinter.CTkEntry(self.frame_param, width=670, placeholder_text="数据文件夹路径", font=self.my_font) - self.entry_path.grid(row=0, column=3, columnspan=9, padx=(5, 10), pady=(10, 5), sticky='we') + self.entry_path.grid(row=0, column=3, columnspan=11, padx=(5, 10), pady=(10, 5), sticky='we') self.entry_path.configure(state='disabled') # create av related self.label_av = customtkinter.CTkLabel(self.frame_param, text="AV", font=self.my_font) @@ -124,10 +119,52 @@ class App(customtkinter.CTk): self.option_trq = customtkinter.CTkOptionMenu(self.frame_param, values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) self.option_trq.grid(row=2, column=7, padx=(5, 10), pady=(5, 5), sticky='w') self.option_trq.configure(state='disabled') + # create trqH related + self.label_trqh = customtkinter.CTkLabel(self.frame_param, text="TrqH", font=self.my_font) + self.label_trqh.grid(row=2, column=8, sticky='e', pady=(5, 5)) + self.option_trqh = customtkinter.CTkOptionMenu(self.frame_param, values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) + self.option_trqh.grid(row=2, column=9, padx=(5, 10), pady=(5, 5), sticky='w') + self.option_trqh.configure(state='disabled') + # create STO related + self.label_sto = customtkinter.CTkLabel(self.frame_param, text="STO", font=self.my_font) + self.label_sto.grid(row=2, column=10, sticky='e', pady=(5, 5)) + self.option_sto = customtkinter.CTkOptionMenu(self.frame_param, values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) + self.option_sto.grid(row=2, column=11, padx=(5, 10), pady=(5, 5), sticky='w') + self.option_sto.configure(state='disabled') + # create rc1 + self.label_rc_1 = customtkinter.CTkLabel(self.frame_param, text="RC1", font=self.my_font) + self.label_rc_1.grid(row=3, column=2, sticky='e', pady=(5, 5)) + self.entry_rc_1 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_1.grid(row=3, column=3, padx=(5, 10), pady=(5, 5), sticky='w') + + self.label_rc_2 = customtkinter.CTkLabel(self.frame_param, text="RC2", font=self.my_font) + self.label_rc_2.grid(row=3, column=4, sticky='e', pady=(5, 5)) + self.entry_rc_2 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_2.grid(row=3, column=5, padx=(5, 10), pady=(5, 5), sticky='w') + + self.label_rc_3 = customtkinter.CTkLabel(self.frame_param, text="RC3", font=self.my_font) + self.label_rc_3.grid(row=3, column=6, sticky='e', pady=(5, 5)) + self.entry_rc_3 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_3.grid(row=3, column=7, padx=(5, 10), pady=(5, 5), sticky='w') + + self.label_rc_4 = customtkinter.CTkLabel(self.frame_param, text="RC4", font=self.my_font) + self.label_rc_4.grid(row=3, column=8, sticky='e', pady=(5, 5)) + self.entry_rc_4 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_4.grid(row=3, column=9, padx=(5, 10), pady=(5, 5), sticky='w') + + self.label_rc_5 = customtkinter.CTkLabel(self.frame_param, text="RC5", font=self.my_font) + self.label_rc_5.grid(row=3, column=10, sticky='e', pady=(5, 5)) + self.entry_rc_5 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_5.grid(row=3, column=11, padx=(5, 10), pady=(5, 5), sticky='w') + + self.label_rc_6 = customtkinter.CTkLabel(self.frame_param, text="RC6", font=self.my_font) + self.label_rc_6.grid(row=3, column=12, sticky='e', pady=(5, 5)) + self.entry_rc_6 = customtkinter.CTkEntry(self.frame_param, width=self.w_param, placeholder_text=f"optional", font=self.my_font) + self.entry_rc_6.grid(row=3, column=13, padx=(5, 10), pady=(5, 5), sticky='w') # ===================================================================== # create textbox - self.textbox = customtkinter.CTkTextbox(self, height=640, wrap='none', font=customtkinter.CTkFont(family="consolas", size=14), text_color="blue") - self.textbox.grid(row=3, column=1, rowspan=5, columnspan=15, ipadx=10, ipady=10, padx=10, pady=(5, 10), sticky='nsew') + self.textbox = customtkinter.CTkTextbox(self, wrap='none', font=customtkinter.CTkFont(family="consolas", size=14), text_color="blue") + self.textbox.grid(row=4, column=1, rowspan=3, columnspan=13, ipadx=10, ipady=10, padx=10, pady=(5, 10), sticky='nsew') self.textbox.configure(state='disabled') # ===================================================================== # version check @@ -157,6 +194,14 @@ class App(customtkinter.CTk): self.label_axis.configure(text="AXIS", text_color="black") self.label_vel.configure(text="Vel", text_color="black") self.label_trq.configure(text="Trq", text_color="black") + self.label_trqh.configure(text="TrqH", text_color="black") + self.label_sto.configure(text="STO", text_color="black") + self.label_rc_1.configure(text="RC1", text_color="black") + self.label_rc_2.configure(text="RC2", text_color="black") + self.label_rc_3.configure(text="RC3", text_color="black") + self.label_rc_4.configure(text="RC4", text_color="black") + self.label_rc_5.configure(text="RC5", text_color="black") + self.label_rc_6.configure(text="RC6", text_color="black") self.entry_path.configure(placeholder_text="数据文件夹路径", state="disabled") self.entry_av.configure(placeholder_text="角速度", state="disabled") @@ -167,6 +212,14 @@ class App(customtkinter.CTk): self.option_axis.configure(state="disabled") self.option_vel.configure(state="disabled") self.option_trq.configure(state="disabled") + self.option_trqh.configure(state="disabled") + self.option_sto.configure(state="disabled") + self.entry_rc_1.configure(placeholder_text="optional", state="disabled") + self.entry_rc_2.configure(placeholder_text="optional", state="disabled") + self.entry_rc_3.configure(placeholder_text="optional", state="disabled") + self.entry_rc_4.configure(placeholder_text="optional", state="disabled") + self.entry_rc_5.configure(placeholder_text="optional", state="disabled") + self.entry_rc_6.configure(placeholder_text="optional", state="disabled") self.menu_sub.grid_forget() self.textbox.delete(index1='1.0', index2='end') @@ -180,12 +233,12 @@ class App(customtkinter.CTk): self.menu_sub.grid(row=1, column=1, sticky='we', padx=(20, 10), pady=(5, 5)) self.menu_sub.set("--select--") - self.label_path.configure(text="*Path", text_color='red') - self.label_av.configure(text="*AV", text_color='red') - self.label_rr.configure(text="*RR", text_color='red') - self.label_axis.configure(text="*AXIS", text_color='red') - self.label_vel.configure(text="*Vel", text_color='red') - self.label_trq.configure(text="*Trq", text_color='red') + self.label_path.configure(text="Path", text_color='red') + self.label_av.configure(text="AV", text_color='red') + self.label_rr.configure(text="RR", text_color='red') + self.label_axis.configure(text="AXIS", text_color='red') + self.label_vel.configure(text="Vel", text_color='red') + self.label_trq.configure(text="Trq", text_color='red') self.entry_path.configure(state="normal") self.entry_av.configure(state="normal") @@ -199,22 +252,36 @@ class App(customtkinter.CTk): self.menu_sub.grid(row=1, column=1, sticky='we', padx=(20, 10), pady=(5, 5)) self.menu_sub.set("--select--") - self.label_path.configure(text="*Path", text_color='red') - self.label_rc.configure(text="*RC", text_color='red') - self.label_trq.configure(text="*Trq", text_color='red') + self.label_path.configure(text="Path", text_color='red') + self.label_rc.configure(text="RC", text_color='blue') + self.label_trqh.configure(text="TrqH", text_color='red') + self.label_rc_1.configure(text="RC1", text_color='red') + self.label_rc_2.configure(text="RC2", text_color='red') + self.label_rc_3.configure(text="RC3", text_color='red') + self.label_rc_4.configure(text="RC4", text_color='red') + self.label_rc_5.configure(text="RC5", text_color='red') + self.label_rc_6.configure(text="RC6", text_color='red') self.entry_path.configure(state="normal") - self.entry_rc.configure(state="normal") - self.option_trq.configure(state="normal") + self.entry_rc.configure(state="normal", placeholder_text="optional") + self.option_trqh.configure(state="normal") + self.entry_rc_1.configure(state="normal", placeholder_text="额定电流") + self.entry_rc_2.configure(state="normal", placeholder_text="额定电流") + self.entry_rc_3.configure(state="normal", placeholder_text="额定电流") + self.entry_rc_4.configure(state="normal", placeholder_text="额定电流") + self.entry_rc_5.configure(state="normal", placeholder_text="额定电流") + self.entry_rc_6.configure(state="normal", placeholder_text="额定电流") + elif func_name == 'iso': - self.label_path.configure(text="*Path", text_color='red') + self.label_path.configure(text="Path", text_color='red') self.entry_path.configure(state="normal") + else: self.initialization() self.menu_main.set("Start Here!") def func_sub_callback(self, func_name): if func_name == "industrial": - self.label_rpm.configure(text="*RPM", text_color='red') + self.label_rpm.configure(text="RPM", text_color='red') self.entry_rpm.configure(state="normal") elif func_name == "cobot": self.label_rpm.configure(text="RPM", text_color='black') @@ -224,16 +291,22 @@ class App(customtkinter.CTk): self.entry_dur.configure(state="disabled") self.label_vel.configure(text="Vel", text_color='black') self.option_vel.configure(state="disabled") + self.label_trq.configure(text="Trq", text_color='black') + self.option_trq.configure(state="disabled") elif func_name == 'avg': self.label_dur.configure(text="Dur", text_color='black') self.entry_dur.configure(state="disabled") self.label_vel.configure(text="Vel", text_color='black') self.option_vel.configure(state="disabled") + self.label_trq.configure(text="Trq", text_color='black') + self.option_trq.configure(state="disabled") elif func_name == 'cycle': - self.label_dur.configure(text="*Dur", text_color='red') - self.entry_dur.configure(state="normal") - self.label_vel.configure(text="*Vel", text_color='red') + self.label_dur.configure(text="Dur", text_color='blue') + self.entry_dur.configure(state="normal", placeholder_text='scenario') + self.label_vel.configure(text="Vel", text_color='red') self.option_vel.configure(state="normal") + self.label_trq.configure(text="Trq", text_color='red') + self.option_trq.configure(state="normal") def write2textbox(self, text, wait=0, exitcode=0): @@ -247,6 +320,7 @@ class App(customtkinter.CTk): self.textbox.insert(index='end', text=text + '\n') self.textbox.update() self.textbox.see('end') + self.textbox.configure(state='disabled') raise Exception(f"Error code: {exitcode}") else: self.textbox.configure(text_color='blue') @@ -254,6 +328,19 @@ class App(customtkinter.CTk): self.textbox.update() self.textbox.see('end') + def is_float(self, flag, *args): + for item in args: + try: + if flag == 'optional': + item = 0 if item == '' else item + _ = float(item) + elif flag == 'required': + _ = float(item) + except Exception as Err: + self.write2textbox(str(Err)) + self.write2textbox("参数数据缺失，或者数据类型错误，更正后重新运行...", 0, 3) + return True + def check_param(self): func_name = self.menu_main.get() if func_name == 'brake': @@ -266,12 +353,7 @@ class App(customtkinter.CTk): sub_func = self.menu_sub.get() c1 = exists(path) - try: - _a = float(av) - _b = float(rr) - c2 = True - except: - c2 = False + c2 = self.is_float(av, rr) c3 = rpm = 1 c4 = sub_func in ['industrial', 'cobot'] c5 = True if vel != trq else False @@ -295,35 +377,32 @@ class App(customtkinter.CTk): dur = self.entry_dur.get() vel = self.option_vel.get() trq = self.option_trq.get() + trqh = self.option_trqh.get() sub = self.menu_sub.get() + rc1 = self.entry_rc_1.get() + rc2 = self.entry_rc_2.get() + rc3 = self.entry_rc_3.get() + rc4 = self.entry_rc_4.get() + rc5 = self.entry_rc_5.get() + rc6 = self.entry_rc_6.get() + c1 = exists(path) c2 = sub in ['max', 'avg', 'cycle'] + c3 = self.is_float('optional', rc) + _ = [rc1, rc2, rc3, rc4, rc5, rc6] + c4 = self.is_float('required', *_) - rcs = rc.split() - for _ in rcs: - try: - _t = float(_) - except: - c3 = False - break - else: - c3 = True - - c4 = c5 = True + c5 = c6 = True if sub == 'cycle': - try: - _ = float(dur) - c4 = True - except: - c4 = False c5 = True if vel != trq else False + c6 = self.is_float('optional', dur) - if c1 and c2 and c3 and c4 and c5: + if c1 and c2 and c3 and c4 and c5 and c6: rcs = [] - for x in rc.split(): + for x in _: rcs.append(float(x)) - dur = 0 if sub != 'cycle' else dur - return 2, path, sub, rcs, int(vel), int(trq), float(dur) + dur = 0 if sub != 'cycle' or dur == '' else dur + return 2, path, sub, rcs, int(vel), int(trq), int(trqh), float(dur) else: return 0, 0 # ======================================================= @@ -348,7 +427,7 @@ class App(customtkinter.CTk): func_dict[flag](path=args[0], av=args[1], rr=args[2], rpm=args[3], axis=args[4], vel=args[5], trq=args[6], w2t=self.write2textbox) elif flag == 2: # tkinter.messagebox.showinfo(title="TBD", message="功能待实现......") - func_dict[flag](path=args[0], sub=args[1], rc=args[2], vel=args[3], trq=args[4], dur=args[5], w2t=self.write2textbox) + func_dict[flag](path=args[0], sub=args[1], rcs=args[2], vel=args[3], trq=args[4], trqh=args[5], dur=args[6], w2t=self.write2textbox) elif flag == 3: func_dict[flag](path=args[0], w2t=self.write2textbox) else: @@ -382,12 +461,8 @@ class App(customtkinter.CTk): def func_end_call_back(self): if tkinter.messagebox.askyesno(title="关闭程序", message="相关数据可能未保存，正在运行程序时有概率会损坏数据文件，确定要终止程序运行吗？"): self.destroy() - else: - pass - pass if __name__ == "__main__": - aio = App() aio.mainloop() diff --git a/aio/current.py b/aio/current.py index 9d38c7d..b93240d 100644 --- a/aio/current.py +++ b/aio/current.py @@ -3,6 +3,37 @@ from os import scandir from os.path import exists from sys import argv from pandas import read_csv +from re import match +from threading import Thread +from time import sleep + +class GetThreadResult(Thread): + def __init__(self, func, args=()): + super(GetThreadResult, self).__init__() + self.func = func + self.args = args + self.result = 0 + + def run(self): + sleep(1) + self.result = self.func(*self.args) + + def get_result(self): + Thread.join(self) # 等待线程执行完毕 + try: + return self.result + except Exception as Err: + return None + + +def w2t_local(msg, wait, w2t): + while True: + global stop + if stop == 0 and wait != 0: + sleep(1) + w2t(msg, wait) + else: + break def traversal_files(path, w2t): @@ -27,16 +58,18 @@ def traversal_files(path, w2t): def initialization(path, sub, w2t): _, data_files = traversal_files(path, w2t) count = 0 + for data_file in data_files: + filename = data_file.split('\\')[-1] if sub != 'cycle': - if not (data_file.endswith('.data') or data_file.endswith('.csv')): - msg = f"所有文件必须以 .data 结尾，请检查后重新运行。" + if not (match('j[1-7].*\\.data', filename) or match('j[1-7].*\\.csv', filename)): + msg = f"所有文件必须以 jx_ 开头，以 .data/csv 结尾（x取值1-7），请检查后重新运行。" w2t(msg, 0, 2) else: - if data_file.endswith('.xlsx'): + if filename.endswith('.xlsx'): count += 1 - elif not (data_file.endswith('.data') or data_file.endswith('.csv')): - msg = f"所有文件必须以 .data 结尾，请检查后重新运行。" + elif not (match('j[1-7].*\\.data', filename) or match('j[1-7].*\\.csv', filename)): + msg = f"所有文件必须以 jx_ 开头，以 .data/csv 结尾（x取值1-7），请检查后重新运行。" w2t(msg, 0, 3) if sub == 'cycle' and count != 1: @@ -45,7 +78,7 @@ def initialization(path, sub, w2t): return data_files -def current_max(data_files, rc, trq, w2t): +def current_max(data_files, rcs, trqh, w2t): current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0} for data_file in data_files: if data_file.endswith('.data'): @@ -54,9 +87,9 @@ def current_max(data_files, rc, trq, w2t): df = read_csv(data_file, sep=',', encoding='gbk', header=8) axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) - rca = rc[axis-1] + rca = rcs[axis-1] - col = df.columns.values[trq-1] + col = df.columns.values[trqh-1] c_max = df[col].max() scale = 1 if data_file.endswith('.csv') else 1000 @@ -68,7 +101,7 @@ def current_max(data_files, rc, trq, w2t): return current -def current_avg(data_files, rc, trq, w2t): +def current_avg(data_files, rcs, trqh, w2t): current = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0} for data_file in data_files: if data_file.endswith('.data'): @@ -77,9 +110,9 @@ def current_avg(data_files, rc, trq, w2t): df = read_csv(data_file, sep=',', encoding='gbk', header=8) axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) - rca = rc[axis-1] + rca = rcs[axis-1] - col = df.columns.values[trq - 1] + col = df.columns.values[trqh - 1] c_std = df[col].std() c_avg = df[col].mean() @@ -92,46 +125,153 @@ def current_avg(data_files, rc, trq, w2t): return current -def current_cycle(dur, data_files, rc, vel, trq, w2t): +def current_cycle(dur, data_files, rcs, vel, trq, trqh, w2t): result = None hold = [] single = [] for data_file in data_files: + filename = data_file.split('\\')[-1] if data_file.endswith('.xlsx'): result = data_file - elif (data_file.endswith('.csv') or data_file.endswith('.data')) and data_file.startswith('hold', 3, 10): + elif match('j[1-7]_hold_.*\\.data', filename) or match('j[1-7]_hold_.*\\.csv', filename): hold.append(data_file) else: single.append(data_file) + w2t(f"正在打开文件 {result}，需要 10s 左右", 1) + + global stop + stop = 0 + t_excel = GetThreadResult(load_workbook, args=(result, )) + t_wait = Thread(target=w2t_local, args=('.', 1, w2t)) + t_excel.start() + t_wait.start() + t_excel.join() + wb = t_excel.get_result() + stop = 1 + sleep(1.1) + w2t('') + if hold != []: - avg = current_avg(hold, rc, trq, w2t) - wb = load_workbook(result) - for k, v in avg.items(): + avg = current_avg(hold, rcs, trqh, w2t) + for axis, cur_value in avg.items(): try: - shtname = f"J{k}" - wb[shtname]["J4"].value = v + shtname = f"J{axis}" + wb[shtname]["J4"].value = float(cur_value) except: pass + if dur == 0: + p_single(wb, single, vel, trq, w2t) + else: + p_scenario() + + w2t(f"正在保存文件 {result}，需要 10s 左右", 1) + stop = 0 + t_excel = Thread(target=wb.save, args=(result, )) + t_wait = Thread(target=w2t_local, args=('.', 1, w2t)) + t_excel.start() + t_wait.start() + t_excel.join() + stop = 1 + sleep(1.1) + w2t('\n') + w2t("----------------------------------------------------------") + w2t("全部处理完毕") + + +def p_single(wb, single, vel, trq, w2t): + # 1. 先找到第一个速度为零的点，数据从后往前找，一开始就是零的情况不予考虑 + # 2. 记录第一个点的位置，继续向前查找第二个速度为零的点，同理，一开始为零的点不予考虑 + # 3. 记录第二个点的位置，并将其中的数据拷贝至对应位置 for data_file in single: axis = int(data_file.split('\\')[-1].split('_')[0].removeprefix('j')) - rcs = rc[axis-1] - pass + shtname = f"J{axis}" + ws = wb[shtname] + + if data_file.endswith('.data'): + df = read_csv(data_file, sep='\t') + elif data_file.endswith('.csv'): + df = read_csv(data_file, sep=',', encoding='gbk', header=8) + + # 过滤尾部无效数据 + _row_e = df.index[-1] + _row_s = _row_e - 200 + while _row_e > 200: + speed_avg = df.iloc[_row_s:_row_e, vel-1].abs().mean() + if speed_avg > 2: + _row_e -= 50 + _row_s -= 50 + continue + else: + break + else: + w2t("数据有误，需要检查，无法找到第一个有效起始点...", 0, 1) + + # 找到第一个起始点 row_end，继续找到有数据的部分 + row_end = _row_e - 100 + _row_e -= 200 + _row_s -= 200 + while _row_e > 200: + speed_avg = df.iloc[_row_s:_row_e, vel-1].abs().mean() + if speed_avg < 2: + _row_e -= 50 + _row_s -= 50 + continue + else: + break + else: + w2t("数据有误，需要检查，无法找到第二个有效起始点...", 0, 2) + + # 目前已经有一点的速度值了，继续往前搜寻下一个速度为零的点 + _row_e -= 200 + _row_s -= 200 + while _row_e > 200: + speed_avg = df.iloc[_row_s:_row_e, vel-1].abs().mean() + if speed_avg > 2: + _row_e -= 50 + _row_s -= 50 + continue + else: + break + else: + w2t("数据有误，需要检查，无法找到第三个有效起始点...", 0, 3) + + row_start = _row_s + 180 + data = [] + for row in range(row_start, row_end): + data.append(df.iloc[row, vel-1]) + data.append(df.iloc[row, trq-1]) + + i = 0 + for row in ws.iter_rows(min_row=2, min_col=2, max_row=15000, max_col=3): + for cell in row: + try: + cell.value = data[i] + i += 1 + except: + cell.value = None + + +def p_scenario(): + pass + + # ======================================= -def main(path, sub, rc, vel, trq, dur, w2t): +def main(path, sub, rcs, vel, trq, trqh, dur, w2t): data_files = initialization(path, sub, w2t) if sub == 'max': - current_max(data_files, rc, trq, w2t) + current_max(data_files, rcs, trqh, w2t) elif sub == 'avg': - current_avg(data_files, rc, trq, w2t) + current_avg(data_files, rcs, trqh, w2t) elif sub == 'cycle': - current_cycle(dur, data_files, rc, vel, trq, w2t) + current_cycle(dur, data_files, rcs, vel, trq, trqh, w2t) else: pass if __name__ == '__main__': + stop = 0 main(*argv[1:]) diff --git a/aio/layout.xlsx b/aio/layout.xlsx index 7af97d87e4a52d64c4328d08f8d04beae515c7b0..ac11973f023dda75e940e1c125d2a20351ceae76 100644 GIT binary patch delta 4972 zcmZ`-cTm&awoM2SdXwG>p;s{=@PR}L9R%qmpzulWNN+!S@1a)-y-5pAK>p}T@Zn*_rAIF-ko>PA8YpPbJjY0&;Do4p4NM+*OUP!(wADbm&fFQxd7+a-1ITu zp%>JB7bqPi=8W>)NUH`(Q`MnwC|wIP1lG;*`qCxej)Uz*=8uB|#UY#Kd7VSj@w&Op zI6FeVM<|i3#q6yLtIFGg2jOhP1#`%Fs*jV{=P!k$Y_UH38|LKVg8Lc>7JQW0q&VS- zdED{=>ai5hK=>E)wl=Zdc3NOsWEyeYgF>l_$P&&)dU zC}Idvc2+?75qEubuLPZD9vzu{i_%A8S--G9eI-ab!gAhrxxA6~!r<5Qz~FCcI$3hx zG(oi~7ml6Ob)D~$2?G48-71V#&p-M*ScU_TX!;Npe)fHkRD5cSf!yGemf{aeGg^k5 z@RIV!*;Cz>nUgHM8x6hoPMr^v?^wSyrdNe)dKAc>|(2* z<}B{WD%pDCYVLS1q*h^um(OVU)KpOZqtD{g-8zQlWu{Kv^W0&CsWW~ri&!f8o?)

@J+wFSu+t#A_F+GK;Uy4FG=V+>j>XkD? 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 delta 5007 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