plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:8fbff50141f8
+:0e48629c1e6d
 self.Controler.OpenXMLFile(fileOpen)
 self.RefreshProjectTree()
 self.CurrentToolBar = []
 self.CurrentLanguage = ""
-self.DrawingMode = FREEDRAWING_MODE
+#self.DrawingMode = FREEDRAWING_MODE
-#self.DrawingMode = DRIVENDRAWING_MODE
+self.DrawingMode = DRIVENDRAWING_MODE
 self.RefreshFileMenu()
 self.RefreshEditMenu()
 self.RefreshTitle()
 self.RefreshToolBar()
 item = event.GetItem()
 itemtype = self.ProjectTree.GetPyData(item)
 if itemtype == ITEM_PROJECT:
 self.Controler.SetProjectProperties(name = new_name)
 elif itemtype == ITEM_POU:
-if new_name.upper() in self.Controler.GetProjectPouNames():
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 message = "\"%s\" pou already exists!"%new_name
 abort = True
-elif new_name.upper() in self.Controler.GetProjectPouVariables():
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables()]:
 messageDialog = wx.MessageDialog(self, "A variable is defined with \"%s\" as name. It can generate a conflict. Do you wish to continue?"%new_name, "Error", wx.YES_NO|wx.ICON_QUESTION)
 if messageDialog.ShowModal() == wx.ID_NO:
 abort = True
 messageDialog.Destroy()
 if not abort:
 self.RefreshTabsOpenedTitles()
 elif itemtype == ITEM_TRANSITION:
 category = self.ProjectTree.GetItemParent(item)
 pou = self.ProjectTree.GetItemParent(category)
 pou_name = self.ProjectTree.GetItemText(pou)
-if new_name.upper() in self.Controler.GetProjectPouNames():
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 message = "A pou with \"%s\" as name exists!"%new_name
-elif new_name.upper() in self.Controler.GetProjectPouVariables(pou_name):
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 old_name = self.ProjectTree.GetItemText(item)
 self.Controler.ChangePouTransitionName(pou_name, old_name, new_name)
 self.RefreshTabsOpenedTitles()
 elif itemtype == ITEM_ACTION:
 category = self.ProjectTree.GetItemParent(item)
 pou = self.ProjectTree.GetItemParent(category)
 pou_name = self.ProjectTree.GetItemText(pou)
-if new_name.upper() in self.Controler.GetProjectPouNames():
+if new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouNames()]:
 message = "A pou with \"%s\" as name exists!"%new_name
-elif new_name.upper() in self.Controler.GetProjectPouVariables(pou_name):
+elif new_name.upper() in [name.upper() for name in self.Controler.GetProjectPouVariables(pou_name)]:
 message = "A variable with \"%s\" as name already exists in this pou!"%new_name
 else:
 old_name = self.ProjectTree.GetItemText(item)
 self.Controler.ChangePouActionName(pou_name, old_name, new_name)
-self.RefreshTabsOpenedTitles()
-elif itemtype == ITEM_VARIABLE:
-category = self.ProjectTree.GetItemParent(item)
-if self.ProjectTree.GetItemText(category) != 'Global':
-category = self.ProjectTree.GetItemParent(category)
-pou = self.ProjectTree.GetItemParent(category)
-pou_name = self.ProjectTree.GetItemText(pou)
-if new_name.upper() in self.Controler.GetProjectPouNames():
-message = "A pou with \"%s\" as name exists!"%new_name
-elif new_name.upper() in self.Controler.GetProjectPouVariables(pou_name):
-message = "A variable with \"%s\" as name already exists in this pou!"%new_name
-else:
-old_name = self.ProjectTree.GetItemText(item)
-self.Controler.ChangePouVariableName(pou_name, old_name, new_name)
 self.RefreshTabsOpenedTitles()
 if message or abort:
 if message:
 messageDialog = wx.MessageDialog(self, message, "Error", wx.OK|wx.ICON_ERROR)
 messageDialog.ShowModal()
 event.Skip()
 def OnAddPouMenu(self, event):
 dialog = PouDialog(self)
 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.RefreshProjectTree()
 dialog.Destroy()
 selected = self.ProjectTree.GetSelection()
 if self.ProjectTree.GetPyData(selected) == ITEM_POU:
 pouname = self.ProjectTree.GetItemText(selected)
 if self.Controler.GetPouBodyType(pouname) == "SFC":
 dialog = PouTransitionDialog(self)
+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.RefreshProjectTree()
 dialog.Destroy()
 selected = self.ProjectTree.GetSelection()
 if self.ProjectTree.GetPyData(selected) == ITEM_POU:
 pouname = self.ProjectTree.GetItemText(selected)
 if self.Controler.GetPouBodyType(pouname) == "SFC":
 dialog = PouActionDialog(self)
+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.RefreshProjectTree()
 dialog.Destroy()
 for option in ["function","functionBlock","program"]:
 self.PouType.Append(option)
 self.RefreshLanguage()
 self.PouNames = []
