From 75e8ff1797061acacd1484d4e86a8d70ac75cdd2 Mon Sep 17 00:00:00 2001 From: Yusuke Ogawa Date: Wed, 4 Sep 2024 18:18:16 +0900 Subject: [PATCH] ver2.3.0(b) ver2.3.0(b) --- network_sketcher.py | 29 +- network_sketcher_dev.py | 2 +- ns_extensions.py | 1285 ++++++++++++++++++++------------------- ns_l2_diagram_create.py | 418 ++++++------- 4 files changed, 875 insertions(+), 859 deletions(-) diff --git a/network_sketcher.py b/network_sketcher.py index e572db5..df81a1f 100644 --- a/network_sketcher.py +++ b/network_sketcher.py @@ -33,7 +33,7 @@ def __init__(self): self.click_value_2nd = '' self.click_value_3rd = '' self.root = TkinterDnD.Tk() - self.root.title("Network Sketcher ver 2.3.0(a)") + self.root.title("Network Sketcher ver 2.3.0(b)") self.root.geometry("490x200+100+100") # Notebook @@ -486,7 +486,7 @@ def sub_excel_master_1(self,file_type_array): ### run 2-4-x for dev , Create L1 diagram self.sub2_2x = tk.LabelFrame(self.sub2_1, text='Create Diagram files', font=("", 14), height=1, background="#FBE5D6") - self.sub2_2x.grid(row=1, column=0, columnspan=7, sticky='W', padx=5, pady=5, ipadx=5, ipady=5) + self.sub2_2x.grid(row=1, column=0, columnspan=7, sticky='W', padx=5, pady=0, ipadx=5, ipady=5) self.sub2_2 = tk.LabelFrame(self.sub2_2x, text='Layer1 Diagram', font=("", 14), height=1, background="#FEF6F0") self.sub2_2.grid(row=1, column=0, columnspan=7, sticky='W', padx=5, pady=5, ipadx=5, ipady=5) @@ -505,15 +505,26 @@ def sub_excel_master_1(self,file_type_array): self.sub2_3 = tk.LabelFrame(self.sub2_2x, text='Layer2 Diagram', font=("", 14), height=1, background="#FEF6F0") self.sub2_3.grid(row=4, column=0, sticky='W', padx=5, pady=5, ipadx=5, ipady=5) + ## Add at ve 2.3.0(b) + optionL2_3_6 = ns_extensions.ip_report.get_folder_list(self) + optionL2_3_6 = [item for item in optionL2_3_6 if item != '_WAN(Way_Point)_'] + global variableL2_3_6 + variableL2_3_6 = tk.StringVar() + self.comboL2_3_6 = ttk.Combobox(self.sub2_3 , values=optionL2_3_6, textvariable=variableL2_3_6, font=("", 12), state='readonly') + self.comboL2_3_6.set("