diff -r d5014da90054 -r 8def429216ca IDEFrame.py --- a/IDEFrame.py Sun Feb 19 11:14:14 2023 +0800 +++ b/IDEFrame.py Mon Feb 20 08:56:25 2023 +0800 @@ -137,7 +137,7 @@ name = self.ProjectTree.GetItemText(selected) if check_function is None or check_function(name): if parent_type is not None: - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) parent_name = item_infos["tagname"].split("::")[1] remove_function(self.Controler, parent_name, name) else: @@ -1293,7 +1293,7 @@ if window == self.ProjectTree or window is None: selected = self.ProjectTree.GetSelection() if selected is not None and selected.IsOk(): - function = self.DeleteFunctions.get(self.ProjectTree.GetPyData(selected)["type"], None) + function = self.DeleteFunctions.get(self.ProjectTree.GetItemData(selected)["type"], None) if function is not None: function(self, selected) self.CloseTabsWithoutModel() @@ -1523,7 +1523,7 @@ # Extract current selected item tagname selected = self.ProjectTree.GetSelection() if selected is not None and selected.IsOk(): - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) tagname = item_infos.get("tagname", None) else: tagname = None @@ -1603,7 +1603,7 @@ found = False item, root_cookie = self.ProjectTree.GetFirstChild(root) while item is not None and item.IsOk() and not found: - item_infos = self.ProjectTree.GetPyData(item) + item_infos = self.ProjectTree.GetItemData(item) if (item_infos["name"].split(":")[-1].strip(), item_infos["type"]) == items[0]: if len(items) == 1: self.SelectedItem = item @@ -1624,7 +1624,7 @@ selected_item = (self.SelectedItem if self.SelectedItem is not None else event.GetItem()) - if selected_item.IsOk() and self.ProjectTree.GetPyData(selected_item)["type"] == ITEM_POU: + if selected_item.IsOk() and self.ProjectTree.GetItemData(selected_item)["type"] == ITEM_POU: block_name = self.ProjectTree.GetItemText(selected_item) block_type = self.Controler.GetPouType(block_name) if block_type != "program": @@ -1636,7 +1636,7 @@ def OnProjectTreeItemBeginEdit(self, event): selected = event.GetItem() - if self.ProjectTree.GetPyData(selected)["type"] in ITEMS_UNEDITABLE: + if self.ProjectTree.GetItemData(selected)["type"] in ITEMS_UNEDITABLE: event.Veto() else: event.Skip() @@ -1653,7 +1653,7 @@ else: item = event.GetItem() old_name = self.ProjectTree.GetItemText(item) - item_infos = self.ProjectTree.GetPyData(item) + item_infos = self.ProjectTree.GetItemData(item) if item_infos["type"] == ITEM_PROJECT: self.Controler.SetProjectProperties(name=new_name) elif item_infos["type"] == ITEM_DATATYPE: @@ -1757,7 +1757,7 @@ def OnProjectTreeItemActivated(self, event): selected = event.GetItem() - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) if item_infos["type"] == ITEM_PROJECT: self.EditProjectSettings() else: @@ -1769,7 +1769,7 @@ def ProjectTreeItemSelect(self, select_item): if select_item is not None and select_item.IsOk(): - item_infos = self.ProjectTree.GetPyData(select_item) + item_infos = self.ProjectTree.GetItemData(select_item) if item_infos["type"] in [ITEM_DATATYPE, ITEM_POU, ITEM_CONFIGURATION, ITEM_RESOURCE, ITEM_TRANSITION, ITEM_ACTION]: @@ -1788,7 +1788,7 @@ pt = wx.Point(event.GetX(), event.GetY()) item, flags = self.ProjectTree.HitTest(pt) if item is not None and item.IsOk() and flags & wx.TREE_HITTEST_ONITEMLABEL: - item_infos = self.ProjectTree.GetPyData(item) + item_infos = self.ProjectTree.GetItemData(item) if item != self.LastToolTipItem and self.LastToolTipItem is not None: self.ProjectTree.SetToolTip(None) self.LastToolTipItem = None @@ -1816,7 +1816,7 @@ event.Skip() def OnProjectTreeItemChanging(self, event): - if self.ProjectTree.GetPyData(event.GetItem())["type"] not in ITEMS_UNEDITABLE and self.SelectedItem is None: + if self.ProjectTree.GetItemData(event.GetItem())["type"] not in ITEMS_UNEDITABLE and self.SelectedItem is None: self.SelectedItem = event.GetItem() event.Veto() else: @@ -1898,7 +1898,7 @@ self.ProjectTree.SelectItem(item) self.ProjectTreeItemSelect(item) name = self.ProjectTree.GetItemText(item) - item_infos = self.ProjectTree.GetPyData(item) + item_infos = self.ProjectTree.GetItemData(item) menu = None if item_infos["type"] in ITEMS_UNEDITABLE + [ITEM_PROJECT]: @@ -1933,30 +1933,30 @@ menu = wx.Menu(title='') new_item = AppendMenu(menu, help='', kind=wx.ITEM_NORMAL, text=_("Add Transition")) parent = self.ProjectTree.GetItemParent(item) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] while parent_type != ITEM_POU: parent = self.ProjectTree.GetItemParent(parent) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] self.Bind(wx.EVT_MENU, self.GenerateAddTransitionFunction(self.ProjectTree.GetItemText(parent)), new_item) elif name == "Actions": menu = wx.Menu(title='') new_item = AppendMenu(menu, help='', kind=wx.ITEM_NORMAL, text=_("Add Action")) parent = self.ProjectTree.GetItemParent(item) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] while parent_type != ITEM_POU: parent = self.ProjectTree.GetItemParent(parent) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] self.Bind(wx.EVT_MENU, self.GenerateAddActionFunction(self.ProjectTree.GetItemText(parent)), new_item) elif name == "Resources": menu = wx.Menu(title='') new_item = AppendMenu(menu, help='', kind=wx.ITEM_NORMAL, text=_("Add Resource")) parent = self.ProjectTree.GetItemParent(item) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] while parent_type not in [ITEM_CONFIGURATION, ITEM_PROJECT]: parent = self.ProjectTree.GetItemParent(parent) - parent_type = self.ProjectTree.GetPyData(parent)["type"] + parent_type = self.ProjectTree.GetItemData(parent)["type"] parent_name = None if parent_type == ITEM_PROJECT: config_names = self.Controler.GetProjectConfigNames() @@ -2401,7 +2401,7 @@ def GenerateChangePouTypeFunction(self, name, new_type): def OnChangePouTypeMenu(event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] == ITEM_POU: + if self.ProjectTree.GetItemData(selected)["type"] == ITEM_POU: self.Controler.ProjectChangePouType(name, new_type) self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, PROJECTTREE, LIBRARYTREE) return OnChangePouTypeMenu @@ -2418,7 +2418,7 @@ def OnPastePou(self, event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] != ITEM_PROJECT: + if self.ProjectTree.GetItemData(selected)["type"] != ITEM_PROJECT: pou_type = self.ProjectTree.GetItemText(selected) pou_type = self.UNEDITABLE_NAMES_DICT[pou_type] # one of 'Functions', 'Function Blocks' or 'Programs' pou_type = {'Functions': 'function', 'Function Blocks': 'functionBlock', 'Programs': 'program'}[pou_type] @@ -2463,7 +2463,7 @@ def OnRemoveDataTypeMenu(self, event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] == ITEM_DATATYPE: + if self.ProjectTree.GetItemData(selected)["type"] == ITEM_DATATYPE: name = self.ProjectTree.GetItemText(selected) if self.CheckDataTypeIsUsedBeforeDeletion(name): self.Controler.ProjectRemoveDataType(name) @@ -2475,12 +2475,12 @@ def OnRenamePouMenu(self, event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] == ITEM_POU: + if self.ProjectTree.GetItemData(selected)["type"] == ITEM_POU: wx.CallAfter(self.ProjectTree.EditLabel, selected) def OnRemovePouMenu(self, event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] == ITEM_POU: + if self.ProjectTree.GetItemData(selected)["type"] == ITEM_POU: name = self.ProjectTree.GetItemText(selected) if self.CheckPouIsUsedBeforeDeletion(name): self.Controler.ProjectRemovePou(name) @@ -2492,7 +2492,7 @@ def OnRemoveTransitionMenu(self, event): selected = self.ProjectTree.GetSelection() - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) if item_infos["type"] == ITEM_TRANSITION: transition = self.ProjectTree.GetItemText(selected) pou_name = item_infos["tagname"].split("::")[1] @@ -2505,7 +2505,7 @@ def OnRemoveActionMenu(self, event): selected = self.ProjectTree.GetSelection() - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) if item_infos["type"] == ITEM_ACTION: action = self.ProjectTree.GetItemText(selected) pou_name = item_infos["tagname"].split("::")[1] @@ -2518,7 +2518,7 @@ def OnRemoveConfigurationMenu(self, event): selected = self.ProjectTree.GetSelection() - if self.ProjectTree.GetPyData(selected)["type"] == ITEM_CONFIGURATION: + if self.ProjectTree.GetItemData(selected)["type"] == ITEM_CONFIGURATION: name = self.ProjectTree.GetItemText(selected) self.Controler.ProjectRemoveConfiguration(name) tagname = ComputeConfigurationName(name) @@ -2529,7 +2529,7 @@ def OnRemoveResourceMenu(self, event): selected = self.ProjectTree.GetSelection() - item_infos = self.ProjectTree.GetPyData(selected) + item_infos = self.ProjectTree.GetItemData(selected) if item_infos["type"] == ITEM_RESOURCE: resource = self.ProjectTree.GetItemText(selected) config_name = item_infos["tagname"].split("::")[1]