plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:b22f661cbcfb
+:c798a68c5560
 if len(args) > 1:
 usage()
 sys.exit()
 elif len(args) == 1:
 fileOpen = args[0]
-CWD = ""
+CWD = os.path.split(__file__)[0]
-for path in sys.path:
-if os.path.isfile(os.path.join(path, "PLCOpenEditor.py")):
-CWD = path
 [ID_PLCOPENEDITOR, ID_PLCOPENEDITORPROJECTTREE,
 ID_PLCOPENEDITORSPLITTERWINDOW1, ID_PLCOPENEDITOREDITORPANEL,
 ID_PLCOPENEDITORTABSOPENED, ID_PLCOPENEDITORTOOLBAR,
 ID_PLCOPENEDITORDEFAULTTOOLBAR, ID_PLCOPENEDITORSFCTOOLBAR,
 self.SetMenuBar(self.menuBar1)
 self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=ID_PLCOPENEDITOR)
 self.splitterWindow1 = wx.SplitterWindow(id=ID_PLCOPENEDITORSPLITTERWINDOW1,
 name='splitterWindow1', parent=self, point=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.SP_3D)
+size=wx.Size(0, 0), style=wx.SP_3D)
 self.splitterWindow1.SetNeedUpdating(True)
 self.splitterWindow1.SetMinimumPaneSize(1)
 self.EditorPanel = wx.Panel(id=ID_PLCOPENEDITOREDITORPANEL,
 name='TabPanel', parent=self.splitterWindow1, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.TabsOpened = wx.Notebook(id=ID_PLCOPENEDITORTABSOPENED,
 name='TabsOpened', parent=self.EditorPanel, pos=wx.Point(0,
-0), size=wx.Size(-1, -1), style=0)
+0), size=wx.Size(0, 0), style=0)
 self.TabsOpened.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED,
 self.OnPouSelectedChanged, id=ID_PLCOPENEDITORTABSOPENED)
 self.ToolBar = wx.ToolBar(id=ID_PLCOPENEDITORTOOLBAR, name='ToolBar',
 parent=self.EditorPanel, pos=wx.Point(0, 0), size=wx.Size(0, 40),
 self.RefreshProjectTree()
 dialog.Destroy()
 def OnCloseFrame(self, event):
 if not self.Controler.ProjectIsSaved():
-dialog = wx.MessageDialog(self, "There are changes, do you want to save?",  "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
+dialog = wx.MessageDialog(self, "There are changes, do you want to save?", "Close Application", wx.YES_NO|wx.CANCEL|wx.ICON_QUESTION)
 answer = dialog.ShowModal()
 dialog.Destroy()
 if answer == wx.ID_YES:
 self.SaveProject()
 event.Skip()
 elif answer == wx.ID_NO:
+self.Controler.Reset()
+wx.CallAfter(self.Close)
 event.Skip()
+else:
+event.Veto()
 else:
 event.Skip()
 def OnNewProjectMenu(self, event):
 dialog = ProjectDialog(self)
 def OnPropertiesMenu(self, event):
 self.ShowProperties()
 event.Skip()
 def OnQuitMenu(self, event):
-self.ToolBar.Reparent(self)
-self.Controler.Reset()
 self.Close()
 event.Skip()
 def ResetCurrentMode(self):
 selected = self.TabsOpened.GetSelection()
 name = self.ProjectTree.GetItemText(selected)
 data = self.ProjectTree.GetPyData(selected)
 if name == "Properties":
 self.ShowProperties()
 elif data in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION, ITEM_RESOURCE, ITEM_CONFIGURATION]:
+idx = None
 if data == ITEM_CONFIGURATION:
 idx = self.Controler.OpenConfigurationEditing(name)
 if idx != None:
 new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "config", config_name = name)
 self.TabsOpened.AddPage(new_window, "")
 new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "resource", config_name = config_name, resource_name = name)
 self.TabsOpened.AddPage(new_window, "")
 else:
 idx = self.Controler.ChangeConfigurationResourceEditing(config_name, name)
 elif data == ITEM_POU:
-idx = self.Controler.OpenElementEditing(name)
+idx = self.Controler.OpenPouEditing(name)
 if idx != None:
 new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, self.Controler.GetPouType(name), pou_name = name)
 self.TabsOpened.AddPage(new_window, "")
 else:
-idx = self.Controler.ChangeElementEditing(name)
+idx = self.Controler.ChangePouEditing(name)
 else:
-parent = self.ProjectTree.GetItemParent(selected)
+item = self.ProjectTree.GetItemParent(selected)
-parent_name = self.ProjectTree.GetItemText(parent)
+item_type = self.ProjectTree.GetPyData(item)
-grandparent = self.ProjectTree.GetItemParent(parent)
+while item_type != ITEM_POU:
-grandparent_name = self.ProjectTree.GetItemText(grandparent)
+item = self.ProjectTree.GetItemParent(item)
+item_type = self.ProjectTree.GetPyData(item)
+pou_name = self.ProjectTree.GetItemText(item)
 if data == ITEM_TRANSITION:
-idx = self.Controler.OpenPouTransitionEditing(grandparent_name, name)
+idx = self.Controler.OpenPouTransitionEditing(pou_name, name)
 if idx != None:
-new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "transition", pou_name = grandparent_name, transition_name = name)
+new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "transition", pou_name = pou_name, transition_name = name)
 self.TabsOpened.AddPage(new_window, "")
 else:
-idx = self.Controler.ChangePouTransitionEditing(grandparent_name, name)
+idx = self.Controler.ChangePouTransitionEditing(pou_name, name)
 elif data == ITEM_ACTION:
-idx = self.Controler.OpenPouActionEditing(grandparent_name, name)
+idx = self.Controler.OpenPouActionEditing(pou_name, name)
 if idx != None:
-new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "action", pou_name = grandparent_name, action_name = name)
+new_window = PouEditorPanel(self.TabsOpened, self, self.Controler, "action", pou_name = pou_name, action_name = name)
 self.TabsOpened.AddPage(new_window, "")
 else:
-idx = self.Controler.ChangePouActionEditing(grandparent_name, name)
+idx = self.Controler.ChangePouActionEditing(pou_name, name)
 if idx != None:
 old_selected = self.TabsOpened.GetSelection()
 if old_selected >= 0:
 self.TabsOpened.GetPage(old_selected).ResetBuffer()
 self.TabsOpened.SetSelection(idx)
 event.Skip()
 def OnProjectTreeItemSelected(self, event):
 selected = event.GetItem()
 name = self.ProjectTree.GetItemText(selected)
