fixing merge

aio/code/aio.py

@@ -34,24 +34,6 @@ widgits_dp = {
 widgits_at = {
     'path': {'label': '', 'entry': '', 'row': 2, 'col': 2, 'text': '数据文件夹路径'},
     'loadsel': {'label': '', 'optionmenu': '', 'row': 2, 'col': 1, 'text': '负载信息'},
-    'av1': {'label': '', 'entry': '', 'row': 3, 'col': 2, 'text': '角速度'},
-    'av2': {'label': '', 'entry': '', 'row': 3, 'col': 4, 'text': '角速度'},
-    'av3': {'label': '', 'entry': '', 'row': 3, 'col': 6, 'text': '角速度'},
-    'av4': {'label': '', 'entry': '', 'row': 3, 'col': 8, 'text': '角速度'},
-    'av5': {'label': '', 'entry': '', 'row': 3, 'col': 10, 'text': '角速度'},
-    'av6': {'label': '', 'entry': '', 'row': 3, 'col': 12, 'text': '角速度'},
-    'rc1': {'label': '', 'entry': '', 'row': 4, 'col': 2, 'text': '额定电流'},
-    'rc2': {'label': '', 'entry': '', 'row': 4, 'col': 4, 'text': '额定电流'},
-    'rc3': {'label': '', 'entry': '', 'row': 4, 'col': 6, 'text': '额定电流'},
-    'rc4': {'label': '', 'entry': '', 'row': 4, 'col': 8, 'text': '额定电流'},
-    'rc5': {'label': '', 'entry': '', 'row': 4, 'col': 10, 'text': '额定电流'},
-    'rc6': {'label': '', 'entry': '', 'row': 4, 'col': 12, 'text': '额定电流'},
-    'rr1': {'label': '', 'entry': '', 'row': 5, 'col': 2, 'text': '额定转速'},
-    'rr2': {'label': '', 'entry': '', 'row': 5, 'col': 4, 'text': '额定转速'},
-    'rr3': {'label': '', 'entry': '', 'row': 5, 'col': 6, 'text': '额定转速'},
-    'rr4': {'label': '', 'entry': '', 'row': 5, 'col': 8, 'text': '额定转速'},
-    'rr5': {'label': '', 'entry': '', 'row': 5, 'col': 10, 'text': '额定转速'},
-    'rr6': {'label': '', 'entry': '', 'row': 5, 'col': 12, 'text': '额定转速'},
 }
 
 
@@ -147,12 +129,6 @@ class App(customtkinter.CTk):
                 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 ['av1', 'av2', 'av3', 'av4', 'av5', 'av6', 'rc1', 'rc2', 'rc3', 'rc4', 'rc5', 'rc6', 'rr1', 'rr2', 'rr3', 'rr4', 'rr5', 'rr6']:
-                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', pady=5)
-                widgits_at[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Automatic Test'), width=self.w_param, placeholder_text=f"{widgits_at[widgit]['text']}", font=self.my_font)
-                widgits_at[widgit]['entry'].grid(row=widgits_at[widgit]['row'], column=widgits_at[widgit]['col']+1, padx=(5, 10), pady=5, sticky='w')
-                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"], 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')
@@ -162,7 +138,7 @@ class App(customtkinter.CTk):
         # 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.configure(state='disabled')
+        self.textbox.configure(state='normal')
         # =====================================================================
         # version check
         cur_vers = self.label_version.cget("text").replace('\n', ' @ ').replace("Vers: ", '').replace("Date: ", '')
@@ -187,13 +163,12 @@ class App(customtkinter.CTk):
         value = self.seg_button.get()
 
         self.seg_button.configure(state='disabled')
-        self.textbox.configure(state='normal')
         # self.tabview.configure(state='disabled')
         self.textbox.delete(index1='1.0', index2='end')
         with open(f'{current_path}/../assets/templates/heartbeat', 'r', encoding='utf-8') as f_h:
-            connection_state = f_h.read().strip()
+            c_state = f_h.read().strip()
 
-        if connection_state == '0' and value != '功能切换':
+        if c_state == '0' and value != '功能切换':
             self.write2textbox("无法连接机器人，检查是否已经使用Robot Assist软件连接机器，重试中...", 0, 50, 'red')
         else:
             for _func in _btn_funcs:
@@ -202,23 +177,29 @@ class App(customtkinter.CTk):
                     break
 
         self.seg_button.configure(state='normal')
-        self.textbox.configure(state='disable')
         # self.tabview.configure(state='normal')
 
     def detect_network(self):
-        with open(f"{current_path}/../assets/templates/heartbeat", "w", encoding='utf-8') as f_h:
-            f_h.write('0')
+        with open(f"{current_path}/../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb:
+            f_hb.write('0')
+        self.hr = openapi.HmiRequest(self.write2textbox)
+
         while True:
-            with open(f'{current_path}/../assets/templates/heartbeat', 'r', encoding='utf-8') as f_h:
-                pb_color = 'green' if f_h.read().strip() == '1' else 'red'
+            with open(f'{current_path}/../assets/templates/heartbeat', 'r', encoding='utf-8') as f_hb:
+                c_state = f_hb.read().strip()
+                pb_color = 'green' if c_state == '1' else 'red'
                 self.progressbar.configure(progress_color=pb_color)
-            sleep(1)
+                if c_state == '0':
+                    # self.textbox.delete(index1='1.0', index2='end')
+                    self.hr.t_bool = False
+                    sleep(4)
+                    del self.hr
+                    self.hr = openapi.HmiRequest(self.write2textbox)
+            sleep(3)
 
     def tabview_click(self):
         self.initialization()
-        self.textbox.configure(state='normal')
-        self.textbox.delete(index1='1.0', index2='end')
-        self.textbox.configure(state='disabled')
+        # self.textbox.delete(index1='1.0', index2='end')
 
         tab_name = self.tabview.get()
         if tab_name == 'Data Process':
@@ -226,23 +207,10 @@ class App(customtkinter.CTk):
         elif tab_name == 'Automatic Test':
             self.menu_main_at.set("Start Here!")
             self.seg_button.configure(state='normal')
-            with open(f"{current_path}/../assets/templates/heartbeat", "w", encoding='utf-8') as f_h:
-                f_h.write('0')
-
-            self.textbox.configure(state='normal')
-            try:
-                self.hr.close_sock()
-                self.hr = openapi.HmiRequest(self.write2textbox)
-            except:
-                self.hr = openapi.HmiRequest(self.write2textbox)
-
-            # if connection_state == '0' or self.hr is None:
-            #     self.textbox.configure(state='normal')
-            #     self.hr = openapi.HmiRequest(self.write2textbox)
-                # self.textbox.configure(state='disabled')
 
     def initialization(self):
         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']:
@@ -257,8 +225,6 @@ class App(customtkinter.CTk):
                     widgits_dp[widgit]['optionmenu'].configure(state='disabled')
 
             self.menu_sub_dp.grid_forget()
-            self.textbox.delete(index1='1.0', index2='end')
-            self.textbox.configure(state='disabled')
         elif tab_name == 'Automatic Test':
             for widgit in widgits_at:
                 if widgit in ['path', 'av1', 'av2', 'av3', 'av4', 'av5', 'av6', 'rc1', 'rc2', 'rc3', 'rc4', 'rc5', 'rc6', 'rr1', 'rr2', 'rr3', 'rr4', 'rr5', 'rr6']:
@@ -299,7 +265,29 @@ class App(customtkinter.CTk):
                 self.initialization()
                 self.menu_main_dp.set("Start Here!")
         elif tab_name == 'Automatic Test':
-            pass
+            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')
+            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(text_color='black', state='disabled')
+            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":
@@ -340,24 +328,25 @@ class App(customtkinter.CTk):
                     widgits_dp[widgit]['optionmenu'].set('1')
                     widgits_dp[widgit]['optionmenu'].configure(state='disabled')
 
-    def write2textbox(self, text, wait=0, exitcode=0, color='blue'):
+    def write2textbox(self, text, wait=0, exitcode=0, color='blue', tab_name='Data Process'):
         self.textbox.tag_add(color, 'insert', 'end')
         self.textbox.tag_config(tagName=color, foreground=color)
+        tab_name_cur = self.tabview.get()
 
-        if wait != 0:
-            self.textbox.insert(index='end', text=text, tags=color)
-            self.textbox.update()
-            self.textbox.see('end')
-        elif exitcode != 0:
-            self.textbox.insert(index='end', text=text + '\n', tags=color)
-            self.textbox.update()
-            self.textbox.see('end')
-            self.textbox.configure(state='disabled')
-            raise Exception(f"Error code: {exitcode}")
-        else:
-            self.textbox.insert(index='end', text=text + '\n', tags=color)
-            self.textbox.update()
-            self.textbox.see('end')
+        if tab_name == tab_name_cur:
+            if wait != 0:
+                self.textbox.insert(index='end', text=text, tags=color)
+                self.textbox.update()
+                self.textbox.see('end')
+            elif exitcode != 0:
+                self.textbox.insert(index='end', text=text + '\n', tags=color)
+                self.textbox.update()
+                self.textbox.see('end')
+                raise Exception(f"Error code: {exitcode}")
+            else:
+                self.textbox.insert(index='end', text=text + '\n', tags=color)
+                self.textbox.update()
+                self.textbox.see('end')
 
     def is_float(self, flag, *args):
         for item in args:
@@ -414,16 +403,14 @@ class App(customtkinter.CTk):
             # =======================================================
             elif func_name == 'iso':
                 path = widgits_dp['path']['entry'].get().strip()
-                c1 = exists(path)
-                if c1:
+                if exists(path):
                     return 3, path
                 else:
                     return 0, 0
             # =======================================================
             elif func_name == 'wavelogger':
                 path = widgits_dp['path']['entry'].get().strip()
-                c1 = exists(path)
-                if c1:
+                if exists(path):
                     return 4, path
                 else:
                     return 0, 0
@@ -433,16 +420,28 @@ class App(customtkinter.CTk):
         elif tab_name == 'Automatic Test':
             func_name = self.menu_main_at.get()
             if func_name == 'brake':
-                pass
+                path = widgits_at['path']['entry'].get().strip()
+                loadsel = widgits_at['loadsel']['optionmenu'].get()
+                c1 = exists(path)
+                c2 = loadsel in ['tool100', 'tool66', 'tool33']
+                if c1 and c2:
+                    return 5, path, loadsel
+                else:
+                    return 0, 0
             elif func_name == 'current':
-                pass
+                path = widgits_at['path']['entry'].get().strip()
+                if exists(path):
+                    return 6, path
+                else:
+                    return 0, 0
+            else:
+                return 0, 0
 
     def func_start_callback(self):
-        self.textbox.configure(state='normal')
         self.textbox.delete(index1='1.0', index2='end')
 
         flag, *args = self.check_param()
-        func_dict = {1: brake.main, 2: current.main, 3: iso.main, 4: wavelogger.main}
+        func_dict = {1: brake.main, 2: current.main, 3: iso.main, 4: wavelogger.main, 5: do_brake.main}
         if flag == 1:
             func_dict[flag](path=args[0], vel=args[1], trq=args[2],  estop=args[3], w2t=self.write2textbox)
         elif flag == 2:
@@ -451,13 +450,12 @@ class App(customtkinter.CTk):
             func_dict[flag](path=args[0], w2t=self.write2textbox)
         elif flag == 4:
             func_dict[flag](path=args[0], w2t=self.write2textbox)
+        elif flag == 5:
+            func_dict[flag](path=args[0], hr=self.hr, loadsel=args[1], w2t=self.write2textbox)
         else:
             tkinter.messagebox.showerror(title="参数错误", message="请检查对应参数是否填写正确！", )
 
-        self.textbox.configure(state='disabled')
-
     def func_check_callback(self):
-        self.textbox.configure(state='normal')
         self.textbox.delete(index1='1.0', index2='end')
 
         flag, *args = self.check_param()
@@ -466,8 +464,6 @@ class App(customtkinter.CTk):
         else:
             tkinter.messagebox.showerror(title="参数错误", message="需要检查对应参数是否填写正确！", )
 
-        self.textbox.configure(state='disabled')
-
     def func_log_callback(self):
         content = self.textbox.get(index1='1.0', index2='end')
         if len(content) > 1: