v0.1.5.4(2024/06/15)
[aio.py]: 新增wavelogger处理界面 [wavelogger.py]: 新增精度数据处理模块
This commit is contained in:
@ -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="请检查对应参数是否填写正确!", )
|
||||
|
||||
|
Reference in New Issue
Block a user