beremiz

IDE: Libraries in OrderedDict for access by name

2023-11-24, Edouard Tisserant
17d0d1641090
Parents 58bce98b9ac6
Children 89549813a6c1
IDE: Libraries in OrderedDict for access by name
1 files changed, 7 insertions(+), 6 deletions(-)
  • +7 -6
    ProjectController.py
    • --- a/ProjectController.py Fri Nov 24 14:51:27 2023 +0100
    +++ b/ProjectController.py Fri Nov 24 23:56:38 2023 +0100
    @@ -40,6 +40,7 @@
    from datetime import datetime
    from weakref import WeakKeyDictionary
    from functools import reduce
    +from collections import OrderedDict
    import wx
    @@ -280,7 +281,7 @@
    self.LastBuiltIECcodeDigest = None
    def LoadLibraries(self):
    - self.Libraries = []
    + self.Libraries = OrderedDict()
    TypeStack = []
    for libname, clsname, default in features.libraries:
    lib_enabled = False if type(default)==str else default
    @@ -293,7 +294,7 @@
    if lib_enabled:
    Lib = GetClassImporter(clsname)()(self, libname, TypeStack)
    TypeStack.append(Lib.GetTypes())
    - self.Libraries.append(Lib)
    + self.Libraries[libname] = Lib
    def CTNAddChild(self, CTNName, CTNType, IEC_Channel=0):
    """
    @@ -644,10 +645,10 @@
    def GetLibrariesTypes(self):
    self.LoadLibraries()
    - return [lib.GetTypes() for lib in self.Libraries]
    + return [lib.GetTypes() for lib in self.Libraries.values()]
    def GetLibrariesSTCode(self):
    - return "\n".join([lib.GetSTCode() for lib in self.Libraries])
    + return "\n".join([lib.GetSTCode() for lib in self.Libraries.values()])
    def GetLibrariesCCode(self, buildpath):
    if len(self.Libraries) == 0:
    @@ -657,7 +658,7 @@
    self.GetIECLibPath())
    LocatedCCodeAndFlags = []
    Extras = []
    - for lib in self.Libraries:
    + for lib in self.Libraries.values():
    res = lib.Generate_C(buildpath, self._VariablesList, LibIECCflags)
    LocatedCCodeAndFlags.append(res[:2])
    if len(res) > 2:
    @@ -778,7 +779,7 @@
    def GetConfNodeGlobalInstances(self):
    LibGlobals = []
    - for lib in self.Libraries:
    + for lib in self.Libraries.values():
    LibGlobals += lib.GlobalInstances()
    CTNGlobals = self._GlobalInstances()
    return LibGlobals + CTNGlobals