plcopeneditor_history: comparison PLCOpenEditor.py

equal deleted inserted replaced

-:e7d67b27877f
+:256eedd275d0
 while item_type not in [ITEM_POU, ITEM_RESOURCE, ITEM_CONFIGURATION] and item.IsOk():
 item = self.ProjectTree.GetItemParent(item)
 item_type = self.ProjectTree.GetPyData(item)
 item_name = self.ProjectTree.GetItemText(item)
 if item_type == ITEM_POU:
-dialog = EditVariableDialog(self, item_name, self.Controler.GetPouType(item_name), name)
+dialog = EditVariableDialog(self, item_name, self.Controler.GetPouType(item_name), self.Controler.PouIsUsed(item_name), name)
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 values = {}
 values["returnType"] = self.Controler.GetPouInterfaceReturnTypeByName(item_name)
 values["data"] = self.Controler.GetPouInterfaceVarsByName(item_name)
 dialog.SetValues(values)
 if dialog.ShowModal() == wxID_OK:
-if not self.Controler.PouIsUsed(item_name):
+new_values = dialog.GetValues()
-new_values = dialog.GetValues()
+if "returnType" in new_values:
-if "returnType" in new_values:
+self.Controler.SetPouInterfaceReturnType(item_name, new_values["returnType"])
-self.Controler.SetPouInterfaceReturnType(item_name, new_values["returnType"])
+self.Controler.SetPouInterfaceVars(item_name, new_values["data"])
-self.Controler.SetPouInterfaceVars(item_name, new_values["data"])
+pou_names = self.Controler.GetElementsOpenedNames()
-pou_names = self.Controler.GetElementsOpenedNames()
+if item_name in pou_names:
-if item_name in pou_names:
+window = self.TabsOpened.GetPage(pou_names.index(item_name))
-window = self.TabsOpened.GetPage(pou_names.index(item_name))
+if isinstance(window, TextViewer):
-if isinstance(window, TextViewer):
+varlist = []
-varlist = []
+if "returnType" in new_values:
-if "returnType" in new_values:
+varlist.append(name)
-varlist.append(name)
+for var in new_values["data"]:
-for var in new_values["data"]:
+varlist.append(var["Name"])
-varlist.append(var["Name"])
+window.SetVariables(varlist)
-window.SetVariables(varlist)
-else:
-message = wxMessageDialog(self, "\"%s\" is used by one or more POUs. Its interface can't be changed!"%pou_name, "Error", wxOK|wxICON_ERROR)
-message.ShowModal()
-message.Destroy()
 dialog.Destroy()
 self.RefreshProjectTree()
 elif item_type == ITEM_CONFIGURATION:
 dialog = EditVariableDialog(self, item_name, None, name)
 dialog.SetPouNames(self.Controler.GetProjectPouNames())
 for col in range(self.GetNumberCols()):
 editor = None
 renderer = None
 colname = self.GetColLabelValue(col)
 grid.SetReadOnly(row, col, False)
-if colname in ["Name","Initial Value","Location"]:
+if colname == "Name":
-editor = wxGridCellTextEditor()
+if self.Parent.PouIsUsed and self.GetValueByName(row, "Class") in ["Input", "Output", "InOut"]:
-renderer = wxGridCellStringRenderer()
-elif colname == "Class":
-if len(self.Parent.ClassList) == 1:
 grid.SetReadOnly(row, col, True)
 else:
-editor = wxGridCellChoiceEditor()
+editor = wxGridCellTextEditor()
-editor.SetParameters(",".join(self.Parent.ClassList))
+renderer = wxGridCellStringRenderer()
+if colname in ["Initial Value","Location"]:
+editor = wxGridCellTextEditor()
+renderer = wxGridCellStringRenderer()
+elif colname == "Class":
+if len(self.Parent.ClassList) == 1 or self.Parent.PouIsUsed and self.GetValueByName(row, "Class") in ["Input", "Output", "InOut"]:
+grid.SetReadOnly(row, col, True)
+else:
+editor = wxGridCellChoiceEditor()
+excluded = []
+if self.Parent.PouIsUsed:
+excluded.extend(["Input","Output","InOut"])
+editor.SetParameters(",".join([choice for choice in self.Parent.ClassList if choice not in excluded]))
 elif colname == "Type":
