Ver2.3.3

Ver2.3.3

network_sketcher.py

@@ -41,7 +41,7 @@ def __init__(self):
         self.click_value_3rd = ''
         self.click_value_VPN = ''
         self.root = TkinterDnD.Tk()
-        self.root.title("Network Sketcher  ver 2.3.2(b)")
+        self.root.title("Network Sketcher  ver 2.3.3")
         self.root.geometry("490x200+100+100")
 
         # Notebook
@@ -219,7 +219,6 @@ def sub_ppt_sketch_1(self,file_type_array):
         self.sub1_3.drop_target_register(DND_FILES)
         self.sub1_3.dnd_bind("<<Drop>>", self.drop_sub1_3 ,self.entry_name_sub1_3)
 
-
     def drop_sub1_3(self, event):
         if event:
             event.data = event.data.replace('{', '').replace('}', '')

network_sketcher_dev.py

@@ -480,6 +480,7 @@ def __init__(self):
 
     def click_action(self,click_value):
         self.click_value_l3 = ''
+
         if click_value == '1-1': # select browse
             fTyp = [("", ".pptx")]
             iDir = os.path.abspath(os.path.dirname(sys.argv[0]))
@@ -1209,6 +1210,8 @@ def click_action(self,click_value):
 
         if click_value == 'L3-4-1':  # For All Areas L3 Diagram at ver 2.3.0
             import ns_l3_diagram_create
+            self.add_shape_array = []  # add parameter at Ver 2.3.3
+            self.add_shape_write_array = []  # add parameter at Ver 2.3.3
 
             full_filepath = self.inFileTxt_L3_3_1.get()
             iDir = os.path.dirname(full_filepath)
@@ -1250,7 +1253,11 @@ def click_action(self,click_value):
             self.click_value = 'L3-3-2'
             self.click_value_l3 = 'L3-4-1'
             self.global_wp_array = []
+            self.update_start_area_array = []
 
+            self.flag_second_page = False
+            ns_l3_diagram_create.ns_l3_diagram_create.__init__(self)
+            self.flag_second_page = True
             ns_l3_diagram_create.ns_l3_diagram_create.__init__(self)
 
             # remove exist L3 file and backup xlsx file

ns_ddx_figure.py

@@ -2678,8 +2678,10 @@ def __init__(self):
         print('ns_ddx_figure_extended()')
 
     def add_shape(self,shape_type,shape_left, shape_top, shape_width, shape_hight,shape_text):
-        '''Default Parameter'''
 
+        self.add_shape_write_array.append([shape_type,shape_left, shape_top, shape_width, shape_hight,shape_text])
+
+        '''Default Parameter'''
         self.shape = self.shape.add_shape(MSO_SHAPE.ROUNDED_RECTANGLE, Inches(shape_left), Inches(shape_top), Inches(shape_width), Inches(shape_hight))
 
         # fill parameter
@@ -2724,7 +2726,7 @@ def add_shape(self,shape_type,shape_left, shape_top, shape_width, shape_hight,sh
             # line paramter
             shape_line.width = Pt(1.0)
             shape_line.color.rgb = RGBColor(205, 205, 205)
-            self.shape.adjustments[0] = float(0.025)  # curve of ROUNDED_RECTANGLE 0.0~1.0
+            self.shape.adjustments[0] = float(0.015)  # curve of ROUNDED_RECTANGLE 0.0~1.0
             # text parameter
             #self.shape.text_frame.paragraphs[0].alignment = PP_ALIGN.RIGHT
             self.shape.text_frame.paragraphs[0].font.size = Pt(self.folder_font_size )

ns_def.py

@@ -960,7 +960,7 @@ def clear_tag_in_position_line(tmp_ws_name, ppt_meta_file, clear_section_taple):
 
     return ('clear_tag_in_position_line')
 
-
+#get shape name in the folder and sort by tuple type
 def get_shape_folder_tuple(position_shape_tuple):
     return_tuple = {}
     current_folder_name = ''
@@ -1168,7 +1168,7 @@ def get_ipv4_value(ipv4_address):
 
 class  get_l2_broadcast_domains():
     def run(self,excel_maseter_file):
-        print('--- get_l2_broadcast_domains ---')
+        #print('--- get_l2_broadcast_domains ---')
         '''
         STEP0 get values of Master Data
         '''
@@ -1528,7 +1528,7 @@ def run(self,excel_maseter_file):
 
             marged_l2_broadcast_group_array.append(tmp_marged_l2_broadcast_group_array)
 
-        print('--- marged_l2_broadcast_group_array ---')
+        #print('--- marged_l2_broadcast_group_array ---')
         #print(get_l2_broadcast_domains.get_unique_list(marged_l2_broadcast_group_array))
         marged_l2_broadcast_group_array = get_l2_broadcast_domains.get_unique_list(marged_l2_broadcast_group_array)