beremiz: comparison controls/VariablePanel.py

equal deleted inserted replaced

-:72a826dfcfbb
+:02fe382c4511
 from dialogs.ArrayTypeDialog import ArrayTypeDialog
 from CustomGrid import CustomGrid
 from CustomTable import CustomTable
 from LocationCellEditor import LocationCellEditor
 from util.BitmapLibrary import GetBitmap
+from PLCControler import _VariableInfos
 #-------------------------------------------------------------------------------
 #                                 Helpers
 #-------------------------------------------------------------------------------
 def __init__(self, parent, data, colnames):
 # The base class must be initialized *first*
 CustomTable.__init__(self, parent, data, colnames)
 self.old_value = None
+def GetValueByName(self, row, colname):
+if row < self.GetNumberRows():
+return getattr(self.data[row], colname)
+def SetValueByName(self, row, colname, value):
+if row < self.GetNumberRows():
+setattr(self.data[row], colname, value)
 def GetValue(self, row, col):
 if row < self.GetNumberRows():
 if col == 0:
-return self.data[row]["Number"]
+return self.data[row].Number
 colname = self.GetColLabelValue(col, False)
-value = self.data[row].get(colname, "")
+if colname == "Initial Value":
+colname = "InitialValue"
+value = getattr(self.data[row], colname, "")
 if colname == "Type" and isinstance(value, TupleType):
 if value[0] == "array":
 return "ARRAY [%s] OF %s" % (",".join(map(lambda x : "..".join(x), value[2])), value[1])
 if not isinstance(value, (StringType, UnicodeType)):
 value = str(value)
 def SetValue(self, row, col, value):
 if col < len(self.colnames):
 colname = self.GetColLabelValue(col, False)
 if colname == "Name":
-self.old_value = self.data[row][colname]
+self.old_value = getattr(self.data[row], colname)
 elif colname == "Class":
 value = VARIABLE_CLASSES_DICT[value]
 self.SetValueByName(row, "Option", CheckOptionForClass[value](self.GetValueByName(row, "Option")))
 if value == "External":
-self.SetValueByName(row, "Initial Value", "")
+self.SetValueByName(row, "InitialValue", "")
 elif colname == "Option":
 value = OPTIONS_DICT[value]
-self.data[row][colname] = value
+elif colname == "Initial Value":
+colname = "InitialValue"
+setattr(self.data[row], colname, value)
 def GetOldValue(self):
 return self.old_value
 def _updateColAttrs(self, grid):
 renderer = wx.grid.GridCellStringRenderer()
 elif colname == "Initial Value":
 if var_class not in ["External", "InOut"]:
 if self.Parent.Controler.IsEnumeratedType(var_type):
 editor = wx.grid.GridCellChoiceEditor()
-editor.SetParameters(",".join(self.Parent.Controler.GetEnumeratedDataValues(var_type)))
+editor.SetParameters(",".join([""] + self.Parent.Controler.GetEnumeratedDataValues(var_type)))
 else:
 editor = wx.grid.GridCellTextEditor()
 renderer = wx.grid.GridCellStringRenderer()
 else:
 grid.SetReadOnly(row, col, True)
 message = _("\"%s\" pou already exists!")%var_name
 elif not var_name.upper() in [name.upper()
 for name in self.ParentWindow.Controler.\
 GetEditedElementVariables(tagname, self.ParentWindow.Debug)]:
 var_infos = self.ParentWindow.DefaultValue.copy()
-var_infos["Name"] = var_name
+var_infos.Name = var_name
-var_infos["Type"] = values[2]
+var_infos.Type = values[2]
 if values[1] == "location":
 location = values[0]
 if not location.startswith("%"):
 dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow.ParentWindow,
 _("Select a variable class:"), _("Variable class"),
 if not var_name.upper() in [name.upper()
 for name in self.ParentWindow.Controler.\
 GetConfigurationVariableNames(configs[0])]:
 self.ParentWindow.Controler.AddConfigurationGlobalVar(
 configs[0], values[2], var_name, location, "")
-var_infos["Class"] = "External"
+var_infos.Class = "External"
 else:
 if element_type == "program":
-var_infos["Class"] = "Local"
+var_infos.Class = "Local"
 else:
-var_infos["Class"] = "Global"
+var_infos.Class = "Global"
-var_infos["Location"] = location
+var_infos.Location = location
 else:
-var_infos["Class"] = "External"
+var_infos.Class = "External"
-var_infos["Number"] = len(self.ParentWindow.Values)
+var_infos.Number = len(self.ParentWindow.Values)
 self.ParentWindow.Values.append(var_infos)
 self.ParentWindow.SaveValues()
 self.ParentWindow.RefreshValues()
 if message is not None:
 self.Filter = "All"
 self.FilterChoices = []
 self.FilterChoiceTransfer = GetFilterChoiceTransfer()
-self.DefaultValue = {
+self.DefaultValue = _VariableInfos("", "", "", "", "", True, "", "INT", ([], []), 0)
-"Name" : "",
-"Class" : "",
-"Type" : "INT",
-"Location" : "",
-"Initial Value" : "",
-"Option" : "",
-"Documentation" : "",
-"Edit" : True
-}
 if element_type in ["config", "resource"]:
 self.DefaultTypes = {"All" : "Global"}
 else:
 self.DefaultTypes = {"All" : "Local", "Interface" : "Input", "Variables" : "Local"}
 c = wx.ALIGN_CENTER
 #                      Num  Name    Class   Type    Init    Option   Doc
 self.ColSizes       = [40,  80,     70,     80,     80,     100,     160]
 self.ColAlignements = [c,   l,      l,      l,      l,      l,       l]
+self.ElementType = element_type
+self.BodyType = None
 for choice in self.FilterChoices:
 self.ClassFilter.Append(_(choice))
 reverse_transfer = {}
 for filter, choice in self.FilterChoiceTransfer.items():
 def _AddVariable(new_row):
 if new_row > 0:
 row_content = self.Values[new_row - 1].copy()
-result = VARIABLE_NAME_SUFFIX_MODEL.search(row_content["Name"])
+result = VARIABLE_NAME_SUFFIX_MODEL.search(row_content.Name)
 if result is not None:
-name = row_content["Name"][:result.start(1)]
+name = row_content.Name[:result.start(1)]
 suffix = result.group(1)
 if suffix != "":
 start_idx = int(suffix)
 else:
 start_idx = 0
 else:
-name = row_content["Name"]
+name = row_content.Name
 start_idx = 0
 else:
 row_content = None
 start_idx = 0
 name = "LocalVar"
-if row_content is not None and row_content["Edit"]:
+if row_content is not None and row_content.Edit:
 row_content = self.Values[new_row - 1].copy()
 else:
 row_content = self.DefaultValue.copy()
 if self.Filter in self.DefaultTypes:
-row_content["Class"] = self.DefaultTypes[self.Filter]
+row_content.Class = self.DefaultTypes[self.Filter]
 else:
-row_content["Class"] = self.Filter
+row_content.Class = self.Filter
-row_content["Name"] = self.Controler.GenerateNewName(
+row_content.Name = self.Controler.GenerateNewName(
 self.TagName, None, name + "%d", start_idx)
 if self.Filter == "All" and len(self.Values) > 0:
 self.Values.insert(new_row, row_content)
 else:
 def _DeleteVariable(row):
 if self.Table.GetValueByName(row, "Edit"):
 self.Values.remove(self.Table.GetRow(row))
 self.SaveValues()
+if self.ElementType == "resource":
+self.ParentWindow.RefreshView(variablepanel = False)
 self.RefreshValues()
 setattr(self.VariablesGrid, "_DeleteRow", _DeleteVariable)
 def _MoveVariable(row, move):
 if self.Filter == "All":
 def __del__(self):
 self.RefreshHighlightsTimer.Stop()
 def SetTagName(self, tagname):
 self.TagName = tagname
+self.BodyType = self.Controler.GetEditedElementBodyType(self.TagName)
 def GetTagName(self):
 return self.TagName
 def IsFunctionBlockType(self, name):
-bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
+if self.ElementType != "function" and self.BodyType in ["ST", "IL"]:
-pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
-if poutype != "function" and bodytype in ["ST", "IL"]:
 return False
 else:
-return name in self.Controler.GetFunctionBlockTypes(self.TagName)
+return self.Controler.GetBlockType(name, debug=self.Debug) is not None
 def RefreshView(self):
 self.PouNames = self.Controler.GetProjectPouNames(self.Debug)
 returnType = None
 description = None
 else:
 if self.ElementType == "function":
 self.ReturnType.Clear()
 for data_type in self.Controler.GetDataTypes(self.TagName, debug=self.Debug):
 self.ReturnType.Append(data_type)
-returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName)
+returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, debug=self.Debug)
 description = self.Controler.GetPouDescription(words[1])
-self.Values = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)
+self.Values = self.Controler.GetEditedElementInterfaceVars(self.TagName, debug=self.Debug)
 if returnType is not None:
 self.ReturnType.SetStringSelection(returnType)
 self.ReturnType.Enable(not self.Debug)
 self.ReturnTypeLabel.Show()
 message = _("\"%s\" is not a valid identifier!") % value
 elif value.upper() in IEC_KEYWORDS:
 message = _("\"%s\" is a keyword. It can't be used!") % value
 elif value.upper() in self.PouNames:
 message = _("A POU named \"%s\" already exists!") % value
-elif value.upper() in [var["Name"].upper() for var in self.Values if var != self.Table.data[row]]:
+elif value.upper() in [var.Name.upper() for var in self.Values if var != self.Table.data[row]]:
 message = _("A variable with \"%s\" as name already exists in this pou!") % value
 else:
 self.SaveValues(False)
 old_value = self.Table.GetOldValue()
 if old_value != "":
 event.Skip()
 def RefreshValues(self):
 data = []
 for num, variable in enumerate(self.Values):
-if variable["Class"] in self.ClassList:
+if variable.Class in self.ClassList:
-variable["Number"] = num + 1
+variable.Number = num + 1
 data.append(variable)
 self.Table.SetData(data)
 self.Table.ResetView(self.VariablesGrid)
 def SaveValues(self, buffer = True):

branch	1.1 Korean release
changeset 1384	02fe382c4511
parent 1361	7158aa054226
child 1380	10ac2b18437b