-editor = wxGridCellChoiceEditor()
+if self.Parent.PouIsUsed and self.GetValueByName(row, "Class") in ["Input", "Output", "InOut"]:
-editor.SetParameters(self.Parent.TypeList)
+grid.SetReadOnly(row, col, True)
+else:
+editor = wxGridCellChoiceEditor()
+editor.SetParameters(self.Parent.TypeList)
 elif colname in ["Retain", "Constant"]:
 editor = wxGridCellChoiceEditor()
 editor.SetParameters(self.Parent.OptionList)
 grid.SetCellEditor(row, col, editor)
 self.VariablesGrid.SetLabelFont(wx.Font(10, 77, wx.NORMAL, wx.NORMAL,
 False, 'Sans'))
 self.VariablesGrid.DisableDragGridSize()
 self.VariablesGrid.EnableScrolling(False, True)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnVariablesGridCellChange)
+self.VariablesGrid.Bind(wx.grid.EVT_GRID_SELECT_CELL, self.OnVariablesGridSelectCell)
 self.AddButton = wx.Button(id=wxID_EDITVARIABLEDIALOGADDBUTTON, label='Add',
 name='AddButton', parent=self.MainPanel, pos=wx.Point(345, 340),
 size=wx.Size(72, 32), style=0)
 EVT_BUTTON(self, wxID_EDITVARIABLEDIALOGADDBUTTON, self.OnAddButton)
 size=wx.Size(32, 32), style=0)
 EVT_BUTTON(self, wxID_EDITVARIABLEDIALOGDOWNBUTTON, self.OnDownButton)
 self._init_sizers()
-def __init__(self, parent, name, pou_type, filter = "All"):
+def __init__(self, parent, name, pou_type, pou_is_used, filter = "All"):
 self._init_ctrls(parent, name)
 self.ButtonSizer = self.CreateButtonSizer(wxOK|wxCANCEL|wxCENTRE)
 self.flexGridSizer1.Add(self.ButtonSizer, 1, wxALIGN_RIGHT)
 self.Filter = filter
+self.PouIsUsed = pou_is_used
 self.FilterChoices = []
 self.FilterChoiceTransfer = {"All" : "All", "Interface" : "Interface",
-"Input" : "   Input", "Output" : "   Output", "InOut" : "   InOut",
+"   Input" : "Input", "   Output" : "Output", "   InOut" : "InOut",
-"External" : "   External", "Variables" : "Variables", "Local" : "   Local",
+"   External" : "External", "Variables" : "Variables", "   Local" : "Local",
-"Temp" : "   Temp", "Global" : "Global", "Access" : "Access"}
+"   Temp" : "Temp", "Global" : "Global", "Access" : "Access"}
 if pou_type:
-self.DefaultTypes = {"All" : "Input", "Interface" : "Input", "Variables" : "Local"}
+self.DefaultTypes = {"All" : "Local", "Interface" : "Input", "Variables" : "Local"}
 self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"}
 else:
 self.DefaultTypes = {"All" : "Global"}
 self.DefaultValue = {"Name" : "", "Class" : "", "Type" : "INT", "Location" : "", "Initial Value" : "", "Retain" : "No", "Constant" : "No"}
 if not pou_type or pou_type == "program":
 self.FilterChoices = ["All","Interface","   Input","   Output","   InOut","   External","Variables","   Local","   Temp"]
 self.ColSizes = [120, 70, 80, 120, 60, 70]
 self.ColAlignements = [wxALIGN_LEFT, wxALIGN_LEFT, wxALIGN_LEFT, wxALIGN_LEFT, wxALIGN_CENTER, wxALIGN_CENTER]
 for choice in self.FilterChoices:
 self.ClassFilter.Append(choice)
-self.ClassFilter.SetStringSelection(self.FilterChoiceTransfer[self.Filter])
+reverse_transfer = {}
+for filter, choice in self.FilterChoiceTransfer.items():
+reverse_transfer[choice] = filter
+self.ClassFilter.SetStringSelection(reverse_transfer[self.Filter])
 self.RefreshTypeList()
-self.RefreshUpDownButtons()
+self.RefreshButtons()
 self.OptionList = "Yes,No"
 self.TypeList = ",".join([value for value, parent in TypeHierarchy_list if not value.startswith("ANY")])
 if pou_type == "function":
 self.Table.ResetView(self.VariablesGrid)
 self.PouNames = []
+if self.PouIsUsed:
+wxCallAfter(self.WarningMessage, name)
 EVT_BUTTON(self, self.ButtonSizer.GetAffirmativeButton().GetId(), self.OnOK)
+def WarningMessage(self, name):
+message = wxMessageDialog(self, "\"%s\" is used by one or more POUs. Its interface can't be changed!"%name, "WARNING", wxOK|wxICON_EXCLAMATION)
+message.ShowModal()
+message.Destroy()
 def OnOK(self, event):
 self.VariablesGrid.SetGridCursor(0, 0)
 error = []
 if self.ReturnType.IsEnabled() and self.ReturnType.GetStringSelection() == "":
 message.Destroy()
 else:
 self.EndModal(wxID_OK)
 def OnClassFilter(self, event):
-reverse_transfer = {}
+self.Filter = self.FilterChoiceTransfer[self.ClassFilter.GetStringSelection()]
-for filter, choice in self.FilterChoiceTransfer.items():
-reverse_transfer[choice] = filter
-self.Filter = reverse_transfer[self.ClassFilter.GetStringSelection()]
 self.RefreshTypeList()
 self.RefreshValues()
-self.RefreshUpDownButtons()
+self.RefreshButtons()
 event.Skip()
 def RefreshTypeList(self):
 if self.Filter == "All":
-self.ClassList = [choice for choice in self.FilterChoiceTransfer.keys() if choice not in ["All","Interface","Variables"]]
+self.ClassList = [self.FilterChoiceTransfer[choice] for choice in self.FilterChoices if self.FilterChoiceTransfer[choice] not in ["All","Interface","Variables"]]
 elif self.Filter == "Interface":
 self.ClassList = ["Input","Output","InOut","External"]
 elif self.Filter == "Variables":
 self.ClassList = ["Local","Temp"]
 else:
 self.ClassList = [self.Filter]
-def RefreshUpDownButtons(self):
+def RefreshButtons(self):
-if self.Filter == "All":
+table_length = len(self.Table.data)
-self.UpButton.Enable(True)
+row_class = None
-self.DownButton.Enable(True)
+if table_length and self.PouIsUsed:
-else:
+row = self.VariablesGrid.GetGridCursorRow()
-self.UpButton.Enable(False)
+row_class = self.Table.GetValueByName(row, "Class")
-self.DownButton.Enable(False)
+self.AddButton.Enable(not self.PouIsUsed or self.Filter not in ["Interface", "Input", "Output", "InOut"])
+self.DeleteButton.Enable(table_length > 0 and row_class not in ["Input", "Output", "InOut"])
+self.UpButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
+self.DownButton.Enable(table_length > 0 and self.Filter == "All" and row_class not in ["Input", "Output", "InOut"])
 def OnAddButton(self, event):
 new_row = self.DefaultValue.copy()
 if self.Filter in self.DefaultTypes:
 new_row["Class"] = self.DefaultTypes[self.Filter]
 else:
 new_row["Class"] = self.Filter
 self.Values.append(new_row)
 self.RefreshValues()
+self.RefreshButtons()
 event.Skip()
 def OnDeleteButton(self, event):
 row = self.Table.GetRow(self.VariablesGrid.GetGridCursorRow())
 self.Values.remove(row)
 self.RefreshValues()
+self.RefreshButtons()
 event.Skip()
 def OnUpButton(self, event):
 self.MoveValue(self.VariablesGrid.GetGridCursorRow(), -1)
+self.RefreshButtons()
 event.Skip()
 def OnDownButton(self, event):
 self.MoveValue(self.VariablesGrid.GetGridCursorRow(), 1)
+self.RefreshButtons()
 event.Skip()
 def OnVariablesGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
 colname = self.Table.GetColLabelValue(col)
 else:
 event.Skip()
 else:
 event.Skip()
+def OnVariablesGridSelectCell(self, event):
+wxCallAfter(self.RefreshButtons)
+event.Skip()
 def SetPouNames(self, pou_names):
 self.PouNames = [pou_name.upper() for pou_name in pou_names]
 def SetValues(self, values):
 for item, value in values.items():
 self.VariablesGrid.SetGridCursor(new_index, self.VariablesGrid.GetGridCursorCol())
 else:
 self.RefreshValues()
 def RefreshValues(self):
-self.VariablesGrid.SetGridCursor(0, 0)
+if len(self.Table.data) > 0:
+self.VariablesGrid.SetGridCursor(0, 0)
 data = []
 for variable in self.Values:
 if variable["Class"] in self.ClassList:
 data.append(variable)
 self.Table.SetData(data)

changeset 37	256eedd275d0
parent 28	fc23e1f415d8
child 41	0688db995ddf