[modify] finish current related functions

This commit is contained in:
2024-06-01 16:12:56 +08:00
parent 1f00d22bce
commit afb862201a
2 changed files with 36 additions and 66 deletions

View File

@ -271,8 +271,11 @@ class App(customtkinter.CTk):
trq = self.option_trq.get()
sub_func = self.menu_sub.get()
c1 = exists(path)
c2 = sub_func in ['max', 'avg']
c3 = True if vel != trq else False
c2 = sub_func in ['max', 'avg', 'cycle']
if sub_func == 'cycle':
c3 = True if vel != trq else False
else:
c3 = 1
try:
_ = float(rc)
c4 = True
@ -280,7 +283,7 @@ class App(customtkinter.CTk):
c4 = False
if c1 and c2 and c3 and c4:
return 2, path, float(rc), int(vel), int(trq), sub_func
return 2, path, sub_func, float(rc), int(vel), int(trq)
else:
return 0, 0
elif func_name == 'iso':
@ -304,8 +307,8 @@ class App(customtkinter.CTk):
if flag == 1:
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], rc=args[1], sub_func=args[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], w2t=self.write2textbox)
elif flag == 3:
func_dict[flag](path=args[0], w2t=self.write2textbox)
else: