# HG changeset patch # User Edouard Tisserant # Date 1339848952 -7200 # Node ID 6450214a7c806cb01c9bd57a1a98e87bad51d8dd # Parent 73dcd03f53bb280879c24bb4a8106ba50d00676c# Parent 516f661a4fc51b1014b265ec38bbf66287342246 merge diff -r 516f661a4fc5 -r 6450214a7c80 LPCManager.py --- a/LPCManager.py Sat Jun 16 09:25:21 2012 +0200 +++ b/LPCManager.py Sat Jun 16 14:15: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