817 new_values = dialog.GetValues() |
817 new_values = dialog.GetValues() |
818 if "returnType" in new_values: |
818 if "returnType" in new_values: |
819 self.Controler.SetPouInterfaceReturnType(item_name, new_values["returnType"]) |
819 self.Controler.SetPouInterfaceReturnType(item_name, new_values["returnType"]) |
820 self.Controler.SetPouInterfaceVars(item_name, new_values["data"]) |
820 self.Controler.SetPouInterfaceVars(item_name, new_values["data"]) |
821 pou_names = self.Controler.GetElementsOpenedNames() |
821 pou_names = self.Controler.GetElementsOpenedNames() |
822 if pou_name in pou_names: |
822 if item_name in pou_names: |
823 window = self.TabsOpened.GetPage(pou_names.index(item_name)) |
823 window = self.TabsOpened.GetPage(pou_names.index(item_name)) |
824 if isinstance(window, TextViewer): |
824 if isinstance(window, TextViewer): |
825 varlist = [] |
825 varlist = [] |
826 if "returnType" in new_values: |
826 if "returnType" in new_values: |
827 varlist.append(name) |
827 varlist.append(name) |
2039 "Input" : " Input", "Output" : " Output", "InOut" : " InOut", |
2039 "Input" : " Input", "Output" : " Output", "InOut" : " InOut", |
2040 "External" : " External", "Variables" : "Variables", "Local" : " Local", |
2040 "External" : " External", "Variables" : "Variables", "Local" : " Local", |
2041 "Temp" : " Temp", "Global" : "Global", "Access" : "Access"} |
2041 "Temp" : " Temp", "Global" : "Global", "Access" : "Access"} |
2042 |
2042 |
2043 if pou_type: |
2043 if pou_type: |
2044 self.DefaultValue = {"Name" : "", "Class" : "Input", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"} |
2044 self.DefaultTypes = {"All" : "Input", "Interface" : "Input", "Variables" : "Local"} |
|
2045 self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"} |
2045 else: |
2046 else: |
2046 self.DefaultValue = {"Name" : "", "Class" : "Global", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"} |
2047 self.DefaultTypes = {"All" : "Global"} |
|
2048 self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"} |
2047 if not pou_type or pou_type == "program": |
2049 if not pou_type or pou_type == "program": |
2048 self.Table = VariableTable(self, [], ["Name", "Class", "Type", "Location", "Initial Value", "Retain", "Constant"]) |
2050 self.Table = VariableTable(self, [], ["Name", "Class", "Type", "Location", "Initial Value", "Retain", "Constant"]) |
2049 if pou_type: |
2051 if pou_type: |
2050 self.FilterChoices = ["All","Interface"," Input"," Output"," InOut"," External","Variables"," Local"," Temp","Global","Access"] |
2052 self.FilterChoices = ["All","Interface"," Input"," Output"," InOut"," External","Variables"," Local"," Temp","Global","Access"] |
2051 else: |
2053 else: |
2136 else: |
2138 else: |
2137 self.UpButton.Enable(False) |
2139 self.UpButton.Enable(False) |
2138 self.DownButton.Enable(False) |
2140 self.DownButton.Enable(False) |
2139 |
2141 |
2140 def OnAddButton(self, event): |
2142 def OnAddButton(self, event): |
2141 self.Table.AppendRow(self.DefaultValue.copy()) |
2143 new_row = self.DefaultValue.copy() |
|
2144 if self.Filter in self.DefaultTypes: |
|
2145 new_row["Class"] = self.DefaultTypes[self.Filter] |
|
2146 else: |
|
2147 new_row["Class"] = self.Filter |
|
2148 self.Table.AppendRow(new_row) |
2142 self.Table.ResetView(self.VariablesGrid) |
2149 self.Table.ResetView(self.VariablesGrid) |
2143 event.Skip() |
2150 event.Skip() |
2144 |
2151 |
2145 def OnDeleteButton(self, event): |
2152 def OnDeleteButton(self, event): |
2146 row = self.VariablesGrid.GetGridCursorRow() |
2153 row = self.VariablesGrid.GetGridCursorRow() |