beremiz: comparison controls/VariablePanel.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from CustomGrid import CustomGrid
 from CustomTable import CustomTable
 from LocationCellEditor import LocationCellEditor
 from util.BitmapLibrary import GetBitmap
 from PLCControler import _VariableInfos
+from util.TranslationCatalogs import NoTranslate
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                                 Helpers
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
-[TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE,
-POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES
+[
+TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE,
+POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES
 ] = range(10)
 def GetVariableTableColnames(location):
-_ = lambda x : x
+_ = NoTranslate
-if location:
+cols = ["#",
-	return ["#", _("Name"), _("Class"), _("Type"), _("Location"), _("Initial Value"), _("Option"), _("Documentation")]
+_("Name"),
-return ["#", _("Name"), _("Class"), _("Type"), _("Initial Value"), _("Option"), _("Documentation")]
+_("Class"),
+_("Type"),
+_("Location"),
+_("Initial Value"),
+_("Option"),
+_("Documentation")]
+if not location:
+del cols[4]  # remove 'Location' column
+return cols
 def GetOptions(constant=True, retain=True, non_retain=True):
-_ = lambda x : x
+_ = NoTranslate
 options = [""]
 if constant:
 options.append(_("Constant"))
 if retain:
 options.append(_("Retain"))
 if non_retain:
 options.append(_("Non-Retain"))
 return options
 OPTIONS_DICT = dict([(_(option), option) for option in GetOptions()])
 def GetFilterChoiceTransfer():
-_ = lambda x : x
+_ = NoTranslate
 return {_("All"): _("All"), _("Interface"): _("Interface"),
 _("   Input"): _("Input"), _("   Output"): _("Output"), _("   InOut"): _("InOut"),
 _("   External"): _("External"), _("Variables"): _("Variables"), _("   Local"): _("Local"),
-_("   Temp"): _("Temp"), _("Global"): _("Global")}#, _("Access") : _("Access")}
+_("   Temp"): _("Temp"), _("Global"): _("Global")}  # , _("Access") : _("Access")}
 VARIABLE_CHOICES_DICT = dict([(_(_class), _class) for _class in GetFilterChoiceTransfer().iterkeys()])
 VARIABLE_CLASSES_DICT = dict([(_(_class), _class) for _class in GetFilterChoiceTransfer().itervalues()])
-CheckOptionForClass = {"Local": lambda x: x,
+CheckOptionForClass = {
-"Temp": lambda x: "",
+"Local": lambda x: x,
-"Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""),
+"Temp": lambda x: "",
-"InOut": lambda x: "",
+"Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""),
-"Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""),
+"InOut": lambda x: "",
-"Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""),
+"Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""),
-"External": lambda x: {"Constant": "Constant"}.get(x, "")
+"Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""),
-}
+"External": lambda x: {"Constant": "Constant"}.get(x, "")
+}
 LOCATION_MODEL = re.compile("((?:%[IQM](?:\*|(?:[XBWLD]?[0-9]+(?:\.[0-9]+)*)))?)$")
 VARIABLE_NAME_SUFFIX_MODEL = re.compile("([0-9]*)$")
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                            Variables Panel Table
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class VariableTable(CustomTable):
 """
 A custom wx.grid.Grid Table using user supplied data
 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])
+return "ARRAY [%s] OF %s" % (",".join(map(lambda x: "..".join(x), value[2])), value[1])
 if not isinstance(value, (StringType, UnicodeType)):
 value = str(value)
 if colname in ["Class", "Option"]:
 return _(value)
 return value
 def _GetRowEdit(self, row):
 row_edit = self.GetValueByName(row, "Edit")
 var_type = self.Parent.GetTagName()
 bodytype = self.Parent.Controler.GetEditedElementBodyType(var_type)
 if bodytype in ["ST", "IL"]:
-row_edit = True;
+row_edit = True
 return row_edit
 def _updateColAttrs(self, grid):
 """
 wx.grid.Grid -> update the column attributes to add the
 colname = self.GetColLabelValue(col, False)
 if self.Parent.Debug:
 grid.SetReadOnly(row, col, True)
 else:
 if colname == "Option":
-options = GetOptions(constant = var_class in ["Local", "External", "Global"],
+options = GetOptions(constant=var_class in ["Local", "External", "Global"],
-retain = self.Parent.ElementType != "function" and var_class in ["Local", "Input", "Output", "Global"],
+retain=self.Parent.ElementType != "function" and var_class in ["Local", "Input", "Output", "Global"],
-non_retain = self.Parent.ElementType != "function" and var_class in ["Local", "Input", "Output"])
+non_retain=self.Parent.ElementType != "function" and var_class in ["Local", "Input", "Output"])
 if len(options) > 1:
 editor = wx.grid.GridCellChoiceEditor()
 editor.SetParameters(",".join(map(_, options)))
 else:
 grid.SetReadOnly(row, col, True)
 grid.SetReadOnly(row, col, True)
 else:
 editor = wx.grid.GridCellChoiceEditor()
 excluded = []
 if self.Parent.IsFunctionBlockType(var_type):
-excluded.extend(["Local","Temp"])
+excluded.extend(["Local", "Temp"])
 editor.SetParameters(",".join([_(choice) for choice in self.Parent.ClassList if choice not in excluded]))
 elif colname != "Documentation":
 grid.SetReadOnly(row, col, True)
 grid.SetCellEditor(row, col, editor)
 highlight_colours = row_highlights.get(colname.lower(), [(wx.WHITE, wx.BLACK)])[-1]
 grid.SetCellBackgroundColour(row, col, highlight_colours[0])
 grid.SetCellTextColour(row, col, highlight_colours[1])
 self.ResizeRow(grid, row)
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                         Variable Panel Drop Target
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class VariableDropTarget(wx.TextDropTarget):
 '''
 This allows dragging a variable location from somewhere to the Location
 column of a variable row.
 row = self.ParentWindow.VariablesGrid.YToRow(y)
 message = None
 element_type = self.ParentWindow.ElementType
 try:
 values = eval(data)
-except:
+except Exception:
-message = _("Invalid value \"%s\" for variable grid element")%data
+message = _("Invalid value \"%s\" for variable grid element") % data
 values = None
 if not isinstance(values, TupleType):
-message = _("Invalid value \"%s\" for variable grid element")%data
+message = _("Invalid value \"%s\" for variable grid element") % data
 values = None
 if values is not None:
 if col != wx.NOT_FOUND and row != wx.NOT_FOUND:
 colname = self.ParentWindow.Table.GetColLabelValue(col, False)
 if colname == "Location" and values[1] == "location":
 if values[2] is not None:
 base_location_type = self.ParentWindow.Controler.GetBaseType(values[2])
 if values[2] != variable_type and base_type != base_location_type:
 message = _("Incompatible data types between \"{a1}\" and \"{a2}\"").\
-format(a1 = values[2], a2 = variable_type)
+format(a1=values[2], a2=variable_type)
 if message is None:
 if not location.startswith("%"):
 if location[0].isdigit() and base_type != "BOOL":
-message = _("Incompatible size of data between \"%s\" and \"BOOL\"")%location
+message = _("Incompatible size of data between \"%s\" and \"BOOL\"") % location
 elif location[0] not in LOCATIONDATATYPES:
-message = _("Unrecognized data size \"%s\"")%location[0]
+message = _("Unrecognized data size \"%s\"") % location[0]
 elif base_type not in LOCATIONDATATYPES[location[0]]:
 message = _("Incompatible size of data between \"{a1}\" and \"{a2}\"").\
-format(a1 = location, a2 = variable_type)
+format(a1=location, a2=variable_type)
 else:
-dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow.ParentWindow,
+dialog = wx.SingleChoiceDialog(
-_("Select a variable class:"), _("Variable class"),
+self.ParentWindow.ParentWindow.ParentWindow,
-[_("Input"), _("Output"), _("Memory")],
+_("Select a variable class:"),
-wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
+_("Variable class"),
+[_("Input"), _("Output"), _("Memory")],
+wx.DEFAULT_DIALOG_STYLE | wx.OK | wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetSelection()
 else:
 selected = None
 dialog.Destroy()
 self.ParentWindow.Table.ResetView(self.ParentWindow.VariablesGrid)
 self.ParentWindow.SaveValues()
 elif (element_type not in ["config", "resource", "function"] and values[1] == "Global" and
 self.ParentWindow.Filter in ["All", "Interface", "External"] or
 element_type != "function" and values[1] in ["location", "NamedConstant"]):
-if values[1] in  ["location","NamedConstant"]:
+if values[1] in ["location", "NamedConstant"]:
 var_name = values[3]
 else:
 var_name = values[0]
 tagname = self.ParentWindow.GetTagName()
 dlg = wx.TextEntryDialog(
 dlg.SetValue(var_name)
 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
 dlg.Destroy()
 if var_name is None:
 return
-elif var_name.upper() in [name.upper()
+elif var_name.upper() in [
-for name in self.ParentWindow.Controler.\
+name.upper() for name in
-GetProjectPouNames(self.ParentWindow.Debug)]:
+self.ParentWindow.Controler.GetProjectPouNames(self.ParentWindow.Debug)]:
-message = _("\"%s\" pou already exists!")%var_name
+message = _("\"%s\" pou already exists!") % var_name
-elif not var_name.upper() in [name.upper()
+elif not var_name.upper() in [
-for name in self.ParentWindow.Controler.\
+name.upper()
-GetEditedElementVariables(tagname, self.ParentWindow.Debug)]:
+for name in self.ParentWindow.Controler.
+GetEditedElementVariables(tagname, self.ParentWindow.Debug)]:
 var_infos = self.ParentWindow.DefaultValue.copy()
 var_infos.Name = var_name
 var_infos.Type = values[2]
 var_infos.Documentation = values[4]
 if values[1] == "location":
 location = values[0]
 if not location.startswith("%"):
-dialog = wx.SingleChoiceDialog(self.ParentWindow.ParentWindow.ParentWindow,
+dialog = wx.SingleChoiceDialog(
-_("Select a variable class:"), _("Variable class"),
+self.ParentWindow.ParentWindow.ParentWindow,
-[_("Input"), _("Output"), _("Memory")],
+_("Select a variable class:"),
-wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
+_("Variable class"),
+[_("Input"), _("Output"), _("Memory")],
+wx.DEFAULT_DIALOG_STYLE | wx.OK | wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetSelection()
 else:
 selected = None
 dialog.Destroy()
 if element_type == "functionBlock":
 configs = self.ParentWindow.Controler.GetProjectConfigNames(
 self.ParentWindow.Debug)
 if len(configs) == 0:
 return
-if not var_name.upper() in [name.upper()
+if not var_name.upper() in [
-for name in self.ParentWindow.Controler.\
+name.upper() for name in
-GetConfigurationVariableNames(configs[0])]:
+self.ParentWindow.Controler.GetConfigurationVariableNames(configs[0])]:
 self.ParentWindow.Controler.AddConfigurationGlobalVar(
 configs[0], values[2], var_name, location, "")
 var_infos.Class = "External"
 else:
 if element_type == "program":
 var_infos.Class = "Local"
 else:
 var_infos.Class = "Global"
 var_infos.Location = location
 elif values[1] == "NamedConstant":
-if element_type in ["functionBlock","program"]:
+if element_type in ["functionBlock", "program"]:
 var_infos.Class = "Local"
 var_infos.InitialValue = values[0]
-else :
+else:
 return
 else:
 var_infos.Class = "External"
 var_infos.Number = len(self.ParentWindow.Values)
 self.ParentWindow.Values.append(var_infos)
 self.ParentWindow.SaveValues()
 self.ParentWindow.RefreshValues()
 else:
-message = _("\"%s\" element for this pou already exists!")%var_name
+message = _("\"%s\" element for this pou already exists!") % var_name
 if message is not None:
 wx.CallAfter(self.ShowMessage, message)
 def ShowMessage(self, message):
-message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK|wx.ICON_ERROR)
+message = wx.MessageDialog(self.ParentWindow, message, _("Error"), wx.OK | wx.ICON_ERROR)
 message.ShowModal()
 message.Destroy()
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                               Variable Panel
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 class VariablePanel(wx.Panel):
 def __init__(self, parent, window, controler, element_type, debug=False):
 wx.Panel.__init__(self, parent, style=wx.TAB_TRAVERSAL)
 self.MainSizer.AddGrowableRow(1)
 controls_sizer = wx.FlexGridSizer(cols=10, hgap=5, rows=1, vgap=5)
 controls_sizer.AddGrowableCol(5)
 controls_sizer.AddGrowableRow(0)
-self.MainSizer.AddSizer(controls_sizer, border=5, flag=wx.GROW|wx.ALL)
+self.MainSizer.AddSizer(controls_sizer, border=5, flag=wx.GROW | wx.ALL)
 self.ReturnTypeLabel = wx.StaticText(self, label=_('Return Type:'))
 controls_sizer.AddWindow(self.ReturnTypeLabel, flag=wx.ALIGN_CENTER_VERTICAL)
 self.ReturnType = wx.ComboBox(self,
 size=wx.Size(145, -1), style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnReturnTypeChanged, self.ReturnType)
 controls_sizer.AddWindow(self.ReturnType)
 self.DescriptionLabel = wx.StaticText(self, label=_('Description:'))
 controls_sizer.AddWindow(self.DescriptionLabel, flag=wx.ALIGN_CENTER_VERTICAL)
 self.Description = wx.TextCtrl(self,
 size=wx.Size(250, -1), style=wx.TE_PROCESS_ENTER)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnDescriptionChanged, self.Description)
 self.Description.Bind(wx.EVT_KILL_FOCUS, self.OnDescriptionChanged)
 controls_sizer.AddWindow(self.Description)
 class_filter_label = wx.StaticText(self, label=_('Class Filter:'))
 controls_sizer.AddWindow(class_filter_label, flag=wx.ALIGN_CENTER_VERTICAL)
 self.ClassFilter = wx.ComboBox(self,
 size=wx.Size(145, -1), style=wx.CB_READONLY)
 self.Bind(wx.EVT_COMBOBOX, self.OnClassFilter, self.ClassFilter)
 controls_sizer.AddWindow(self.ClassFilter)
 for name, bitmap, help in [
 ("AddButton", "add_element", _("Add variable")),
 ("DeleteButton", "remove_element", _("Remove variable")),
 ("UpButton", "up", _("Move variable up")),
 ("DownButton", "down", _("Move variable down"))]:
 button = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap(bitmap),
 size=wx.Size(28, 28), style=wx.NO_BORDER)
 button.SetToolTipString(help)
 setattr(self, name, button)
 controls_sizer.AddWindow(button)
 self.VariablesGrid = CustomGrid(self, style=wx.VSCROLL | wx.HSCROLL)
 self.VariablesGrid.SetDropTarget(VariableDropTarget(self))
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE,
 self.OnVariablesGridCellChange)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK,
 self.OnVariablesGridCellLeftClick)
 self.VariablesGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN,
 self.OnVariablesGridEditorShown)
 self.MainSizer.AddWindow(self.VariablesGrid, flag=wx.GROW)
 self.SetSizer(self.MainSizer)
 self.ParentWindow = window
 self.ElementType = element_type
 self.Debug = debug
 self.RefreshHighlightsTimer = wx.Timer(self, -1)
 self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer,
 self.RefreshHighlightsTimer)
 self.Filter = "All"
 self.FilterChoices = []
 self.FilterChoiceTransfer = GetFilterChoiceTransfer()
 self.DefaultValue = _VariableInfos("", "", "", "", "", True, "", DefaultType, ([], []), 0)
 if element_type in ["config", "resource"]:
-self.DefaultTypes = {"All" : "Global"}
+self.DefaultTypes = {"All": "Global"}
 else:
-self.DefaultTypes = {"All" : "Local", "Interface" : "Input", "Variables" : "Local"}
+self.DefaultTypes = {"All": "Local", "Interface": "Input", "Variables": "Local"}
 if element_type in ["config", "resource"] \
 or element_type in ["program", "transition", "action"]:
 # this is an element that can have located variables
 self.Table = VariableTable(self, [], GetVariableTableColnames(True))
 if element_type in ["config", "resource"]:
-self.FilterChoices = ["All", "Global"]#,"Access"]
+self.FilterChoices = ["All", "Global"]  # ,"Access"]
 else:
 self.FilterChoices = ["All",
 "Interface", "   Input", "   Output", "   InOut", "   External",
-"Variables", "   Local", "   Temp"]#,"Access"]
+"Variables", "   Local", "   Temp"]  # ,"Access"]
 # these condense the ColAlignements list
-l = wx.ALIGN_LEFT
+left = wx.ALIGN_LEFT
-c = wx.ALIGN_CENTER
+center = wx.ALIGN_CENTER
-#                      Num  Name    Class   Type    Loc     Init    Option   Doc
+#                        Num     Name    Class   Type    Loc     Init    Option   Doc
-self.ColSizes       = [40,  80,     100,    80,     110,     120,    100,     160]
+self.ColSettings = {
-self.ColAlignements = [c,   l,      l,      l,      l,      l,      l,       l]
+"size":             [40,     80,     100,    80,     110,    120,    100,     160],
-self.ColFixedSizeFlag=[True,False,  True,   False,  True,   True,   True,    False]
+"alignement":       [center, left,   left,   left,   left,   left,   left,    left],
+"fixed_size":       [True,   False,  True,   False,  True,   True,   True,    False],
+}
 else:
 # this is an element that cannot have located variables
 self.Table = VariableTable(self, [], GetVariableTableColnames(False))
 if element_type == "function":
 self.FilterChoices = ["All",
 "Interface", "   Input", "   Output", "   InOut",
 "Variables", "   Local"]
 else:
 self.FilterChoices = ["All",
 "Interface", "   Input", "   Output", "   InOut", "   External",
 "Variables", "   Local", "   Temp"]
-# these condense the ColAlignements list
+# these condense the alignements list
-l = wx.ALIGN_LEFT
+left = wx.ALIGN_LEFT
-c = wx.ALIGN_CENTER
+center = wx.ALIGN_CENTER
-#                      Num  Name    Class   Type    Init    Option   Doc
+#                        Num     Name    Class   Type    Init    Option   Doc
-self.ColSizes       = [40,  80,     100,    80,     120,    100,     160]
+self.ColSettings = {
-self.ColAlignements = [c,   l,      l,      l,      l,      l,       l]
+"size":             [40,     80,     100,    80,     120,    100,     160],
-self.ColFixedSizeFlag=[True,False,  True,   False,  True,   True,    False]
+"alignement":       [center, left,   left,   left,   left,   left,    left],
+"fixed_size":       [True,   False,  True,   False,  True,   True,    False],
-self.PanelWidthMin = sum(self.ColSizes)
+}
+self.PanelWidthMin = sum(self.ColSettings["size"])
 self.ElementType = element_type
 self.BodyType = None
 for choice in self.FilterChoices:
 self.ClassFilter.Append(_(choice))
 else:
 self.Values.append(row_content)
 new_row = self.Table.GetNumberRows()
 self.SaveValues()
 if self.ElementType == "resource":
-self.ParentWindow.RefreshView(variablepanel = False)
+self.ParentWindow.RefreshView(variablepanel=False)
 self.RefreshValues()
 return new_row
 setattr(self.VariablesGrid, "_AddRow", _AddVariable)
 def _DeleteVariable(row):
 if _GetRowEdit(row):
 self.Values.remove(self.Table.GetRow(row))
 self.SaveValues()
 if self.ElementType == "resource":
-self.ParentWindow.RefreshView(variablepanel = False)
+self.ParentWindow.RefreshView(variablepanel=False)
 self.RefreshValues()
 setattr(self.VariablesGrid, "_DeleteRow", _DeleteVariable)
 def _MoveVariable(row, move):
 if self.Filter == "All":
 setattr(self.VariablesGrid, "RefreshButtons", _RefreshButtons)
 panel_width = window.Parent.ScreenRect.Width - 35
 if panel_width > self.PanelWidthMin:
 stretch_cols_width = panel_width
 stretch_cols_sum = 0
-for col in range(len(self.ColFixedSizeFlag)):
+for col in range(len(self.ColSettings["fixed_size"])):
-if self.ColFixedSizeFlag[col]:
+if self.ColSettings["fixed_size"][col]:
-stretch_cols_width -= self.ColSizes[col]
+stretch_cols_width -= self.ColSettings["size"][col]
 else:
-stretch_cols_sum += self.ColSizes[col]
+stretch_cols_sum += self.ColSettings["size"][col]
 self.VariablesGrid.SetRowLabelSize(0)
 for col in range(self.Table.GetNumberCols()):
 attr = wx.grid.GridCellAttr()
-attr.SetAlignment(self.ColAlignements[col], wx.ALIGN_CENTRE)
+attr.SetAlignment(self.ColSettings["alignement"][col], wx.ALIGN_CENTRE)
 self.VariablesGrid.SetColAttr(col, attr)
-self.VariablesGrid.SetColMinimalWidth(col, self.ColSizes[col])
+self.VariablesGrid.SetColMinimalWidth(col, self.ColSettings["size"][col])
-if (panel_width > self.PanelWidthMin) and not self.ColFixedSizeFlag[col]:
+if (panel_width > self.PanelWidthMin) and not self.ColSettings["fixed_size"][col]:
-self.VariablesGrid.SetColSize(col, int((float(self.ColSizes[col])/stretch_cols_sum)*stretch_cols_width))
+self.VariablesGrid.SetColSize(col, int((float(self.ColSettings["size"][col])/stretch_cols_sum)*stretch_cols_width))
 else:
-self.VariablesGrid.SetColSize(col, self.ColSizes[col])
+self.VariablesGrid.SetColSize(col, self.ColSettings["size"][col])
 def __del__(self):
 self.RefreshHighlightsTimer.Stop()
 def SetTagName(self, tagname):
 def GetTagName(self):
 return self.TagName
 def IsFunctionBlockType(self, name):
-if (isinstance(name, TupleType) or
+if isinstance(name, TupleType) or \
-self.ElementType != "function" and self.BodyType in ["ST", "IL"]):
+self.ElementType != "function" and self.BodyType in ["ST", "IL"]:
 return False
 else:
 return self.Controler.GetBlockType(name, debug=self.Debug) is not None
 def RefreshView(self):
 def OnReturnTypeChanged(self, event):
 words = self.TagName.split("::")
 self.Controler.SetPouInterfaceReturnType(words[1], self.ReturnType.GetStringSelection())
 self.Controler.BufferProject()
-self.ParentWindow.RefreshView(variablepanel = False)
+self.ParentWindow.RefreshView(variablepanel=False)
 self.ParentWindow._Refresh(TITLE, FILEMENU, EDITMENU, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
 event.Skip()
 def OnDescriptionChanged(self, event):
 words = self.TagName.split("::")
 self.VariablesGrid.RefreshButtons()
 event.Skip()
 def RefreshTypeList(self):
 if self.Filter == "All":
-self.ClassList = [self.FilterChoiceTransfer[choice] for choice in self.FilterChoices if self.FilterChoiceTransfer[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"]
+self.ClassList = ["Input", "Output", "InOut", "External"]
 elif self.Filter == "Variables":
-self.ClassList = ["Local","Temp"]
+self.ClassList = ["Local", "Temp"]
 else:
 self.ClassList = [self.Filter]
 def ShowErrorMessage(self, message):
-dialog = wx.MessageDialog(self, message, _("Error"), wx.OK|wx.ICON_ERROR)
+dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR)
 dialog.ShowModal()
 dialog.Destroy()
 def OnVariablesGridCellChange(self, event):
 row, col = event.GetRow(), event.GetCol()
 colname = self.Table.GetColLabelValue(col, False)
 value = self.Table.GetValue(row, col)
 message = None
 elif colname == "Location":
 wx.CallAfter(self.ParentWindow.RefreshView)
 if message is not None:
 wx.CallAfter(self.ShowErrorMessage, message)
 event.Veto()
 else:
 event.Skip()
 def ClearLocation(self, row, col, value):
 if self.Values[row].Location != '':
 self.Table.GetColLabelValue(col, False) == 'Type' and not self.Controler.IsLocatableType(value):
 self.Values[row].Location = ''
 self.RefreshValues()
 self.SaveValues()
-def BuildStdIECTypesMenu(self,type_menu):
+def BuildStdIECTypesMenu(self, type_menu):
 # build a submenu containing standard IEC types
 base_menu = wx.Menu(title='')
 for base_type in self.Controler.GetBaseTypes():
 new_id = wx.NewId()
 base_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=base_type)
 self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(base_type), id=new_id)
 type_menu.AppendMenu(wx.NewId(), _("Base Types"), base_menu)
-def BuildUserTypesMenu(self,type_menu):
+def BuildUserTypesMenu(self, type_menu):
 # build a submenu containing user-defined types
 datatype_menu = wx.Menu(title='')
-datatypes = self.Controler.GetDataTypes(basetypes = False, confnodetypes = False)
+datatypes = self.Controler.GetDataTypes(basetypes=False, confnodetypes=False)
 for datatype in datatypes:
 new_id = wx.NewId()
 datatype_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=datatype)
 self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(datatype), id=new_id)
 def BuildProjectTypesMenu(self, type_menu, classtype):
 # build a submenu containing function block types
 bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
 pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
 if classtype in ["Input", "Output", "InOut", "External", "Global"] or \
 poutype != "function" and bodytype in ["ST", "IL"]:
 functionblock_menu = wx.Menu(title='')
 fbtypes = self.Controler.GetFunctionBlockTypes(self.TagName)
 for functionblock_type in fbtypes:
 new_id = wx.NewId()
 functionblock_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
 self.BuildUserTypesMenu(type_menu)
 self.BuildLibsTypesMenu(type_menu)
-self.BuildProjectTypesMenu(type_menu,classtype)
+self.BuildProjectTypesMenu(type_menu, classtype)
 self.BuildArrayTypesMenu(type_menu)
 rect = self.VariablesGrid.BlockToDeviceRect((row, col), (row, col))
 corner_x = rect.x + rect.width
 def VariableTypeFunction(event):
 row = self.VariablesGrid.GetGridCursorRow()
 self.Table.SetValueByName(row, "Type", base_type)
 self.Table.ResetView(self.VariablesGrid)
 self.SaveValues(False)
-self.ParentWindow.RefreshView(variablepanel = False)
+self.ParentWindow.RefreshView(variablepanel=False)
 self.Controler.BufferProject()
 self.ParentWindow._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
 return VariableTypeFunction
 def VariableArrayTypeFunction(self, event):
 self.Table.GetValueByName(row, "Type"))
 if dialog.ShowModal() == wx.ID_OK:
 self.Table.SetValueByName(row, "Type", dialog.GetValue())
 self.Table.ResetView(self.VariablesGrid)
 self.SaveValues(False)
-self.ParentWindow.RefreshView(variablepanel = False)
+self.ParentWindow.RefreshView(variablepanel=False)
 self.Controler.BufferProject()
 self.ParentWindow._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
 dialog.Destroy()
 def OnVariablesGridCellLeftClick(self, event):
 variable.Number = num + 1
 data.append(variable)
 self.Table.SetData(data)
 self.Table.ResetView(self.VariablesGrid)
-def SaveValues(self, buffer = True):
+def SaveValues(self, buffer=True):
 words = self.TagName.split("::")
 if self.ElementType == "config":
 self.Controler.SetConfigurationGlobalVars(words[1], self.Values)
 elif self.ElementType == "resource":
 self.Controler.SetConfigurationResourceGlobalVars(words[1], words[2], self.Values)
 self.Controler.SetPouInterfaceVars(words[1], self.Values)
 if buffer:
 self.Controler.BufferProject()
 self.ParentWindow._Refresh(TITLE, FILEMENU, EDITMENU, PAGETITLES, POUINSTANCEVARIABLESPANEL, LIBRARYTREE)
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                        Highlights showing functions
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 def OnRefreshHighlightsTimer(self, event):
 self.Table.ResetView(self.VariablesGrid)
 event.Skip()

changeset 1784	64beb9e9c749
parent 1782	5b6ad7a7fd9d
child 1833	2269739dd098