lpcmanager

merge

2012-06-17, Laurent Bessard
53a1fe844f7d
Parents 46c61895b25f879af3b3f095
Children 4a0b29a86ec0
merge
1 files changed, 9 insertions(+), 11 deletions(-)
  • +9 -11
    LPCManager.py
    • --- a/LPCManager.py Sun Jun 17 12:34:22 2012 +0200
    +++ b/LPCManager.py Sun Jun 17 12:37:52 2012 +0200
    @@ -62,6 +62,15 @@
    sys.path.append(os.path.join(_base_folder, "beremiz"))
    _base_path = os.path.split(__file__)[0]
    +import features
    +from POULibrary import POULibrary
    +
    +class PLCLibrary(POULibrary):
    + def GetLibraryPath(self):
    + return os.path.join(_base_path, "pous.xml")
    +
    +features.libraries=[('LPC', lambda: PLCLibrary)]
    +
    import connectors
    from LPCconnector import LPC_connector_factory
    @@ -79,17 +88,6 @@
    misc.opjimg = lambda imgname: os.path.join(_base_folder, "beremiz", "images", imgname+".png")
    from Beremiz import *
    -
    -import features
    -from POULibrary import POULibrary
    -
    -class PLCLibrary(POULibrary):
    - def GetLibraryPath(self):
    - return os.path.join(_base_path, "pous.xml")
    -
    -features.libraries.append(
    - ('LPC', lambda: PLCLibrary))
    -
    from ProjectController import ProjectController
    from ConfigTreeNode import ConfigTreeNode
    from ProjectNodeEditor import ProjectNodeEditor