diff --git a/aio/README.md b/aio/README.md index fecd128..ac38beb 100644 --- a/aio/README.md +++ b/aio/README.md @@ -600,4 +600,20 @@ v0.2.0.5(2024/07/31) v0.2.0.6(2024/08/09) 1. [t_change_ui: all files] - 修改了 logger 的实现 - - 尤其是 clibs.py，使用日志字典，重写了日志记录的功能 \ No newline at end of file + - 尤其是 clibs.py，使用日志字典，重写了日志记录的功能 + +v0.2.0.7(2024/08/16) +1. [t_change_ui: clibs.py]：修改了 hmi.log 的日志等级为 WARNING +2. [t_change_ui: openapi.py]：根据第一步的修改，将此模块日志记录等级调整至 warning +3. [current: current.py] + - README新增了整机自动化测试的前置条件，即滑块需要滑动到最右端 + - current修改了文件校验的逻辑 +4. [t_change_ui: aio.py] + - 修改变量命名，widgit -> widget + - 根据第 5 点变动，同步修改代码实现 + - 调整 UI 界面代码顺序，使之符合 layout.xlsx 描述 + - 将版本检查的部分单独封装成一个函数，在 detect_network 线程初始化时调用一次，并且程序启动也不会受到阻塞 +5. [t_change_ui: layout.xlsx]：修改了组件布局方式 + + +> 前两个修改点，修复的是网络提示的颜色不正确问题，因为日志将 textbox 中的内容也作为 debug 信息写入 hmi.log 了 \ No newline at end of file diff --git a/aio/assets/layout.xlsx b/aio/assets/layout.xlsx index 735de05..0437a3d 100644 Binary files a/aio/assets/layout.xlsx and b/aio/assets/layout.xlsx differ diff --git a/aio/assets/templates/heartbeat b/aio/assets/templates/heartbeat index 56a6051..c227083 100644 --- a/aio/assets/templates/heartbeat +++ b/aio/assets/templates/heartbeat @@ -1 +1 @@ -1 \ No newline at end of file +0 \ No newline at end of file diff --git a/aio/code/aio.py b/aio/code/aio.py index d7d8236..fdcb395 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -37,21 +37,21 @@ btns_func = { 'log': {'btn': '', 'row': 3, 'text': '保存日志'}, 'end': {'btn': '', 'row': 4, 'text': '结束运行'}, } -widgits_dp = { - 'path': {'label': '', 'entry': '', 'row': 1, 'col': 2, 'text': '数据文件夹路径'}, - 'dur': {'label': '', 'entry': '', 'row': 2, 'col': 2, 'text': '周期时间'}, - 'vel': {'label': '', 'optionmenu': '', 'row': 2, 'col': 4, 'text': ''}, - 'trq': {'label': '', 'optionmenu': '', 'row': 2, 'col': 6, 'text': ''}, - 'trqh': {'label': '', 'optionmenu': '', 'row': 2, 'col': 8, 'text': ''}, - 'estop': {'label': '', 'optionmenu': '', 'row': 2, 'col': 10, 'text': ''}, +widgets_dp = { + 'path': {'label': '', 'entry': '', 'row': 0, 'col': 1, 'text': '数据文件夹路径'}, + 'dur': {'label': '', 'entry': '', 'row': 1, 'col': 1, 'text': '周期时间'}, + 'vel': {'label': '', 'optionmenu': '', 'row': 1, 'col': 1, 'text': ''}, + 'trq': {'label': '', 'optionmenu': '', 'row': 1, 'col': 3, 'text': ''}, + 'trqh': {'label': '', 'optionmenu': '', 'row': 1, 'col': 5, 'text': ''}, + 'estop': {'label': '', 'optionmenu': '', 'row': 1, 'col': 7, 'text': ''}, } -widgits_at = { - 'path': {'label': '', 'entry': '', 'row': 2, 'col': 2, 'text': '数据文件夹路径'}, - 'loadsel': {'label': '', 'optionmenu': '', 'row': 2, 'col': 1, 'text': '负载信息'}, +widgets_at = { + 'path': {'label': '', 'entry': '', 'row': 1, 'col': 1, 'text': '数据文件夹路径'}, + 'loadsel': {'label': '', 'optionmenu': '', 'row': 1, 'col': 0, 'text': '负载信息'}, } -widgits_da = { - 'path': {'label': '', 'entry': '', 'row': 1, 'col': 2, 'text': '数据文件夹路径'}, - 'curvesel': {'label': '', 'optionmenu': '', 'row': 1, 'col': 1, 'text': '指标选择'}, +widgets_da = { + 'path': {'label': '', 'entry': '', 'row': 0, 'col': 1, 'text': '数据文件夹路径'}, + 'curvesel': {'label': '', 'optionmenu': '', 'row': 0, 'col': 0, 'text': '指标选择'}, } @@ -74,17 +74,20 @@ class App(customtkinter.CTk): self.geometry("1200x550+30+30") self.protocol("WM_DELETE_WINDOW", self.func_end_callback) self.config(bg='#E9E9E9') - self.grid_rowconfigure(6, weight=1) - self.grid_columnconfigure((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13), weight=1) + self.rowconfigure(0, weight=1) + self.rowconfigure(1, weight=19) + self.columnconfigure(0, weight=1) + self.columnconfigure(1, weight=19) self.minsize(1200, 550) # ===================================================================== - # create frame sidebar(left) - self.frame_func = customtkinter.CTkFrame(self, width=120, corner_radius=0, fg_color='#E9E9E9') - self.frame_func.grid(row=0, column=0, rowspan=7, sticky='nsew') - # create AIO logo + # 1. create frame sidebar(left) + # ===================================================================== + self.frame_func = customtkinter.CTkFrame(self, width=200, corner_radius=0, fg_color='#E9E9E9') + self.frame_func.grid(row=0, column=0, rowspan=2, sticky='nsew') + # 1.1 create AIO logo self.label_logo = customtkinter.CTkLabel(self.frame_func, text="Rokae AIO", height=60, font=customtkinter.CTkFont(family="Segoe Script Bold", size=24, weight="bold"), text_color="#4F4F4F") self.label_logo.grid(row=0, column=0, padx=15, pady=15) - # create buttons + # 1.2 create buttons for func in btns_func: btns_func[func]['btn'] = customtkinter.CTkButton(self.frame_func, corner_radius=10, text=btns_func[func]['text'], fg_color='#4F4F4F', font=self.my_font) btns_func[func]['btn'].grid(row=btns_func[func]['row'], column=0, sticky='new', padx=10, pady=10, ipadx=5, ipady=5) @@ -92,95 +95,104 @@ class App(customtkinter.CTk): btns_func['check']['btn'].configure(command=lambda: self.thread_it(self.func_check_callback)) btns_func['log']['btn'].configure(command=lambda: self.thread_it(self.func_log_callback)) btns_func['end']['btn'].configure(command=lambda: self.thread_it(self.func_end_callback)) - # create version info + # 1.3 create version info self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.2.0.5\nDate: 08/02/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') # ===================================================================== - # create tabviews - self.tabview = customtkinter.CTkTabview(self, width=10000, height=100, anchor='w', fg_color='#E9E9E9', border_width=2, border_color='#CDCDCD', command=self.tabview_click) + # 2. create tabviews + # ===================================================================== + self.tabview = customtkinter.CTkTabview(self, anchor='w', fg_color='#E9E9E9', width=1000, height=45, border_width=2, border_color='#CDCDCD', command=self.tabview_click) self.tabview.grid(row=0, column=1, padx=10, pady=5, sticky="nsew") self.tabview.add("Data Process") self.tabview.add("Automatic Test") self.tabview.add("Durable Action") - # create main menu for data process + # 2.1 create widgets of tab "Data Process" + # 2.1.1 create main menu 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=10) + self.menu_main_dp.grid(row=0, column=0, sticky='we', padx=5, pady=10) self.menu_main_dp.set("Start Here!") - # create sub menu for data process + # 2.2.2 create sub menu self.menu_sub_dp = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process')) - # create main menu for automatic test + # 2.2.3 create labels, entries and option menus + for widget in widgets_dp: + if widget == 'path': + self.tabview.tab('Data Process').columnconfigure(12, weight=1) + widgets_dp[widget]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f'{widget.upper()}', font=self.my_font) + widgets_dp[widget]['label'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col'], sticky='e', pady=10) + widgets_dp[widget]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), placeholder_text=widgets_dp[widget]['text'], font=self.my_font) + widgets_dp[widget]['entry'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col']+1, columnspan=11, padx=(5, 10), pady=5, sticky='we') + widgets_dp[widget]['entry'].configure(state='disabled') + elif widget in ['dur']: + widgets_dp[widget]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widget.upper()}", font=self.my_font) + widgets_dp[widget]['label'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col'], sticky='e', pady=5) + widgets_dp[widget]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), width=self.w_param, placeholder_text=f"{widgets_dp[widget]['text']}", font=self.my_font) + widgets_dp[widget]['entry'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col']+1, padx=(5, 10), pady=5, sticky='w') + widgets_dp[widget]['entry'].configure(state='disabled') + elif widget in ['vel', 'trq', 'trqh', 'estop']: + widgets_dp[widget]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widget.upper()}", font=self.my_font) + widgets_dp[widget]['label'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col'], sticky='e', pady=5) + widgets_dp[widget]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), button_color='#708090', fg_color='#778899', values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) + widgets_dp[widget]['optionmenu'].grid(row=widgets_dp[widget]['row'], column=widgets_dp[widget]['col']+1, padx=(5, 10), pady=5, sticky='w') + widgets_dp[widget]['optionmenu'].configure(state='disabled') + # ===================================================================== + # 2.2 create widgets of tab "Automatic Test" + # 2.2.1 create main menu self.menu_main_at = customtkinter.CTkOptionMenu(self.tabview.tab('Automatic Test'), values=["init", "brake", "current"], font=self.my_font, text_color='yellow', button_color='red', fg_color='green', command=self.func_main_callback) - self.menu_main_at.grid(row=1, column=1, sticky='we', padx=5, pady=5) + self.menu_main_at.grid(row=0, column=0, sticky='we', padx=5, pady=5) self.menu_main_at.set("Start Here!") - # For data process tab START ===================================================================== - # create widgits_dp - for widgit in widgits_dp: - if widgit == 'path': - widgits_dp[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f'{widgit.upper()}', font=self.my_font) - widgits_dp[widgit]['label'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col'], sticky='e', pady=10) - widgits_dp[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), width=670, placeholder_text=widgits_dp[widgit]['text'], font=self.my_font) - widgits_dp[widgit]['entry'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=5, sticky='we') - widgits_dp[widgit]['entry'].configure(state='disabled') - elif widgit in ['dur']: - widgits_dp[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widgit.upper()}", font=self.my_font) - widgits_dp[widgit]['label'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col'], sticky='e', pady=5) - widgits_dp[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), width=self.w_param, placeholder_text=f"{widgits_dp[widgit]['text']}", font=self.my_font) - widgits_dp[widgit]['entry'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col']+1, padx=(5, 10), pady=5, sticky='w') - widgits_dp[widgit]['entry'].configure(state='disabled') - elif widgit in ['vel', 'trq', 'trqh', 'estop']: - widgits_dp[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widgit.upper()}", font=self.my_font) - widgits_dp[widgit]['label'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col'], sticky='e', pady=5) - widgits_dp[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), button_color='#708090', fg_color='#778899', values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) - widgits_dp[widgit]['optionmenu'].grid(row=widgits_dp[widgit]['row'], column=widgits_dp[widgit]['col']+1, padx=(5, 10), pady=5, sticky='w') - widgits_dp[widgit]['optionmenu'].configure(state='disabled') - # For data process tab END ===================================================================== - # For automatic test tab START ===================================================================== - # create buttons + # 2.2.2 create segment buttons self.seg_button = customtkinter.CTkSegmentedButton(self.tabview.tab('Automatic Test'), dynamic_resizing=False, font=customtkinter.CTkFont(size=16, weight='bold'), command=lambda value='机器状态': self.thread_it(self.segmented_button_callback)) - self.seg_button.grid(row=1, column=2, columnspan=12, padx=(65, 10), pady=(10, 10), sticky="ew") + self.seg_button.grid(row=0, column=1, columnspan=12, padx=(65, 10), pady=(10, 10), sticky="ew") self.seg_button.configure(dynamic_resizing=False, values=["功能切换", "触发急停", "恢复急停", "待定功能", "功能待定", "机器状态", "告警信息"]) self.seg_button.set("功能切换") - # create progress bar + # 2.2.3 create progress bar self.progressbar = customtkinter.CTkProgressBar(self.tabview.tab('Automatic Test')) - self.progressbar.grid(row=5, column=1, padx=5, pady=5, sticky="ew") - self.progressbar.configure(mode="determinnate", width=10) + self.progressbar.grid(row=2, column=0, padx=5, pady=5, sticky="ew") + self.progressbar.configure(mode="determinnate", width=self.w_param) self.progressbar.start() - # create widgits_at - for widgit in widgits_at: - if widgit == 'path': - widgits_at[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Automatic Test'), text=f'{widgit.upper()}', font=self.my_font) - widgits_at[widgit]['label'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col'], sticky='e', padx=(20, 5), pady=5) - widgits_at[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Automatic Test'), width=670, placeholder_text=widgits_at[widgit]['text'], font=self.my_font) - widgits_at[widgit]['entry'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=5, sticky='we') - widgits_at[widgit]['entry'].configure(state='disabled') - elif widgit in ['loadsel', ]: - widgits_at[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Automatic Test'), button_color='#708090', fg_color='#778899', values=["tool33", "tool66", "tool100", "inertia"], width=self.w_param, font=self.my_font) - widgits_at[widgit]['optionmenu'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col'], padx=5, pady=5, sticky='we') - widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) - widgits_at[widgit]['optionmenu'].configure(state='disabled') - # For automatic test tab END ===================================================================== - # For durable_action tab START ===================================================================== - # create progress bar + # 2.2.4 create labels, entries and option menus + for widget in widgets_at: + if widget == 'path': + self.tabview.tab('Automatic Test').columnconfigure(12, weight=1) + widgets_at[widget]['label'] = customtkinter.CTkLabel(self.tabview.tab('Automatic Test'), text=f'{widget.upper()}', font=self.my_font) + widgets_at[widget]['label'].grid(row=widgets_at[widget]['row'], column=widgets_at[widget]['col'], sticky='e', padx=(20, 5), pady=5) + widgets_at[widget]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Automatic Test'), placeholder_text=widgets_at[widget]['text'], font=self.my_font) + widgets_at[widget]['entry'].grid(row=widgets_at[widget]['row'], column=widgets_at[widget]['col']+1, columnspan=11, padx=(5, 10), pady=5, sticky='we') + widgets_at[widget]['entry'].configure(state='disabled') + elif widget in ['loadsel', ]: + widgets_at[widget]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Automatic Test'), button_color='#708090', fg_color='#778899', values=["tool33", "tool66", "tool100", "inertia"], width=self.w_param, font=self.my_font) + widgets_at[widget]['optionmenu'].grid(row=widgets_at[widget]['row'], column=widgets_at[widget]['col'], padx=5, pady=5, sticky='we') + widgets_at[widget]['optionmenu'].set(widgets_at[widget]['text']) + widgets_at[widget]['optionmenu'].configure(state='disabled') + # ===================================================================== + # 2.3 create widgets of tab "Durable Action" + # 2.3.1 create progress bar self.progressbar_da = customtkinter.CTkProgressBar(self.tabview.tab('Durable Action')) - self.progressbar_da.grid(row=2, column=1, padx=5, pady=5, sticky="ew") + self.progressbar_da.grid(row=1, column=0, padx=5, pady=5, sticky="ew") self.progressbar_da.configure(mode="determinnate", width=self.w_param) self.progressbar_da.start() - for widgit in widgits_da: - if widgit == 'path': - widgits_da[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Durable Action'), text=f'{widgit.upper()}', font=self.my_font) - widgits_da[widgit]['label'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col'], sticky='e', padx=(20, 5), pady=10) - widgits_da[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Durable Action'), width=670, placeholder_text=widgits_da[widgit]['text'], font=self.my_font) - widgits_da[widgit]['entry'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=10, sticky='we') - elif widgit in ['curvesel']: - widgits_da[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Durable Action'), dynamic_resizing=False, button_color='#708090', fg_color='#778899', values=['device_servo_trq_feedback', '[max] device_servo_trq_feedback'], font=self.my_font) - widgits_da[widgit]['optionmenu'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col'], padx=5, pady=10, sticky='we') - widgits_da[widgit]['optionmenu'].set(widgits_da[widgit]['text']) - # For durable_action tab END ===================================================================== - # create textbox + # 2.3.2 create labels, entries and option menus + for widget in widgets_da: + if widget == 'path': + self.tabview.tab('Durable Action').columnconfigure(12, weight=1) + widgets_da[widget]['label'] = customtkinter.CTkLabel(self.tabview.tab('Durable Action'), text=f'{widget.upper()}', font=self.my_font) + widgets_da[widget]['label'].grid(row=widgets_da[widget]['row'], column=widgets_da[widget]['col'], sticky='e', padx=(20, 5), pady=10) + widgets_da[widget]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Durable Action'), placeholder_text=widgets_da[widget]['text'], font=self.my_font) + widgets_da[widget]['entry'].grid(row=widgets_da[widget]['row'], column=widgets_da[widget]['col']+1, columnspan=11, padx=(5, 10), pady=10, sticky='we') + elif widget in ['curvesel']: + widgets_da[widget]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Durable Action'), dynamic_resizing=False, button_color='#708090', fg_color='#778899', values=['device_servo_trq_feedback', '[max] device_servo_trq_feedback'], font=self.my_font) + widgets_da[widget]['optionmenu'].grid(row=widgets_da[widget]['row'], column=widgets_da[widget]['col'], padx=5, pady=10, sticky='we') + widgets_da[widget]['optionmenu'].set(widgets_da[widget]['text']) + # ===================================================================== + # 3. create textbox + # ===================================================================== self.textbox = customtkinter.CTkTextbox(self, wrap='none', font=customtkinter.CTkFont(family="consolas", size=14), text_color="blue", fg_color='#E9E9E9', border_width=2, border_color='#CDCDCD', border_spacing=5) - self.textbox.grid(row=6, column=1, columnspan=13, ipadx=10, ipady=10, padx=10, pady=(5, 10), sticky='nsew') + self.textbox.grid(row=1, column=1, columnspan=13, ipadx=10, ipady=10, padx=10, pady=(5, 10), sticky='nsew') self.textbox.configure(state='normal') + # functions below ↓ ---------------------------------------------------------------------------------------- + + def version_check(self): # ===================================================================== # version check cur_vers = self.label_version.cget("text").replace('\n', ' @ ').replace("Vers: ", '').replace("Date: ", '') @@ -192,13 +204,12 @@ class App(customtkinter.CTk): tkinter.messagebox.showwarning(title="版本更新", message=msg) except: tkinter.messagebox.showwarning(title="版本更新", message="连接服务器失败，无法确认当前是否是最新版本......") - # functions below ↓ ---------------------------------------------------------------------------------------- def create_canvas(self, _figure): self.canvas = FigureCanvasTkAgg(_figure, self.tabview.tab('Durable Action')) self.canvas.draw() self.canvas.get_tk_widget().configure(height=600) - self.canvas.get_tk_widget().grid(row=3, column=1, rowspan=3, columnspan=13, padx=20, pady=10, sticky="nsew") + self.canvas.get_tk_widget().grid(row=2, column=0, columnspan=13, padx=10, pady=10, sticky="nsew") def create_plot(self): rcParams['font.sans-serif'] = ['SimHei'] @@ -207,7 +218,7 @@ class App(customtkinter.CTk): rcParams['font.size'] = 14 rcParams['lines.marker'] = 'o' - curvesel = widgits_da['curvesel']['optionmenu'].get() + curvesel = widgets_da['curvesel']['optionmenu'].get() while True: if not self.hr.durable_lock: self.hr.durable_lock = 1 @@ -228,7 +239,7 @@ class App(customtkinter.CTk): if not df.equals(self.df_copy) or self.flg == 0 or curvesel != self.old_curve: self.flg = 1 self.df_copy = df.copy() - self.old_curve = widgits_da['curvesel']['optionmenu'].get() + self.old_curve = widgets_da['curvesel']['optionmenu'].get() close('all') _figure = figure(frameon=True, facecolor='#E9E9E9') subplots_adjust(left=0.04, right=0.98, bottom=0.1, top=0.95) @@ -276,6 +287,7 @@ class App(customtkinter.CTk): # self.tabview.configure(state='normal') def detect_network(self): + self.version_check() df = DataFrame(clibs.durable_data_current) df.to_excel(clibs.durable_data_current_xlsx, index=False) df = DataFrame(clibs.durable_data_current_max) @@ -319,130 +331,130 @@ class App(customtkinter.CTk): tab_name = self.tabview.get() self.textbox.delete(index1='1.0', index2='end') if tab_name == 'Data Process': - for widgit in widgits_dp: - if widgit in ['path', 'dur']: - widgits_dp[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') - widgits_dp[widgit]['entry'].delete(0, tkinter.END) - widgits_dp[widgit]['entry'].configure(placeholder_text=widgits_dp[widgit]['text'], state='normal') - widgits_dp[widgit]['entry'].configure(state='disabled') - elif widgit in ['vel', 'trq', 'trqh', 'estop']: - widgits_dp[widgit]['label'].configure(text=f'{widgit.upper()}', text_color="black") - widgits_dp[widgit]['optionmenu'].configure(state='normal') - widgits_dp[widgit]['optionmenu'].set('1') - widgits_dp[widgit]['optionmenu'].configure(state='disabled') + for widget in widgets_dp: + if widget in ['path', 'dur']: + widgets_dp[widget]['label'].configure(text=f'{widget.upper()}', text_color='black') + widgets_dp[widget]['entry'].delete(0, tkinter.END) + widgets_dp[widget]['entry'].configure(placeholder_text=widgets_dp[widget]['text'], state='normal') + widgets_dp[widget]['entry'].configure(state='disabled') + elif widget in ['vel', 'trq', 'trqh', 'estop']: + widgets_dp[widget]['label'].configure(text=f'{widget.upper()}', text_color="black") + widgets_dp[widget]['optionmenu'].configure(state='normal') + widgets_dp[widget]['optionmenu'].set('1') + widgets_dp[widget]['optionmenu'].configure(state='disabled') self.menu_sub_dp.grid_forget() elif tab_name == 'Automatic Test': - for widgit in widgits_at: - if widgit in ['path', ]: - widgits_at[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') - widgits_at[widgit]['entry'].delete(0, tkinter.END) - widgits_at[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') - widgits_at[widgit]['entry'].configure(state='disabled') - elif widgit in ['loadsel']: - widgits_at[widgit]['optionmenu'].configure(state='normal') - widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) - widgits_at[widgit]['optionmenu'].configure(state='disabled') + for widget in widgets_at: + if widget in ['path', ]: + widgets_at[widget]['label'].configure(text=f'{widget.upper()}', text_color='black') + widgets_at[widget]['entry'].delete(0, tkinter.END) + widgets_at[widget]['entry'].configure(placeholder_text=widgets_at[widget]['text'], state='normal') + widgets_at[widget]['entry'].configure(state='disabled') + elif widget in ['loadsel']: + widgets_at[widget]['optionmenu'].configure(state='normal') + widgets_at[widget]['optionmenu'].set(widgets_at[widget]['text']) + widgets_at[widget]['optionmenu'].configure(state='disabled') self.seg_button.set("功能切换") elif tab_name == 'Durable Action': - for widgit in widgits_da: - if widgit in ['path', ]: - widgits_da[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') - widgits_da[widgit]['entry'].delete(0, tkinter.END) - widgits_da[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') - elif widgit in ['curvesel']: - widgits_da[widgit]['optionmenu'].configure(state='normal') - widgits_da[widgit]['optionmenu'].set(widgits_da[widgit]['text']) + for widget in widgets_da: + if widget in ['path', ]: + widgets_da[widget]['label'].configure(text=f'{widget.upper()}', text_color='black') + widgets_da[widget]['entry'].delete(0, tkinter.END) + widgets_da[widget]['entry'].configure(placeholder_text=widgets_at[widget]['text'], state='normal') + elif widget in ['curvesel']: + widgets_da[widget]['optionmenu'].configure(state='normal') + widgets_da[widget]['optionmenu'].set(widgets_da[widget]['text']) def func_main_callback(self, func_name): self.initialization() tab_name = self.tabview.get() if tab_name == 'Data Process': if func_name == 'brake': - for widgit in widgits_dp: - if widgit in ['path']: - widgits_dp[widgit]['label'].configure(text_color='red') - widgits_dp[widgit]['entry'].configure(state='normal') - elif widgit in ['vel', 'trq', 'estop']: - widgits_dp[widgit]['label'].configure(text_color="red") - widgits_dp[widgit]['optionmenu'].configure(state='normal') + for widget in widgets_dp: + if widget in ['path']: + widgets_dp[widget]['label'].configure(text_color='red') + widgets_dp[widget]['entry'].configure(state='normal') + elif widget in ['vel', 'trq', 'estop']: + widgets_dp[widget]['label'].configure(text_color="red") + widgets_dp[widget]['optionmenu'].configure(state='normal') elif func_name == 'current': self.menu_sub_dp = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), values=["max", "avg", "cycle"], font=self.my_font, button_color='red', fg_color='green', command=self.func_sub_callback) - self.menu_sub_dp.grid(row=2, column=1, sticky='we', padx=5, pady=5) + self.menu_sub_dp.grid(row=1, column=0, sticky='we', padx=5, pady=5) self.menu_sub_dp.set("--select--") self.menu_sub_dp.configure(text_color='yellow') elif func_name == 'iso' or func_name == 'wavelogger': - for widgit in widgits_dp: - if widgit in ['path']: - widgits_dp[widgit]['label'].configure(text_color='red') - widgits_dp[widgit]['entry'].configure(state='normal') + for widget in widgets_dp: + if widget in ['path']: + widgets_dp[widget]['label'].configure(text_color='red') + widgets_dp[widget]['entry'].configure(state='normal') else: self.initialization() self.menu_main_dp.set("Start Here!") elif tab_name == 'Automatic Test': if func_name == 'brake': - for widgit in widgits_at: - if widgit in ['path',]: - widgits_at[widgit]['label'].configure(text_color='red') - widgits_at[widgit]['entry'].delete(0, tkinter.END) - widgits_at[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') - widgits_at[widgit]['entry'].configure(state='normal') - elif widgit in ['loadsel', ]: - widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) - widgits_at[widgit]['optionmenu'].configure(state='normal', text_color='red') + for widget in widgets_at: + if widget in ['path',]: + widgets_at[widget]['label'].configure(text_color='red') + widgets_at[widget]['entry'].delete(0, tkinter.END) + widgets_at[widget]['entry'].configure(placeholder_text=widgets_at[widget]['text'], state='normal') + widgets_at[widget]['entry'].configure(state='normal') + elif widget in ['loadsel', ]: + widgets_at[widget]['optionmenu'].set(widgets_at[widget]['text']) + widgets_at[widget]['optionmenu'].configure(state='normal', text_color='red') elif func_name == 'current': - for widgit in widgits_at: - if widgit in ['path',]: - widgits_at[widgit]['label'].configure(text_color='red') - widgits_at[widgit]['entry'].delete(0, tkinter.END) - widgits_at[widgit]['entry'].configure(placeholder_text=widgits_at[widgit]['text'], state='normal') - widgits_at[widgit]['entry'].configure(state='normal') - elif widgit in ['loadsel', ]: - widgits_at[widgit]['optionmenu'].set(widgits_at[widgit]['text']) - widgits_at[widgit]['optionmenu'].configure(state='normal', text_color='red') + for widget in widgets_at: + if widget in ['path',]: + widgets_at[widget]['label'].configure(text_color='red') + widgets_at[widget]['entry'].delete(0, tkinter.END) + widgets_at[widget]['entry'].configure(placeholder_text=widgets_at[widget]['text'], state='normal') + widgets_at[widget]['entry'].configure(state='normal') + elif widget in ['loadsel', ]: + widgets_at[widget]['optionmenu'].set(widgets_at[widget]['text']) + widgets_at[widget]['optionmenu'].configure(state='normal', text_color='red') else: self.initialization() self.menu_main_at.set("Start Here!") def func_sub_callback(self, func_name): if func_name == "max" or func_name == "avg": - for widgit in widgits_dp: - if widgit in ['path']: - widgits_dp[widgit]['label'].configure(text_color='red') - widgits_dp[widgit]['entry'].delete(0, tkinter.END) - widgits_dp[widgit]['entry'].configure(placeholder_text=widgits_dp[widgit]['text'], state='normal') - widgits_dp[widgit]['entry'].configure(state='normal') - elif widgit in ['dur']: - widgits_dp[widgit]['label'].configure(text_color='black') - widgits_dp[widgit]['entry'].delete(0, tkinter.END) - widgits_dp[widgit]['entry'].configure(placeholder_text=widgits_dp[widgit]['text'], state='normal') - widgits_dp[widgit]['entry'].configure(state='disabled') - elif widgit in ['vel', 'trqh', 'estop']: - widgits_dp[widgit]['label'].configure(text_color='black') - widgits_dp[widgit]['optionmenu'].set('1') - widgits_dp[widgit]['optionmenu'].configure(state='disabled') - elif widgit in ['trq']: - widgits_dp[widgit]['label'].configure(text_color='red') - widgits_dp[widgit]['optionmenu'].set('1') - widgits_dp[widgit]['optionmenu'].configure(state='normal') + for widget in widgets_dp: + if widget in ['path']: + widgets_dp[widget]['label'].configure(text_color='red') + widgets_dp[widget]['entry'].delete(0, tkinter.END) + widgets_dp[widget]['entry'].configure(placeholder_text=widgets_dp[widget]['text'], state='normal') + widgets_dp[widget]['entry'].configure(state='normal') + elif widget in ['dur']: + widgets_dp[widget]['label'].configure(text_color='black') + widgets_dp[widget]['entry'].delete(0, tkinter.END) + widgets_dp[widget]['entry'].configure(placeholder_text=widgets_dp[widget]['text'], state='normal') + widgets_dp[widget]['entry'].configure(state='disabled') + elif widget in ['vel', 'trqh', 'estop']: + widgets_dp[widget]['label'].configure(text_color='black') + widgets_dp[widget]['optionmenu'].set('1') + widgets_dp[widget]['optionmenu'].configure(state='disabled') + elif widget in ['trq']: + widgets_dp[widget]['label'].configure(text_color='red') + widgets_dp[widget]['optionmenu'].set('1') + widgets_dp[widget]['optionmenu'].configure(state='normal') elif func_name == 'cycle': - for widgit in widgits_dp: - if widgit in ['path', 'dur']: - color = 'blue' if widgit == 'dur' else 'red' - widgits_dp[widgit]['label'].configure(text_color=color) - widgits_dp[widgit]['entry'].delete(0, tkinter.END) - widgits_dp[widgit]['entry'].configure(placeholder_text=widgits_dp[widgit]['text'], state='normal') - widgits_dp[widgit]['entry'].configure(state='normal') - elif widgit in ['vel', 'trq', 'trqh']: - color = 'blue' if widgit == 'trqh' else 'red' - widgits_dp[widgit]['label'].configure(text_color=color) - widgits_dp[widgit]['optionmenu'].set('1') - widgits_dp[widgit]['optionmenu'].configure(state='normal') - elif widgit in ['estop']: - widgits_dp[widgit]['label'].configure(text_color="black") - widgits_dp[widgit]['optionmenu'].set('1') - widgits_dp[widgit]['optionmenu'].configure(state='disabled') + for widget in widgets_dp: + if widget in ['path', 'dur']: + color = 'blue' if widget == 'dur' else 'red' + widgets_dp[widget]['label'].configure(text_color=color) + widgets_dp[widget]['entry'].delete(0, tkinter.END) + widgets_dp[widget]['entry'].configure(placeholder_text=widgets_dp[widget]['text'], state='normal') + widgets_dp[widget]['entry'].configure(state='normal') + elif widget in ['vel', 'trq', 'trqh']: + color = 'blue' if widget == 'trqh' else 'red' + widgets_dp[widget]['label'].configure(text_color=color) + widgets_dp[widget]['optionmenu'].set('1') + widgets_dp[widget]['optionmenu'].configure(state='normal') + elif widget in ['estop']: + widgets_dp[widget]['label'].configure(text_color="black") + widgets_dp[widget]['optionmenu'].set('1') + widgets_dp[widget]['optionmenu'].configure(state='disabled') def write2textbox(self, text, wait=0, exitcode=0, color='blue', tab_name='Data Process'): self.textbox.tag_add(color, 'insert', 'end') @@ -497,10 +509,10 @@ class App(customtkinter.CTk): if tab_name == 'Data Process': func_name = self.menu_main_dp.get() if func_name == 'brake': - path = widgits_dp['path']['entry'].get().strip() - vel = widgits_dp['vel']['optionmenu'].get() - trq = widgits_dp['trq']['optionmenu'].get() - estop = widgits_dp['estop']['optionmenu'].get() + path = widgets_dp['path']['entry'].get().strip() + vel = widgets_dp['vel']['optionmenu'].get() + trq = widgets_dp['trq']['optionmenu'].get() + estop = widgets_dp['estop']['optionmenu'].get() c1 = exists(path) c2 = True if len({vel, trq, estop}) == 3 else False @@ -510,11 +522,11 @@ class App(customtkinter.CTk): return 0, 0 # ======================================================= elif func_name == 'current': - path = widgits_dp['path']['entry'].get().strip() - dur = widgits_dp['dur']['entry'].get().strip() - vel = widgits_dp['vel']['optionmenu'].get() - trq = widgits_dp['trq']['optionmenu'].get() - trqh = widgits_dp['trqh']['optionmenu'].get() + path = widgets_dp['path']['entry'].get().strip() + dur = widgets_dp['dur']['entry'].get().strip() + vel = widgets_dp['vel']['optionmenu'].get() + trq = widgets_dp['trq']['optionmenu'].get() + trqh = widgets_dp['trqh']['optionmenu'].get() sub = self.menu_sub_dp.get() c1 = exists(path) @@ -533,14 +545,14 @@ class App(customtkinter.CTk): return 0, 0 # ======================================================= elif func_name == 'iso': - path = widgits_dp['path']['entry'].get().strip() + path = widgets_dp['path']['entry'].get().strip() if exists(path): return 3, path else: return 0, 0 # ======================================================= elif func_name == 'wavelogger': - path = widgits_dp['path']['entry'].get().strip() + path = widgets_dp['path']['entry'].get().strip() if exists(path): return 4, path else: @@ -551,8 +563,8 @@ class App(customtkinter.CTk): elif tab_name == 'Automatic Test': func_name = self.menu_main_at.get() if func_name == 'brake': - path = widgits_at['path']['entry'].get().strip() - loadsel = widgits_at['loadsel']['optionmenu'].get() + path = widgets_at['path']['entry'].get().strip() + loadsel = widgets_at['loadsel']['optionmenu'].get() c1 = exists(path) c2 = loadsel in ['tool100', 'tool66', 'tool33'] if c1 and c2: @@ -560,8 +572,8 @@ class App(customtkinter.CTk): else: return 0, 0 elif func_name == 'current': - path = widgits_at['path']['entry'].get().strip() - loadsel = widgits_at['loadsel']['optionmenu'].get() + path = widgets_at['path']['entry'].get().strip() + loadsel = widgets_at['loadsel']['optionmenu'].get() c1 = exists(path) c2 = loadsel in ['tool100', 'inertia'] if c1 and c2: @@ -571,8 +583,8 @@ class App(customtkinter.CTk): else: return 0, 0 elif tab_name == 'Durable Action': - path = widgits_da['path']['entry'].get().strip() - curvesel = widgits_da['curvesel']['optionmenu'].get() + path = widgets_da['path']['entry'].get().strip() + curvesel = widgets_da['curvesel']['optionmenu'].get() c1 = exists(path) c2 = curvesel in ['device_servo_trq_feedback', '[max] device_servo_trq_feedback'] if c1 and c2: diff --git a/aio/code/commons/clibs.py b/aio/code/commons/clibs.py index 32f4d1a..d5919b6 100644 --- a/aio/code/commons/clibs.py +++ b/aio/code/commons/clibs.py @@ -78,7 +78,7 @@ log_dicts = { 'formatter': 'test', }, 'hmi.log': { - 'level': 'DEBUG', + 'level': 'WARNING', 'class': 'concurrent_log_handler.ConcurrentRotatingFileHandler', 'filename': log_data_hmi, 'maxBytes': 1024*1024*50, diff --git a/aio/code/commons/openapi.py b/aio/code/commons/openapi.py index 7e458e0..652926a 100644 --- a/aio/code/commons/openapi.py +++ b/aio/code/commons/openapi.py @@ -261,7 +261,7 @@ class HmiRequest(object): def msg_storage(self, response, flag=0): # response是解码后的字符串 messages = self.c_msg if flag == 0 else self.c_msg_xs - logger.debug(f"{loads(response)}") + logger.warning(f"{loads(response)}") if 'move.monitor' in response: pass elif len(messages) < 10000: