beremiz

Merged in Surkovsv/beremiz (pull request #2)

2016-09-09, Andrey Skvortsov
3519eee2bdf6
Parents e44950d4c218fef49488b5c7
Children 70fc5688741e
Merged in Surkovsv/beremiz (pull request #2)

fix bug with non-editable names and types of FB local variables in POU's written in ST or IL
1 files changed, 9 insertions(+), 1 deletions(-)
  • +9 -1
    controls/VariablePanel.py
    • --- a/controls/VariablePanel.py Mon Sep 05 16:47:34 2016 +0300
    +++ b/controls/VariablePanel.py Fri Sep 09 13:39:24 2016 +0300
    @@ -144,6 +144,14 @@
    def GetOldValue(self):
    return self.old_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;
    + return row_edit
    +
    def _updateColAttrs(self, grid):
    """
    wx.grid.Grid -> update the column attributes to add the
    @@ -171,7 +179,7 @@
    editor.SetParameters(",".join(map(_, options)))
    else:
    grid.SetReadOnly(row, col, True)
    - elif col != 0 and self.GetValueByName(row, "Edit"):
    + elif col != 0 and self._GetRowEdit(row):
    grid.SetReadOnly(row, col, False)
    if colname == "Name":
    editor = wx.grid.GridCellTextEditor()