+self.PouElementNames = []
 def OnOK(self, event):
 error = []
 pou_name = self.PouName.GetValue()
 if pou_name == "":
 message.Destroy()
 elif pou_name.upper() in self.PouNames:
 message = wx.MessageDialog(self, "\"%s\" pou already exists!"%pou_name, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
+elif pou_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?"%pou_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 RefreshLanguage(self):
 selection = self.Language.GetStringSelection()
 self.RefreshLanguage()
 event.Skip()
 def SetPouNames(self, pou_names):
 self.PouNames = [pou_name.upper() for pou_name in pou_names]
+def SetPouElementNames(self, element_names):
+self.PouElementNames = [element_name.upper() for element_name in element_names]
 def SetValues(self, values):
 for item, value in values.items():
 if item == "pouName":
 self.PouName.SetValue(value)
 def __init__(self, parent):
 self._init_ctrls(parent)
 for option in ["IL","ST","LD","FBD"]:
 self.Language.Append(option)
+self.PouNames = []
+self.PouElementNames = []
 def OnOK(self, event):
 error = []
+transition_name = self.TransitionName.GetValue()
 if self.TransitionName.GetValue() == "":
 error.append("Transition Name")
 if self.Language.GetStringSelection() == "":
 error.append("Language")
 if len(error) > 0:
 else:
 text += ", %s"%item
 message = wx.MessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
+elif not TestIdentifier(transition_name):
+message = wx.MessageDialog(self, "\"%s\" is not a valid identifier!"%transition_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif transition_name.upper() in IEC_KEYWORDS:
+message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%transition_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif transition_name.upper() in self.PouNames:
+message = wx.MessageDialog(self, "A pou with \"%s\" for name exists!"%transition_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif transition_name.upper() in self.PouElementNames:
+message = wx.MessageDialog(self, "\"%s\" element for this pou already exists!"%transition_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
 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 SetValues(self, values):
 for item, value in values.items():
 if item == "transitionName":
 self.TransitionName.SetValue(value)
 elif item == "language":
 self._init_ctrls(parent)
 for option in ["IL","ST","LD","FBD"]:
 self.Language.Append(option)
+self.PouNames = []
+self.PouElementNames = []
 def OnOK(self, event):
 error = []
-if self.ActionName.GetValue() == "":
+action_name = self.ActionName.GetValue()
+if action_name == "":
 error.append("Action Name")
 if self.Language.GetStringSelection() == "":
 error.append("Language")
 if len(error) > 0:
 text = ""
 else:
 text += ", %s"%item
 message = wx.MessageDialog(self, "Form isn't complete. %s must be filled!"%text, "Error", wx.OK|wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
+elif not TestIdentifier(action_name):
+message = wx.MessageDialog(self, "\"%s\" is not a valid identifier!"%action_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif action_name.upper() in IEC_KEYWORDS:
+message = wx.MessageDialog(self, "\"%s\" is a keyword. It can't be used!"%action_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif action_name.upper() in self.PouNames:
+message = wx.MessageDialog(self, "A pou with \"%s\" for name exists!"%action_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
+elif action_name.upper() in self.PouElementNames:
+message = wx.MessageDialog(self, "\"%s\" element for this pou already exists!"%action_name, "Error", wx.OK|wx.ICON_ERROR)
+message.ShowModal()
+message.Destroy()
 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, element_names):
+self.PouElementNames = [element_name.upper() for element_name in element_names]
 def SetValues(self, values):
 for item, value in values.items():
 if item == "actionName":
 self.ActionName.SetValue(value)
 elif item == "language":
 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"}
 if pou_type in ["config", "resource"] or pou_type == "program":
-self.Table = VariableTable(self, [], ["#", "Name", "Class", "Type", "Location", "Initial Value", "Retain", "Constant", "Edit"])
+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:
 self.FilterChoices = ["All","Global","Access"]
-self.ColSizes = [40, 80, 70, 80, 80, 80, 60, 70, 50]
+self.ColSizes = [40, 80, 70, 80, 80, 80, 60, 70]
-self.ColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_CENTER, wx.ALIGN_CENTER, wx.ALIGN_LEFT]
+self.ColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_CENTER, wx.ALIGN_CENTER]
 else:
-self.Table = VariableTable(self, [], ["#", "Name", "Class", "Type", "Initial Value", "Retain", "Constant", "Edit"])
+self.Table = VariableTable(self, [], ["#", "Name", "Class", "Type", "Initial Value", "Retain", "Constant"])
 self.FilterChoices = ["All","Interface","   Input","   Output","   InOut","   External","Variables","   Local","   Temp"]
-self.ColSizes = [40, 120, 70, 80, 120, 60, 70, 50]
+self.ColSizes = [40, 120, 70, 80, 120, 60, 70]
-self.ColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_CENTER, wx.ALIGN_CENTER, wx.ALIGN_LEFT]
+self.ColAlignements = [wx.ALIGN_CENTER, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_CENTER, wx.ALIGN_CENTER]
 for choice in self.FilterChoices:
 self.ClassFilter.Append(choice)
 reverse_transfer = {}
 for filter, choice in self.FilterChoiceTransfer.items():
 reverse_transfer[choice] = filter

changeset 70	0e48629c1e6d
parent 68	66308e07402c
child 71	0578bc212c20