-if self.ProjectTree.GetItemParent(selected) == self.ProjectTree.GetRootItem() and name != "Properties":
+data = self.ProjectTree.GetPyData(selected)
-if self.Controler.IsElementEditing(name):
+if data in [ITEM_POU, ITEM_TRANSITION, ITEM_ACTION, ITEM_RESOURCE, ITEM_CONFIGURATION]:
-idx = self.Controler.ChangeElementEditing(name)
+idx = None
-if idx != None:
+if data == ITEM_CONFIGURATION:
-self.TabsOpened.SetSelection(idx)
+if self.Controler.IsConfigurationEditing(name):
-self.RefreshFileMenu()
+idx = self.Controler.ChangeConfigurationEditing(name)
-self.RefreshEditMenu()
+elif data == ITEM_RESOURCE:
-self.RefreshToolBar()
+item = self.ProjectTree.GetItemParent(selected)
-else:
+item_type = self.ProjectTree.GetPyData(item)
-name = self.ProjectTree.GetItemText(selected)
+while item_type != ITEM_CONFIGURATION:
-parent = self.ProjectTree.GetItemParent(selected)
+item = self.ProjectTree.GetItemParent(item)
-parent_name = self.ProjectTree.GetItemText(parent)
+item_type = self.ProjectTree.GetPyData(item)
-grandparent = self.ProjectTree.GetItemParent(parent)
+config_name = self.ProjectTree.GetItemText(item)
-grandparent_name = self.ProjectTree.GetItemText(grandparent)
+if self.Controler.IsConfigurationResourceEditing(config_name, name):
-if parent_name == "Transitions":
+idx = self.Controler.ChangeConfigurationResourceEditing(config_name, name)
-idx = self.Controler.ChangePouTransitionEditing(grandparent_name, name)
+elif data == ITEM_POU:
-if idx != None:
+if self.Controler.IsPouEditing(name):
-self.TabsOpened.SetSelection(idx)
+idx = self.Controler.ChangePouEditing(name)
-self.RefreshFileMenu()
+else:
-self.RefreshEditMenu()
+item = self.ProjectTree.GetItemParent(selected)
-self.RefreshToolBar()
+item_type = self.ProjectTree.GetPyData(item)
-elif parent_name == "Action":
+while item_type != ITEM_POU:
-idx = self.Controler.ChangePouActionEditing(grandparent_name, name)
+item = self.ProjectTree.GetItemParent(item)
-if idx != None:
+item_type = self.ProjectTree.GetPyData(item)
-self.TabsOpened.SetSelection(idx)
+pou_name = self.ProjectTree.GetItemText(item)
-self.RefreshFileMenu()
+if data == ITEM_TRANSITION:
-self.RefreshEditMenu()
+if self.Controler.IsPouTransitionEditing(pou_name, name):
-self.RefreshToolBar()
+idx = self.Controler.ChangePouTransitionEditing(pou_name, name)
+elif data == ITEM_ACTION:
+if self.Controler.IsPouActionEditing(pou_name, name):
+idx = self.Controler.ChangePouActionEditing(pou_name, name)
+if idx != None:
+old_selected = self.TabsOpened.GetSelection()
+if old_selected >= 0:
+self.TabsOpened.GetPage(old_selected).ResetBuffer()
+self.TabsOpened.SetSelection(idx)
+window = self.TabsOpened.GetPage(idx)
+window.RefreshView()
+self.RefreshTabsOpenedTitles()
+self.RefreshFileMenu()
+self.RefreshEditMenu()
+self.RefreshToolBar()
 event.Skip()
 def RefreshProjectTree(self):
 infos = self.Controler.GetProjectInfos()
 root = self.ProjectTree.GetRootItem()
 if selected != -1:
 self.TabsOpened.GetPage(selected).RefreshView()
 self.TabsOpened.GetPage(selected).Refresh()
 self.RefreshTitle()
 self.RefreshEditMenu()
+self.RefreshProjectTree()
 event.Skip()
 def OnRedoMenu(self, event):
 self.Controler.LoadNext()
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 self.TabsOpened.GetPage(selected).RefreshView()
 self.TabsOpened.GetPage(selected).Refresh()
 self.RefreshTitle()
 self.RefreshEditMenu()
+self.RefreshProjectTree()
 event.Skip()
 def OnCutMenu(self, event):
 selected = self.TabsOpened.GetSelection()
 if selected != -1:
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPou(values["pouName"], values["pouType"], values["language"])
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnRemovePouMenu(self, event):
 for i in xrange(self.TabsOpened.GetPageCount()):
 if self.TabsOpened.GetPageText(i) == selected:
 deleted = i
 if deleted != None:
 self.TabsOpened.DeletePage(i)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 self.RefreshToolBar()
 else:
 message = wx.MessageDialog(self, "%s is used by one or more POUs. It can't be removed!"%selected, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
 event.Skip()
 def OnAddConfigurationMenu(self, event):
-dialog = wx.TextEntryDialog(self, "Enter configuration name:", "Create new configuration", "", wx.OK|wx.CANCEL)
+dialog = ConfigurationNameDialog(self, "Please enter configuration name", "Add new configuration")
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfiguration(value)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnRemoveConfigurationMenu(self, event):
 configs = self.Controler.GetProjectConfigNames()
-dialog = wx.SingleChoiceDialog(self, "Select Configuration to remove:", "Remove configuration", configs, wx.OK|wx.CANCEL)
+dialog = wx.SingleChoiceDialog(self, "Please select a configuration", "Remove configuration", configs, wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetStringSelection()
 self.Controler.ProjectRemoveConfiguration(selected)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 event.Skip()
 def OnAddPouTransitionMenu(self, event):
 selected = self.ProjectTree.GetSelection()
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pouname))
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouTransition(pouname, values["transitionName"], values["language"])
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnRemovePouTransitionMenu(self, event):
 transitions = self.Controler.GetPouTransitions(pouname)
 dialog = wx.SingleChoiceDialog(self, "Select Transition to remove:", "Remove transition", transitions, wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetStringSelection()
 self.Controler.ProjectRemovePouTransition(pouname, selected)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnAddPouActionMenu(self, event):
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 dialog.SetPouElementNames(self.Controler.GetProjectPouVariables(pouname))
 if dialog.ShowModal() == wx.ID_OK:
 values = dialog.GetValues()
 self.Controler.ProjectAddPouAction(pouname, values["actionName"], values["language"])
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnRemovePouActionMenu(self, event):
 actions = self.Controler.GetPouActions(pouname)
 dialog = wx.SingleChoiceDialog(self, "Select Action to remove:", "Remove action", actions, wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetStringSelection()
 self.Controler.ProjectRemovePouAction(pouname, selected)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnAddResourceMenu(self, event):
 selected = self.ProjectTree.GetSelection()
 if self.ProjectTree.GetPyData(selected) == ITEM_CONFIGURATION:
 config_name = self.ProjectTree.GetItemText(selected)
-dialog = wx.TextEntryDialog(self, "Enter Resource name:", "Create new Resource", "", wx.OK|wx.CANCEL)
+dialog = ResourceNameDialog(self, "Please enter resource name", "Add new resource")
+dialog.SetPouNames(self.Controler.GetProjectPouNames())
+dialog.SetPouElementNames(self.Controler.GetProjectPouVariables())
 if dialog.ShowModal() == wx.ID_OK:
 value = dialog.GetValue()
 self.Controler.ProjectAddConfigurationResource(config_name, value)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnRemoveResourceMenu(self, event):
 resources = config["resources"]
 dialog = wx.SingleChoiceDialog(self, "Select Resource to remove:", "Remove resource", resources, wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 resource = dialog.GetStringSelection()
 self.Controler.ProjectRemoveConfigurationResource(config_name, resource)
+self.RefreshTitle()
+self.RefreshEditMenu()
 self.RefreshProjectTree()
 dialog.Destroy()
 event.Skip()
 def OnPLCOpenMenu(self, event):
 values["actionName"] = self.ActionName.GetValue()
 values["language"] = self.Language.GetStringSelection()
 return values
 #-------------------------------------------------------------------------------
+#                          Configuration Name Dialog
+#-------------------------------------------------------------------------------
+class ConfigurationNameDialog(wx.TextEntryDialog):
+def __init__(self, parent, message, caption = "Please enter configuration name", defaultValue = "",
+style = wx.OK|wx.CANCEL|wx.CENTRE, pos = wx.DefaultPosition):
+wx.TextEntryDialog.__init__(self, parent, message, caption, defaultValue, style, pos)
+self.PouNames = []
+self.PouElementNames = []
+self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetSizer().GetItem(3).GetSizer().GetAffirmativeButton().GetId())
+def OnOK(self, event):
+config_name = self.GetSizer().GetItem(1).GetWindow().GetValue()
+if config_name == "":
+message = wx.MessageDialog(self, "You must type a name!", "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif not TestIdentifier(config_name):
+message = wx.MessageDialog(self, "\"%s\" is not a valid identifier!"%config_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif config_name.upper() in IEC_KEYWORDS:
+message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%config_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif config_name.upper() in self.PouNames:
+message = wx.MessageDialog(self, "A pou with \"%s\" as name exists!"%config_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif config_name.upper() in self.PouElementNames:
+message = wx.MessageDialog(self, "A pou has an element with \"%s\" for name. It can generate a conflict. Do you wish to continue?"%config_name, "Warning", wx.YES_NO|wx.ICON_EXCLAMATION)
+result = message.ShowModal()
+message.Destroy()
+if result == wx.ID_YES:
+self.EndModal(wx.ID_OK)
+else:
+self.EndModal(wx.ID_OK)
+def SetPouNames(self, pou_names):
+self.PouNames = [pou_name.upper() for pou_name in pou_names]
+def SetPouElementNames(self, pou_names):
+self.PouElementNames = [pou_name.upper() for pou_name in pou_names]
+def GetValue(self):
+return self.GetSizer().GetItem(1).GetWindow().GetValue()
+#-------------------------------------------------------------------------------
+#                          Resource Name Dialog
+#-------------------------------------------------------------------------------
+class ResourceNameDialog(wx.TextEntryDialog):
+def __init__(self, parent, message, caption = "Please enter resource name", defaultValue = "",
+style = wx.OK|wx.CANCEL|wx.CENTRE, pos = wx.DefaultPosition):
+wx.TextEntryDialog.__init__(self, parent, message, caption, defaultValue, style, pos)
+self.PouNames = []
+self.PouElementNames = []
+self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.GetSizer().GetItem(3).GetSizer().GetAffirmativeButton().GetId())
+def OnOK(self, event):
+resource_name = self.GetSizer().GetItem(1).GetWindow().GetValue()
+if resource_name == "":
+message = wx.MessageDialog(self, "You must type a name!", "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif not TestIdentifier(resource_name):
+message = wx.MessageDialog(self, "\"%s\" is not a valid identifier!"%resource_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif resource_name.upper() in IEC_KEYWORDS:
+message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%resource_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif resource_name.upper() in self.PouNames:
+message = wx.MessageDialog(self, "A pou with \"%s\" as name exists!"%resource_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif resource_name.upper() in self.PouElementNames:
+message = wx.MessageDialog(self, "A pou has an element with \"%s\" for name. It can generate a conflict. Do you wish to continue?"%resource_name, "Warning", wx.YES_NO|wx.ICON_EXCLAMATION)
+result = message.ShowModal()
+message.Destroy()
+if result == wx.ID_YES:
+self.EndModal(wx.ID_OK)
+else:
+self.EndModal(wx.ID_OK)
+def SetPouNames(self, pou_names):
+self.PouNames = [pou_name.upper() for pou_name in pou_names]
+def SetPouElementNames(self, pou_names):
+self.PouElementNames = [pou_name.upper() for pou_name in pou_names]
+def GetValue(self):
+return self.GetSizer().GetItem(1).GetWindow().GetValue()
+#-------------------------------------------------------------------------------
 #                            Pou Editor Panel
 #-------------------------------------------------------------------------------
 class VariableTable(wx.grid.PyGridTableBase):
 return row
 def GetValue(self, row, col):
 if row < self.GetNumberRows():
 if col == 0:
-return self.Parent.Values.index(self.data[row]) + 1
+return self.data[row]["Number"]
 name = str(self.data[row].get(self.GetColLabelValue(col), ""))
 return name
 def SetValue(self, row, col, value):
 if col < len(self.colnames):
 self.VariablePanel.SetSizer(self.VariablePanelSizer)
 def _init_ctrls(self, prnt, element_type):
 wx.SplitterWindow.__init__(self, id=ID_POUEDITORPANEL,
 name='EditVariablePanel', parent=prnt, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.SP_3D)
+size=wx.Size(0, 0), style=wx.SP_3D)
 self.SetNeedUpdating(True)
 self.SetMinimumPaneSize(1)
 if element_type == "config":
 self.Viewer = wx.Panel(id=ID_POUEDITORPANELVIEWER,
 name='ConfigPanel', parent=self, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+size=wx.Size(0, 0), style=0)
+self.Viewer.SetSizer(wx.BoxSizer(wx.VERTICAL))
 self.Viewer.ResetBuffer = lambda: None
 self.Viewer.RefreshView = lambda: None
 elif element_type == "resource":
 self.Viewer = ResourceEditor(self, self.Parent, self.Controler)
 elif element_type == "FBD":
 else:
 self.Viewer.SetKeywords(ST_KEYWORDS)
 self.VariablePanel = wx.Panel(id=ID_POUEDITORPANELVIEWER,
 name='VariablePanel', parent=self, pos=wx.Point(0, 0),
-size=wx.Size(-1, -1), style=wx.TAB_TRAVERSAL)
+size=wx.Size(0, 0), style=wx.TAB_TRAVERSAL)
 self.staticText1 = wx.StaticText(id=ID_POUEDITORPANELSTATICTEXT1,
 label='Return Type:', name='staticText1', parent=self.VariablePanel,
 pos=wx.Point(0, 0), size=wx.Size(95, 17), style=0)
 self.ReturnType = wx.Choice(id=ID_POUEDITORPANELRETURNTYPE,
 name='ReturnType', parent=self.VariablePanel, pos=wx.Point(0, 0),
 size=wx.Size(145, 24), style=0)
+self.Bind(wx.EVT_CHOICE, self.OnReturnTypeChanged, id=ID_POUEDITORPANELRETURNTYPE)
 self.staticText2 = wx.StaticText(id=ID_POUEDITORPANELSTATICTEXT2,
 label='Class Filter:', name='staticText2', parent=self.VariablePanel,
 pos=wx.Point(0, 0), size=wx.Size(95, 17), style=0)
 "   External" : "External", "Variables" : "Variables", "   Local" : "Local",
 "   Temp" : "Temp", "Global" : "Global", "Access" : "Access"}
 if pou_type in ["config", "resource"]:
 self.DefaultTypes = {"All" : "Global"}
-self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No", "Edit" : "True"}
+self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No", "Edit" : True}
 else:
 self.DefaultTypes = {"All" : "Local", "Interface" : "Input", "Variables" : "Local"}
-self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No", "Edit" : "True"}
+self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No", "Edit" : True}
 if pou_type in ["config", "resource"] or pou_type == "program":
 self.Table = VariableTable(self, [], ["#", "Name", "Class", "Type", "Location", "Initial Value", "Retain", "Constant"])
 if pou_type not in ["config", "resource"]:
 self.FilterChoices = ["All","Interface","   Input","   Output","   InOut","   External","Variables","   Local","   Temp","Global","Access"]
 else:
 language = self.Controler.GetPouBodyType(self.PouName)
 varlist.append(self.PouName)
 if language in ["IL", "ST"]:
 self.Viewer.SetVariables(varlist)
 self.Viewer.SetFunctions(self.Controler.GetBlockTypes())
+def OnReturnTypeChanged(self, event):
+self.Controler.SetPouInterfaceReturnType(self.PouName, self.ReturnType.GetStringSelection())
+self.Controler.BufferProject()
+self.Parent.RefreshTitle()
+self.Parent.RefreshEditMenu()
+event.Skip()
 def OnClassFilter(self, event):
 self.Filter = self.FilterChoiceTransfer[self.ClassFilter.GetStringSelection()]
 self.RefreshTypeList()
 self.RefreshValues()
 def RefreshValues(self):
 if len(self.Table.data) > 0:
 self.VariablesGrid.SetGridCursor(0, 1)
 data = []
-for variable in self.Values:
+for num, variable in enumerate(self.Values):
 if variable["Class"] in self.ClassList:
+variable["Number"] = num + 1
 data.append(variable)
 self.Table.SetData(data)
 self.Table.ResetView(self.VariablesGrid)
 def SaveValues(self, buffer = True):

changeset 80	c798a68c5560
parent 71	0578bc212c20
child 82	119b62c73085