lpcmanager

#2538 removed dangerous and unmaintainable code

2018-01-29, Edouard Tisserant
169d6c59873d
Parents 80122593c8c3
Children c059320c8bbb
#2538 removed dangerous and unmaintainable code
1 files changed, 0 insertions(+), 92 deletions(-)
  • +0 -92
    LPCManager.py
    • --- a/LPCManager.py Mon Jan 29 13:55:14 2018 +0100
    +++ b/LPCManager.py Mon Jan 29 13:57:06 2018 +0100
    @@ -19,7 +19,6 @@
    _lpcmanager_path = os.path.split(__file__)[0]
    _dist_folder = os.path.split(sys.path[0])[0]
    _beremiz_folder = os.path.join(_dist_folder, "beremiz")
    -_checkBlocks = 1
    sys.path.append(_beremiz_folder)
    if __name__ == '__main__':
    @@ -179,8 +178,6 @@
    from editors.CodeFileEditor import VariablesTable
    from editors.CodeFileEditor import VariablesEditor
    from editors.CodeFileEditor import CodeEditor
    -from editors.TextViewer import TextViewer, EditorPanel, LABEL_MODEL
    -from controls.CustomStyledTextCtrl import GetCursorPos
    from controls import ProjectPropertiesPanel
    from controls.SearchResultPanel import SearchResultPanel
    # from controls.LogViewer import LogViewer
    @@ -789,26 +786,6 @@
    ProjectPropertiesPanel.__init__ = OurProjectPropertiesPanelInit
    -def GetFunctionBlockTypes(self, tagname="", debug=False):
    - project = self.GetProject(debug)
    - words = tagname.split("::")
    - name = None
    - if project is not None and words[0] in ["P", "T", "A"]:
    - name = words[1]
    - blocktypes = []
    - for blocks in self.TotalTypesDict.itervalues():
    - for sectioname, block in blocks:
    - if block["type"] == "functionBlock":
    - blocktypes.append(block["name"])
    - if project is not None:
    - global _checkBlocks
    - if _checkBlocks:
    - blocktypes.extend([pou.getname() for pou in project.getpous(name, ["functionBlock"]) if (name is None or len(self.GetInstanceList(pou, name, debug)) == 0)])
    - else:
    - blocktypes.extend([pou.getname() for pou in project.getpous(name, ["functionBlock"])])
    - return blocktypes
    -PLCControler.GetFunctionBlockTypes = GetFunctionBlockTypes
    -
    def LeftClick(self, event):
    if event.GetCol() == self.grid.GetNumberCols()-1:
    options = [self.grid.GetCellValue(event.GetRow(), event.GetCol()), self.grid.GetCellValue(event.GetRow(), event.GetCol()-1)]
    @@ -832,55 +809,6 @@
    event.Skip()
    VariablesTable.LeftClick = LeftClick
    -def RefreshView(self, variablepanel=True):
    - EditorPanel.RefreshView(self, variablepanel)
    -
    - if self.Controler is not None:
    - self.ResetBuffer()
    - self.DisableEvents = True
    - old_cursor_pos = self.GetCurrentPos()
    - line = self.Editor.GetFirstVisibleLine()
    - column = self.Editor.GetXOffset()
    - old_text = self.GetText()
    - new_text = self.Controler.GetEditedElementText(self.TagName, self.Debug)
    - if old_text != new_text:
    - self.SetText(new_text)
    - new_cursor_pos = GetCursorPos(old_text, new_text)
    - self.Editor.LineScroll(column, line)
    - if new_cursor_pos != None:
    - self.Editor.GotoPos(new_cursor_pos)
    - else:
    - self.Editor.GotoPos(old_cursor_pos)
    - self.RefreshJumpList()
    - self.Editor.EmptyUndoBuffer()
    - self.DisableEvents = False
    -
    - self.RefreshVariableTree()
    -
    - self.TypeNames = [typename.upper() for typename in self.Controler.GetDataTypes(self.TagName, True, self.Debug)]
    - self.EnumeratedValues = [value.upper() for value in self.Controler.GetEnumeratedDataValues()]
    -
    - self.Functions = {}
    - global _checkBlocks
    - if _checkBlocks:
    - for category in self.Controler.GetBlockTypes(self.TagName, self.Debug):
    - for blocktype in category["list"]:
    - blockname = blocktype["name"].upper()
    - if blocktype["type"] == "function" and blockname not in self.Keywords and blockname not in self.Variables.keys():
    - interface = dict([(name, {}) for name, type, modifier in blocktype["inputs"] + blocktype["outputs"] if name != ''])
    - for param in ["EN", "ENO"]:
    - if not interface.has_key(param):
    - interface[param] = {}
    - if self.Functions.has_key(blockname):
    - self.Functions[blockname]["interface"].update(interface)
    - self.Functions[blockname]["extensible"] |= blocktype["extensible"]
    - else:
    - self.Functions[blockname] = {"interface": interface,
    - "extensible": blocktype["extensible"]}
    -
    - self.Colourise(0, -1)
    -TextViewer.RefreshView = RefreshView
    -
    def VariablesEditorSetCollSize(self):
    ColSizes = [20, 150] + [130] * (len(self.VariablesDefaultValue) - 2) + [300]
    for col in range(self.Table.GetNumberCols()):
    @@ -965,7 +893,6 @@
    SCROLLBAR_UNIT = 10
    ID_EXPORT = 7500
    -ID_CHECK = 7501
    WINDOW_COLOUR = wx.Colour(240, 240, 240)
    TITLE_COLOUR = wx.Colour(200, 200, 220)
    CHANGED_TITLE_COLOUR = wx.Colour(220, 200, 220)
    @@ -2076,14 +2003,6 @@
    export = True
    else:
    export = False
    - checker = str(config.Read("Checker"))
    - if checker == "":
    - config.Write("Checker", '0')
    - checker = '0'
    - if checker == '1':
    - checker = True
    - else:
    - checker = False
    AppendMenu(parent, help='', id=wx.ID_SAVE,
    kind=wx.ITEM_NORMAL, text=_(u'Save\tCTRL+S'))
    AppendMenu(parent, help='', id=wx.ID_CLOSE,
    @@ -2099,9 +2018,6 @@
    if export:
    AppendMenu(parent, help='', id=ID_EXPORT,
    kind=wx.ITEM_NORMAL, text=_(u'Export'))
    - if checker:
    - parent.AppendCheckItem(ID_CHECK, u'Disable checking')
    - if (export or checker):
    parent.AppendSeparator()
    AppendMenu(parent, help='', id=wx.ID_EXIT,
    kind=wx.ITEM_NORMAL, text=_(u'Quit\tCTRL+Q'))
    @@ -2113,7 +2029,6 @@
    self.Bind(wx.EVT_MENU, self.OnPrintMenu, id=wx.ID_PRINT)
    if export:
    self.Bind(wx.EVT_MENU, lambda event: VariableWriter(self, event, self.CTR.ProjectPath), id=ID_EXPORT)
    - self.Bind(wx.EVT_MENU, lambda event: self.CheckEnabler(event), id=ID_CHECK)
    self.Bind(wx.EVT_MENU, self.OnQuitMenu, id=wx.ID_EXIT)
    self.AddToMenuToolBar([(wx.ID_SAVE, "save", _(u'Save'), None),
    @@ -2138,13 +2053,6 @@
    # thread.start()
    # #thread.join()
    - def CheckEnabler(self, event):
    - global _checkBlocks
    - if event.Selection == 1:
    - _checkBlocks = 0
    - else:
    - _checkBlocks = 1
    -
    def OnCloseFrame(self, event):
    global frame