From cf3b9050d0266a251d36feed1109a5e82d3b30c1 Mon Sep 17 00:00:00 2001 From: bettleChen <2207153529@qq.com> Date: Thu, 11 Jan 2024 09:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 16 ++-------- NetworkAnalog/NetworkAnalog.py | 52 ++++++++++++++++++-------------- NetworkAnalog/SimObjs.py | 17 ++++++++--- NetworkAnalog/network.db | Bin 40960 -> 40960 bytes NetworkAnalog/test.py | 21 +++++++++++++ NetworkAnalog/tkTest.py | 34 --------------------- NetworkAnalog/x1_test.py | 53 ++++++++++++++++++++++++--------- NetworkAnalog/x2_test.py | 33 -------------------- 8 files changed, 105 insertions(+), 121 deletions(-) create mode 100644 NetworkAnalog/test.py delete mode 100644 NetworkAnalog/tkTest.py delete mode 100644 NetworkAnalog/x2_test.py diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index ba6eba2..427aed5 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,24 +1,12 @@ - + sqlite.xerial true org.sqlite.JDBC - jdbc:sqlite:$PROJECT_DIR$/../网络仿真/NetworkAnalog/network.db + jdbc:sqlite:$PROJECT_DIR$/NetworkAnalog/network.db $ProjectFileDir$ - - sqlite.xerial - true - org.sqlite.JDBC - jdbc:sqlite:D:\头哥\NetworkAnalog\datas\network.db - $ProjectFileDir$ - - - file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.40.1/org/xerial/sqlite-jdbc/3.40.1.0/sqlite-jdbc-3.40.1.0.jar - - - \ No newline at end of file diff --git a/NetworkAnalog/NetworkAnalog.py b/NetworkAnalog/NetworkAnalog.py index 3ab7bcc..c28b3a4 100644 --- a/NetworkAnalog/NetworkAnalog.py +++ b/NetworkAnalog/NetworkAnalog.py @@ -205,7 +205,7 @@ class NetWorkAnalog(Canvas): for tag_id, tag in self.AllSimObjs.items(): self.tag_bind(tag.ObjID, "", lambda event, tag=tag: show_menu(event, tag)) # 绑定右击事件 - def bind_event(self, component, name): + def add_sim_obj(self, component, name): # todo: 绑定事件 """ 绑定事件 @@ -305,9 +305,9 @@ class NetWorkAnalog(Canvas): conn_obj.ConfigCorrect = key[1] self.tag_bind_event() - def show_obj(self, AllSimObj, conns): + def show_obj(self, AllSimObj, AllSimConn): self.AllSimObjs = AllSimObj - self.conns = conns + self.conns = AllSimConn for key, sim_obj in self.AllSimObjs.items(): sim_obj.create_img() for conn in self.conns: @@ -517,7 +517,7 @@ class NetWorkAnalog(Canvas): addr_en.grid(row=1, column=3, padx=10) def commit(): self.chose_obj.config(datas) - self.message.show_message(f"组件 {self.chose_obj} 网络配置成功！") + self.message.show_message(f"组件 {self.chose_obj.ObjLabel} 网络配置成功！") child_r.destroy() tk.Button(ifs_frame_YN, text='确定', font=('黑体', 16), height=1, command=commit).grid(row=0, column=0, @@ -855,42 +855,50 @@ class NetWorkAnalog(Canvas): sticky='e', pady=10) def create_config_button(self): + font_size = 16 + font_style = ("Arial", font_size) + style = ttk.Style() + style.configure("TMenubutton", font=font_style) # 创建一个菜单栏，这里我们可以把他理解成一个容器，在窗口的上方 - menubar = tk.Menu(root) + menubar = tk.Menu(root, font=font_style) # 定义一个空菜单单元 - setMenu = tk.Menu(menubar, tearoff=0) - menubar.add_cascade(label='删除与修改', menu=setMenu) + setMenu = tk.Menu(menubar, tearoff=0, font=font_style) + menubar.add_cascade(label='删除与修改', menu=setMenu, font=font_style) setMenu.add_command(label='删除对象', command=self.delete_obj) setMenu.add_command(label='删除连接线', command=self.delete_line) setMenu.add_command(label='修改标签', command=self.update_tag_name) # # 定义一个空菜单单元 - setMenu = tk.Menu(menubar, tearoff=0) - menubar.add_cascade(label='基础配置', menu=setMenu) + setMenu = tk.Menu(menubar, tearoff=0, font=font_style) + menubar.add_cascade(label='基础配置', menu=setMenu, font=font_style) setMenu.add_command(label='网络配置', command=self.network_config) setMenu.add_command(label='路由表配置', command=self.router_table_config) setMenu.add_command(label='交换表配置', command=self.mac_table_config) root.config(menu=menubar) # 定义一个空菜单单元 - setMenu = tk.Menu(menubar, tearoff=0) - menubar.add_cascade(label='显示设置', menu=setMenu) + setMenu = tk.Menu(menubar, tearoff=0, font=font_style) + menubar.add_cascade(label='显示设置', menu=setMenu, font=font_style) setMenu.add_command(label='显示/不显示标签', command=self.show_label) setMenu.add_command(label='显示/不显示接口', command=self.show_interface) setMenu.add_command(label='显示网络配置信息', command=self.show_network_config) setMenu.add_command(label='显示路由/交换表信息', command=self.show_router_config) # 定义一个空菜单单元 - setMenu = tk.Menu(menubar, tearoff=0) - menubar.add_cascade(label='发送数据包', menu=setMenu) + setMenu = tk.Menu(menubar, tearoff=0, font=font_style) + menubar.add_cascade(label='发送数据包', menu=setMenu, font=font_style) setMenu.add_command(label='发送数据包', command=self.send_packet) setMenu.add_command(label='批量发送数据包', command=self.send_packet_list) - menubar.add_command(label='清除屏幕', command=self.clear_canvas) - menubar.add_command(label='导出数据', command=self.export_data) - menubar.add_command(label='导入数据', command=self.import_data) - menubar.add_command(label='校验', command=self.check_network) + menubar.add_command(label='清除屏幕', command=self.clear_canvas, font=font_style) + menubar.add_command(label='导出数据', command=self.export_data, font=font_style) + menubar.add_command(label='导入数据', command=self.import_data, font=font_style) + menubar.add_command(label='校验', command=self.check_network, font=font_style) + # 设置字体大小 + for menu in menubar.winfo_children(): + menu.config(font=font_style) + for item in menu.winfo_children(): + item.config(font=font_style) root.config(menu=menubar) def create_widget(self): - # todo: 创建页面 """ 创建整体页面布局 :return: @@ -911,10 +919,10 @@ class NetWorkAnalog(Canvas): hub = self.create_image(img_height, split_width * 3, image=self.hub_img, anchor="nw") self.create_text(text_height, split_width * 4 + 40, text="主机", anchor="nw", font=('微软雅黑', 18, 'bold')) # 显示文字 host = self.create_image(img_height, split_width * 4, image=self.host_img, anchor="nw") - self.bind_event(router, "路由器") - self.bind_event(switch, "交换机") - self.bind_event(hub, "集线器") - self.bind_event(host, "主机") + self.add_sim_obj(router, "路由器") + self.add_sim_obj(switch, "交换机") + self.add_sim_obj(hub, "集线器") + self.add_sim_obj(host, "主机") if __name__ == '__main__': diff --git a/NetworkAnalog/SimObjs.py b/NetworkAnalog/SimObjs.py index 4eedab3..bf08d68 100644 --- a/NetworkAnalog/SimObjs.py +++ b/NetworkAnalog/SimObjs.py @@ -303,9 +303,17 @@ class AllSimConnect(): nodex_update_sql = f""" update conn_config set ip='{node.interface[ifs - 1]["ip"]}', - mac='{node.interface[ifs - 1]["mac"]}', - conn_port='{node.interface[ifs - 1]["conn_port"]}', - addr='{node.interface[ifs - 1]["addr"]}' + mac='{node.interface[ifs - 1]["mac"]}' + """ + if not node.interface[ifs - 1]["conn_port"] == "NULL": + nodex_update_sql += f""" + ,conn_port='{int(node.interface[ifs - 1]["conn_port"])}' + """ + if not node.interface[ifs - 1]["addr"] == "NULL": + nodex_update_sql += f""" + ,addr='{node.interface[ifs - 1]["addr"]}' + """ + nodex_update_sql += f""" where node_id='{node.ObjID}' and node_ifs={ifs} """ execute_sql(nodex_update_sql) @@ -319,7 +327,8 @@ class AllSimConnect(): """ execute_sql(update_sql) except Exception as E: - pass + print(E) + self.canvas.message.show_message(f"{E}") def check_config(self): """ diff --git a/NetworkAnalog/network.db b/NetworkAnalog/network.db index 6f4a422d66c83320aff5be1c309d35a366b945f8..e7747640dbfb9879ea02cda3308df2ce258f1589 100644 GIT binary patch literal 40960 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 Xx*5mjJ=>IcI93ra5@ z!h(k+EPC*efDybXD&t8(B6v`OH&H>n1jR!V*K%gEy8a7#+O7^buHBzt;|A z|1p54Z}wjX;Pmvia~6Q-r%Ui2IHd@d`@06ZiC#l1@JDzBz6iU6ZwGsWGtPg`7tSlr z!~I|TH~YKO<+Y7|?k#s$CqRLW3+J~4zOcPTV;*FQClXBJIL1N-8IG8YaT*9OV6HC+ z4O`xc8jd%{Sst3hAPz~&0#1EdaIg_2ii8DZbg;fM%=xCH6|HJTN{m+2=p<&Ph*HHC zj{Aqlnvpa)mPzyST!A9-HS3UA!2=_o0rG9YskiCH8gEK;uO zfCermBqnZ>OPR)LHuKljI>ueCqjIDmY2?Vv5N&TTw(l3>9w{V0R8k6=*(&sDHaay! zibV4xN$%sQgm6XSZnm|K>MSLNpUE&)rr<0K!W@f?xHyOj$C328AF0MjLN?PuHH#Rx zYK~A{BdVBdEDs>5JHlVE3MG#gbyjky7R?v-=%Er_Xq0Z6g%nM5eygBq)ai98lwJho zd4~R(LzXBBRTByiCoE8P;`u(7EQm47(u9OrBoh|Tu~Z#o^MRf_C)6Oig05ZNUD06| z?ilDcdKbkA!+Y=>_zv7r3(mrvcUzO*$tKNFZAR9a5O!+A&R7a!cx5|&3 zFBPnFNK=#I+ZrM zZlJ%>@8~D=9r_Y|jIOIh?xWnXt<~Oa01Kz1quK0p+GSKuAg5J}T*oS-vKbw-jLL>^ zfR1K$t#4Bs-7wHU=mz=&{fxds-=j~|pZYUhS$i8Dpx4`Zbq5H0V6B2f37sk`CA902 z+p3~cf>lMO1k