# HG changeset patch # User Laurent Bessard # Date 1347035561 -7200 # Node ID 7228610e2273d664cace7c5c0446466250e7bc56 # Parent 3eaac99279411fd971b4d81904dfa0a26eb3801d Fix import after integration of plcopeneditor into Beremiz diff -r 3eaac9927941 -r 7228610e2273 LPCManager.py --- a/LPCManager.py Wed Sep 05 11:16:37 2012 +0200 +++ b/LPCManager.py Fri Sep 07 18:32:41 2012 +0200 @@ -58,9 +58,6 @@ if __name__ == '__main__': __builtin__.__dict__['_'] = wx.GetTranslation#unicode_translation -_base_folder = os.path.split(sys.path[0])[0] -sys.path.append(os.path.join(_base_folder, "beremiz")) - _base_path = os.path.split(__file__)[0] import features from POULibrary import POULibrary @@ -86,12 +83,13 @@ from Beremiz import * from ProjectController import ProjectController from ConfigTreeNode import ConfigTreeNode -from ProjectNodeEditor import ProjectNodeEditor +from editors.ProjectNodeEditor import ProjectNodeEditor from plcopen.structures import LOCATIONDATATYPES from PLCControler import PLCControler, LOCATION_CONFNODE, LOCATION_MODULE, LOCATION_GROUP,\ LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY -from PLCOpenEditor import IDEFrame, ProjectDialog +from IDEFrame import IDEFrame +from dialogs import ProjectDialog havecanfestival = False try: