author | beremiz |
Wed, 12 Aug 2009 15:21:00 +0200 | |
branch | cherry-pick |
changeset 671 | 6de6d6958efd |
parent 356 | e9698d0ee5f3 |
child 361 | 331d698e1118 |
permissions | -rw-r--r-- |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
1 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
2 |
Base definitions for beremiz plugins |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
3 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
4 |
|
178
2390b409eb93
Added PLC tick alignement on external synchronization source feature.
etisserant
parents:
176
diff
changeset
|
5 |
import os,sys,traceback |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
6 |
import plugins |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
7 |
import types |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
8 |
import shutil |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
9 |
from xml.dom import minidom |
22 | 10 |
import wx |
20 | 11 |
|
12 |
#Quick hack to be able to find Beremiz IEC tools. Should be config params. |
|
13 |
base_folder = os.path.split(sys.path[0])[0] |
|
14 |
sys.path.append(os.path.join(base_folder, "plcopeneditor")) |
|
126 | 15 |
sys.path.append(os.path.join(base_folder, "docutils")) |
16 |
||
17 |
from docpdf import * |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
18 |
from xmlclass import GenerateClassesFromXSDstring |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
19 |
from wxPopen import ProcessLogger |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
20 |
|
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
21 |
from PLCControler import PLCControler |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
22 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
23 |
_BaseParamsClass = GenerateClassesFromXSDstring("""<?xml version="1.0" encoding="ISO-8859-1" ?> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
24 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
25 |
<xsd:element name="BaseParams"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
26 |
<xsd:complexType> |
86 | 27 |
<xsd:attribute name="Name" type="xsd:string" use="optional" default="__unnamed__"/> |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
28 |
<xsd:attribute name="IEC_Channel" type="xsd:integer" use="required"/> |
86 | 29 |
<xsd:attribute name="Enabled" type="xsd:boolean" use="optional" default="true"/> |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
30 |
</xsd:complexType> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
31 |
</xsd:element> |
86 | 32 |
</xsd:schema>""")["BaseParams"] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
33 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
34 |
NameTypeSeparator = '@' |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
35 |
|
65 | 36 |
class MiniTextControler: |
37 |
||
38 |
def __init__(self, filepath): |
|
39 |
self.FilePath = filepath |
|
40 |
||
74 | 41 |
def SetEditedElementText(self, tagname, text): |
65 | 42 |
file = open(self.FilePath, "w") |
43 |
file.write(text) |
|
44 |
file.close() |
|
45 |
||
273 | 46 |
def GetEditedElementText(self, tagname, debug = False): |
65 | 47 |
if os.path.isfile(self.FilePath): |
48 |
file = open(self.FilePath, "r") |
|
49 |
text = file.read() |
|
50 |
file.close() |
|
51 |
return text |
|
52 |
return "" |
|
53 |
||
273 | 54 |
def GetEditedElementInterfaceVars(self, tagname, debug = False): |
74 | 55 |
return [] |
56 |
||
273 | 57 |
def GetEditedElementType(self, tagname, debug = False): |
74 | 58 |
return "program" |
59 |
||
273 | 60 |
def GetBlockTypes(self, tagname = "", debug = False): |
74 | 61 |
return [] |
62 |
||
273 | 63 |
def GetEnumeratedDataValues(self, debug = False): |
74 | 64 |
return [] |
65 |
||
65 | 66 |
def StartBuffering(self): |
67 |
pass |
|
68 |
||
69 |
def EndBuffering(self): |
|
70 |
pass |
|
71 |
||
72 |
def BufferProject(self): |
|
73 |
pass |
|
74 |
||
203 | 75 |
# helper func to get path to images |
76 |
def opjimg(imgname): |
|
77 |
return os.path.join("images",imgname) |
|
78 |
||
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
79 |
class PlugTemplate: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
80 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
81 |
This class is the one that define plugins. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
82 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
83 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
84 |
XSD = None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
85 |
PlugChildsTypes = [] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
86 |
PlugMaxCount = None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
87 |
PluginMethods = [] |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
88 |
LibraryControler = None |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
89 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
90 |
def _AddParamsMembers(self): |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
91 |
self.PlugParams = None |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
92 |
if self.XSD: |
86 | 93 |
Classes = GenerateClassesFromXSDstring(self.XSD) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
94 |
Classes = [(name, XSDclass) for name, XSDclass in Classes.items() if XSDclass.IsBaseClass] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
95 |
if len(Classes) == 1: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
96 |
name, XSDclass = Classes[0] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
97 |
obj = XSDclass() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
98 |
self.PlugParams = (name, obj) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
99 |
setattr(self, name, obj) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
100 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
101 |
def __init__(self): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
102 |
# Create BaseParam |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
103 |
self.BaseParams = _BaseParamsClass() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
104 |
self.MandatoryParams = ("BaseParams", self.BaseParams) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
105 |
self._AddParamsMembers() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
106 |
self.PluggedChilds = {} |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
107 |
# copy PluginMethods so that it can be later customized |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
108 |
self.PluginMethods = [dic.copy() for dic in self.PluginMethods] |
325
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
109 |
self.LoadSTLibrary() |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
110 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
111 |
def PluginBaseXmlFilePath(self, PlugName=None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
112 |
return os.path.join(self.PlugPath(PlugName), "baseplugin.xml") |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
113 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
114 |
def PluginXmlFilePath(self, PlugName=None): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
115 |
return os.path.join(self.PlugPath(PlugName), "plugin.xml") |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
116 |
|
325
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
117 |
def PluginLibraryFilePath(self): |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
118 |
return os.path.join(os.path.join(os.path.split(__file__)[0], "plugins", self.PlugType, "pous.xml")) |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
119 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
120 |
def PlugPath(self,PlugName=None): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
121 |
if not PlugName: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
122 |
PlugName = self.BaseParams.getName() |
203 | 123 |
return os.path.join(self.PlugParent.PlugPath(), |
124 |
PlugName + NameTypeSeparator + self.PlugType) |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
125 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
126 |
def PlugTestModified(self): |
118 | 127 |
return self.ChangesToSave |
128 |
||
129 |
def ProjectTestModified(self): |
|
130 |
""" |
|
131 |
recursively check modified status |
|
132 |
""" |
|
133 |
if self.PlugTestModified(): |
|
134 |
return True |
|
135 |
||
136 |
for PlugChild in self.IterChilds(): |
|
137 |
if PlugChild.ProjectTestModified(): |
|
138 |
return True |
|
139 |
||
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
140 |
return False |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
141 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
142 |
def OnPlugSave(self): |
20 | 143 |
#Default, do nothing and return success |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
144 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
145 |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
146 |
def GetParamsAttributes(self, path = None): |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
147 |
if path: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
148 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
149 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
150 |
return self.MandatoryParams[1].getElementInfos(parts[0], parts[1]) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
151 |
elif self.PlugParams and parts[0] == self.PlugParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
152 |
return self.PlugParams[1].getElementInfos(parts[0], parts[1]) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
153 |
else: |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
154 |
params = [] |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
155 |
if wx.VERSION < (2, 8, 0) and self.MandatoryParams: |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
156 |
params.append(self.MandatoryParams[1].getElementInfos(self.MandatoryParams[0])) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
157 |
if self.PlugParams: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
158 |
params.append(self.PlugParams[1].getElementInfos(self.PlugParams[0])) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
159 |
return params |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
160 |
|
203 | 161 |
def SetParamsAttribute(self, path, value): |
118 | 162 |
self.ChangesToSave = True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
163 |
# Filter IEC_Channel and Name, that have specific behavior |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
164 |
if path == "BaseParams.IEC_Channel": |
203 | 165 |
return self.FindNewIEC_Channel(value), True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
166 |
elif path == "BaseParams.Name": |
203 | 167 |
res = self.FindNewName(value) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
168 |
self.PlugRequestSave() |
118 | 169 |
return res, True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
170 |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
171 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
172 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
173 |
self.MandatoryParams[1].setElementValue(parts[1], value) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
174 |
elif self.PlugParams and parts[0] == self.PlugParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
175 |
self.PlugParams[1].setElementValue(parts[1], value) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
176 |
return value, False |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
177 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
178 |
def PlugRequestSave(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
179 |
# If plugin do not have corresponding directory |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
180 |
plugpath = self.PlugPath() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
181 |
if not os.path.isdir(plugpath): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
182 |
# Create it |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
183 |
os.mkdir(plugpath) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
184 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
185 |
# generate XML for base XML parameters controller of the plugin |
20 | 186 |
if self.MandatoryParams: |
187 |
BaseXMLFile = open(self.PluginBaseXmlFilePath(),'w') |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
188 |
BaseXMLFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
189 |
BaseXMLFile.write(self.MandatoryParams[1].generateXMLText(self.MandatoryParams[0], 0)) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
190 |
BaseXMLFile.close() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
191 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
192 |
# generate XML for XML parameters controller of the plugin |
20 | 193 |
if self.PlugParams: |
194 |
XMLFile = open(self.PluginXmlFilePath(),'w') |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
195 |
XMLFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
196 |
XMLFile.write(self.PlugParams[1].generateXMLText(self.PlugParams[0], 0)) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
197 |
XMLFile.close() |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
198 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
199 |
# Call the plugin specific OnPlugSave method |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
200 |
result = self.OnPlugSave() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
201 |
if not result: |
250 | 202 |
return "Error while saving \"%s\"\n"%self.PlugPath() |
118 | 203 |
|
204 |
# mark plugin as saved |
|
205 |
self.ChangesToSave = False |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
206 |
# go through all childs and do the same |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
207 |
for PlugChild in self.IterChilds(): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
208 |
result = PlugChild.PlugRequestSave() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
209 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
210 |
return result |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
211 |
return None |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
212 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
213 |
def PlugImport(self, src_PlugPath): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
214 |
shutil.copytree(src_PlugPath, self.PlugPath) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
215 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
216 |
|
203 | 217 |
def PlugGenerate_C(self, buildpath, locations): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
218 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
219 |
Generate C code |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
220 |
@param locations: List of complete variables locations \ |
22 | 221 |
[{"IEC_TYPE" : the IEC type (i.e. "INT", "STRING", ...) |
222 |
"NAME" : name of the variable (generally "__IW0_1_2" style) |
|
223 |
"DIR" : direction "Q","I" or "M" |
|
224 |
"SIZE" : size "X", "B", "W", "D", "L" |
|
225 |
"LOC" : tuple of interger for IEC location (0,1,2,...) |
|
226 |
}, ...] |
|
18 | 227 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
228 |
""" |
|
203 | 229 |
self.logger.write_warning(".".join(map(lambda x:str(x), self.GetCurrentLocation())) + " -> Nothing to do\n") |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
230 |
return [],"",False |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
231 |
|
203 | 232 |
def _Generate_C(self, buildpath, locations): |
233 |
# Generate plugins [(Cfiles, CFLAGS)], LDFLAGS, DoCalls, extra_files |
|
234 |
# extra_files = [(fname,fobject), ...] |
|
235 |
gen_result = self.PlugGenerate_C(buildpath, locations) |
|
236 |
PlugCFilesAndCFLAGS, PlugLDFLAGS, DoCalls = gen_result[:3] |
|
237 |
extra_files = gen_result[3:] |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
238 |
# if some files heve been generated put them in the list with their location |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
239 |
if PlugCFilesAndCFLAGS: |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
240 |
LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), PlugCFilesAndCFLAGS, DoCalls)] |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
241 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
242 |
LocationCFilesAndCFLAGS = [] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
243 |
|
115 | 244 |
# plugin asks for some LDFLAGS |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
245 |
if PlugLDFLAGS: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
246 |
# LDFLAGS can be either string |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
247 |
if type(PlugLDFLAGS)==type(str()): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
248 |
LDFLAGS=[PlugLDFLAGS] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
249 |
#or list of strings |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
250 |
elif type(PlugLDFLAGS)==type(list()): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
251 |
LDFLAGS=PlugLDFLAGS[:] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
252 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
253 |
LDFLAGS=[] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
254 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
255 |
# recurse through all childs, and stack their results |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
256 |
for PlugChild in self.IECSortedChilds(): |
24 | 257 |
new_location = PlugChild.GetCurrentLocation() |
258 |
# How deep are we in the tree ? |
|
259 |
depth=len(new_location) |
|
203 | 260 |
_LocationCFilesAndCFLAGS, _LDFLAGS, _extra_files = \ |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
261 |
PlugChild._Generate_C( |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
262 |
#keep the same path |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
263 |
buildpath, |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
264 |
# filter locations that start with current IEC location |
203 | 265 |
[loc for loc in locations if loc["LOC"][0:depth] == new_location ]) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
266 |
# stack the result |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
267 |
LocationCFilesAndCFLAGS += _LocationCFilesAndCFLAGS |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
268 |
LDFLAGS += _LDFLAGS |
203 | 269 |
extra_files += _extra_files |
270 |
||
271 |
return LocationCFilesAndCFLAGS, LDFLAGS, extra_files |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
272 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
273 |
def BlockTypesFactory(self): |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
274 |
if self.LibraryControler is not None: |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
275 |
return [{"name" : "%s POUs" % self.PlugType, "list": self.LibraryControler.Project.GetCustomBlockTypes()}] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
276 |
return [] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
277 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
278 |
def STLibraryFactory(self): |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
279 |
if self.LibraryControler is not None: |
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
280 |
program, errors, warnings = self.LibraryControler.GenerateProgram() |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
281 |
return program |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
282 |
return "" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
283 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
284 |
def IterChilds(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
285 |
for PlugType, PluggedChilds in self.PluggedChilds.items(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
286 |
for PlugInstance in PluggedChilds: |
250 | 287 |
yield PlugInstance |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
288 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
289 |
def IECSortedChilds(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
290 |
# reorder childs by IEC_channels |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
291 |
ordered = [(chld.BaseParams.getIEC_Channel(),chld) for chld in self.IterChilds()] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
292 |
if ordered: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
293 |
ordered.sort() |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
294 |
return zip(*ordered)[1] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
295 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
296 |
return [] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
297 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
298 |
def _GetChildBySomething(self, something, toks): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
299 |
for PlugInstance in self.IterChilds(): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
300 |
# if match component of the name |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
301 |
if getattr(PlugInstance.BaseParams, something) == toks[0]: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
302 |
# if Name have other components |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
303 |
if len(toks) >= 2: |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
304 |
# Recurse in order to find the latest object |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
305 |
return PlugInstance._GetChildBySomething( something, toks[1:]) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
306 |
# No sub name -> found |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
307 |
return PlugInstance |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
308 |
# Not found |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
309 |
return None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
310 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
311 |
def GetChildByName(self, Name): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
312 |
if Name: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
313 |
toks = Name.split('.') |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
314 |
return self._GetChildBySomething("Name", toks) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
315 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
316 |
return self |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
317 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
318 |
def GetChildByIECLocation(self, Location): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
319 |
if Location: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
320 |
return self._GetChildBySomething("IEC_Channel", Location) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
321 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
322 |
return self |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
323 |
|
23 | 324 |
def GetCurrentLocation(self): |
24 | 325 |
""" |
326 |
@return: Tupple containing plugin IEC location of current plugin : %I0.0.4.5 => (0,0,4,5) |
|
327 |
""" |
|
23 | 328 |
return self.PlugParent.GetCurrentLocation() + (self.BaseParams.getIEC_Channel(),) |
329 |
||
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
330 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
331 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
332 |
@return: String "ParentParentName.ParentName.Name" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
333 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
334 |
return self.PlugParent._GetCurrentName() + self.BaseParams.getName() |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
335 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
336 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
337 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
338 |
@return: String "ParentParentName.ParentName.Name." |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
339 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
340 |
return self.PlugParent._GetCurrentName() + self.BaseParams.getName() + "." |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
341 |
|
23 | 342 |
def GetPlugRoot(self): |
343 |
return self.PlugParent.GetPlugRoot() |
|
344 |
||
97 | 345 |
def GetFullIEC_Channel(self): |
346 |
return ".".join([str(i) for i in self.GetCurrentLocation()]) + ".x" |
|
347 |
||
348 |
def GetLocations(self): |
|
349 |
location = self.GetCurrentLocation() |
|
350 |
return [loc for loc in self.PlugParent.GetLocations() if loc["LOC"][0:len(location)] == location] |
|
351 |
||
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
352 |
def GetPlugInfos(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
353 |
childs = [] |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
354 |
# reorder childs by IEC_channels |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
355 |
for child in self.IECSortedChilds(): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
356 |
childs.append(child.GetPlugInfos()) |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
357 |
if wx.VERSION < (2, 8, 0): |
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
358 |
return {"name" : "%d-%s"%(self.BaseParams.getIEC_Channel(),self.BaseParams.getName()), "type" : self.BaseParams.getName(), "values" : childs} |
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
359 |
else: |
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
360 |
return {"name" : self.BaseParams.getName(), "channel" : self.BaseParams.getIEC_Channel(), "enabled" : self.BaseParams.getEnabled(), "parent" : len(self.PlugChildsTypes) > 0, "type" : self.BaseParams.getName(), "values" : childs} |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
361 |
|
203 | 362 |
def FindNewName(self, DesiredName): |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
363 |
""" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
364 |
Changes Name to DesiredName if available, Name-N if not. |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
365 |
@param DesiredName: The desired Name (string) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
366 |
""" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
367 |
# Get Current Name |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
368 |
CurrentName = self.BaseParams.getName() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
369 |
# Do nothing if no change |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
370 |
#if CurrentName == DesiredName: return CurrentName |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
371 |
# Build a list of used Name out of parent's PluggedChilds |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
372 |
AllNames=[] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
373 |
for PlugInstance in self.PlugParent.IterChilds(): |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
374 |
if PlugInstance != self: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
375 |
AllNames.append(PlugInstance.BaseParams.getName()) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
376 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
377 |
# Find a free name, eventually appending digit |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
378 |
res = DesiredName |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
379 |
suffix = 1 |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
380 |
while res in AllNames: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
381 |
res = "%s-%d"%(DesiredName, suffix) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
382 |
suffix += 1 |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
383 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
384 |
# Get old path |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
385 |
oldname = self.PlugPath() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
386 |
# Check previous plugin existance |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
387 |
dontexist = self.BaseParams.getName() == "__unnamed__" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
388 |
# Set the new name |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
389 |
self.BaseParams.setName(res) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
390 |
# Rename plugin dir if exist |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
391 |
if not dontexist: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
392 |
shutil.move(oldname, self.PlugPath()) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
393 |
# warn user he has two left hands |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
394 |
if DesiredName != res: |
203 | 395 |
self.logger.write_warning("A child names \"%s\" already exist -> \"%s\"\n"%(DesiredName,res)) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
396 |
return res |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
397 |
|
203 | 398 |
def FindNewIEC_Channel(self, DesiredChannel): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
399 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
400 |
Changes IEC Channel number to DesiredChannel if available, nearest available if not. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
401 |
@param DesiredChannel: The desired IEC channel (int) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
402 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
403 |
# Get Current IEC channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
404 |
CurrentChannel = self.BaseParams.getIEC_Channel() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
405 |
# Do nothing if no change |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
406 |
#if CurrentChannel == DesiredChannel: return CurrentChannel |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
407 |
# Build a list of used Channels out of parent's PluggedChilds |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
408 |
AllChannels=[] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
409 |
for PlugInstance in self.PlugParent.IterChilds(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
410 |
if PlugInstance != self: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
411 |
AllChannels.append(PlugInstance.BaseParams.getIEC_Channel()) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
412 |
AllChannels.sort() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
413 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
414 |
# Now, try to guess the nearest available channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
415 |
res = DesiredChannel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
416 |
while res in AllChannels: # While channel not free |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
417 |
if res < CurrentChannel: # Want to go down ? |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
418 |
res -= 1 # Test for n-1 |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
419 |
if res < 0 : |
203 | 420 |
self.logger.write_warning("Cannot find lower free IEC channel than %d\n"%CurrentChannel) |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
421 |
return CurrentChannel # Can't go bellow 0, do nothing |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
422 |
else : # Want to go up ? |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
423 |
res += 1 # Test for n-1 |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
424 |
# Finally set IEC Channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
425 |
self.BaseParams.setIEC_Channel(res) |
203 | 426 |
if DesiredChannel != res: |
427 |
self.logger.write_warning("A child with IEC channel %d already exist -> %d\n"%(DesiredChannel,res)) |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
428 |
return res |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
429 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
430 |
def OnPlugClose(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
431 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
432 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
433 |
def _doRemoveChild(self, PlugInstance): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
434 |
# Remove all childs of child |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
435 |
for SubPlugInstance in PlugInstance.IterChilds(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
436 |
PlugInstance._doRemoveChild(SubPlugInstance) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
437 |
# Call the OnCloseMethod |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
438 |
PlugInstance.OnPlugClose() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
439 |
# Delete plugin dir |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
440 |
shutil.rmtree(PlugInstance.PlugPath()) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
441 |
# Remove child of PluggedChilds |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
442 |
self.PluggedChilds[PlugInstance.PlugType].remove(PlugInstance) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
443 |
# Forget it... (View have to refresh) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
444 |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
445 |
def PlugRemove(self): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
446 |
# Fetch the plugin |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
447 |
#PlugInstance = self.GetChildByName(PlugName) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
448 |
# Ask to his parent to remove it |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
449 |
self.PlugParent._doRemoveChild(self) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
450 |
|
203 | 451 |
def PlugAddChild(self, PlugName, PlugType): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
452 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
453 |
Create the plugins that may be added as child to this node self |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
454 |
@param PlugType: string desining the plugin class name (get name from PlugChildsTypes) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
455 |
@param PlugName: string for the name of the plugin instance |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
456 |
""" |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
457 |
# reorgabize self.PlugChildsTypes tuples from (name, PlugClass, Help) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
458 |
# to ( name, (PlugClass, Help)), an make a dict |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
459 |
transpose = zip(*self.PlugChildsTypes) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
460 |
PlugChildsTypes = dict(zip(transpose[0],zip(transpose[1],transpose[2]))) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
461 |
# Check that adding this plugin is allowed |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
462 |
try: |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
463 |
PlugClass, PlugHelp = PlugChildsTypes[PlugType] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
464 |
except KeyError: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
465 |
raise Exception, "Cannot create child %s of type %s "%(PlugName, PlugType) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
466 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
467 |
# if PlugClass is a class factory, call it. (prevent unneeded imports) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
468 |
if type(PlugClass) == types.FunctionType: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
469 |
PlugClass = PlugClass() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
470 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
471 |
# Eventualy Initialize child instance list for this class of plugin |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
472 |
PluggedChildsWithSameClass = self.PluggedChilds.setdefault(PlugType, list()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
473 |
# Check count |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
474 |
if getattr(PlugClass, "PlugMaxCount", None) and len(PluggedChildsWithSameClass) >= PlugClass.PlugMaxCount: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
475 |
raise Exception, "Max count (%d) reached for this plugin of type %s "%(PlugClass.PlugMaxCount, PlugType) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
476 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
477 |
# create the final class, derived of provided plugin and template |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
478 |
class FinalPlugClass(PlugClass, PlugTemplate): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
479 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
480 |
Plugin class is derivated into FinalPlugClass before being instanciated |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
481 |
This way __init__ is overloaded to ensure PlugTemplate.__init__ is called |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
482 |
before PlugClass.__init__, and to do the file related stuff. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
483 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
484 |
def __init__(_self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
485 |
# self is the parent |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
486 |
_self.PlugParent = self |
203 | 487 |
# self is the parent |
488 |
_self.logger = self.logger |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
489 |
# Keep track of the plugin type name |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
490 |
_self.PlugType = PlugType |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
491 |
# remind the help string, for more fancy display |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
492 |
_self.PlugHelp = PlugHelp |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
493 |
# Call the base plugin template init - change XSD into class members |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
494 |
PlugTemplate.__init__(_self) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
495 |
# check name is unique |
203 | 496 |
NewPlugName = _self.FindNewName(PlugName) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
497 |
# If dir have already be made, and file exist |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
498 |
if os.path.isdir(_self.PlugPath(NewPlugName)): #and os.path.isfile(_self.PluginXmlFilePath(PlugName)): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
499 |
#Load the plugin.xml file into parameters members |
203 | 500 |
_self.LoadXMLParams(NewPlugName) |
20 | 501 |
# Basic check. Better to fail immediately. |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
502 |
if (_self.BaseParams.getName() != NewPlugName): |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
503 |
raise Exception, "Project tree layout do not match plugin.xml %s!=%s "%(NewPlugName, _self.BaseParams.getName()) |
20 | 504 |
|
505 |
# Now, self.PlugPath() should be OK |
|
506 |
||
15
7a473efc4530
More precise design for plugins.... to be continued...
etisserant
parents:
14
diff
changeset
|
507 |
# Check that IEC_Channel is not already in use. |
203 | 508 |
_self.FindNewIEC_Channel(_self.BaseParams.getIEC_Channel()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
509 |
# Call the plugin real __init__ |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
510 |
if getattr(PlugClass, "__init__", None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
511 |
PlugClass.__init__(_self) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
512 |
#Load and init all the childs |
203 | 513 |
_self.LoadChilds() |
118 | 514 |
#just loaded, nothing to saved |
515 |
_self.ChangesToSave = False |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
516 |
else: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
517 |
# If plugin do not have corresponding file/dirs - they will be created on Save |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
518 |
os.mkdir(_self.PlugPath()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
519 |
# Find an IEC number |
253 | 520 |
_self.FindNewIEC_Channel(0) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
521 |
# Call the plugin real __init__ |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
522 |
if getattr(PlugClass, "__init__", None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
523 |
PlugClass.__init__(_self) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
524 |
_self.PlugRequestSave() |
118 | 525 |
#just created, must be saved |
526 |
_self.ChangesToSave = True |
|
77
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
527 |
|
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
528 |
def _getBuildPath(_self): |
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
529 |
return self._getBuildPath() |
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
530 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
531 |
# Create the object out of the resulting class |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
532 |
newPluginOpj = FinalPlugClass() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
533 |
# Store it in PluggedChils |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
534 |
PluggedChildsWithSameClass.append(newPluginOpj) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
535 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
536 |
return newPluginOpj |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
537 |
|
325
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
538 |
def LoadSTLibrary(self): |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
539 |
# Get library blocks if plcopen library exist |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
540 |
library_path = self.PluginLibraryFilePath() |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
541 |
if os.path.isfile(library_path): |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
542 |
self.LibraryControler = PLCControler() |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
543 |
self.LibraryControler.OpenXMLFile(library_path) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
544 |
|
203 | 545 |
def LoadXMLParams(self, PlugName = None): |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
546 |
methode_name = os.path.join(self.PlugPath(PlugName), "methods.py") |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
547 |
if os.path.isfile(methode_name): |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
548 |
execfile(methode_name) |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
549 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
550 |
# Get the base xml tree |
20 | 551 |
if self.MandatoryParams: |
203 | 552 |
try: |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
553 |
basexmlfile = open(self.PluginBaseXmlFilePath(PlugName), 'r') |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
554 |
basetree = minidom.parse(basexmlfile) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
555 |
self.MandatoryParams[1].loadXMLTree(basetree.childNodes[0]) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
556 |
basexmlfile.close() |
203 | 557 |
except Exception, exc: |
558 |
self.logger.write_error("Couldn't load plugin base parameters %s :\n %s" % (PlugName, str(exc))) |
|
559 |
self.logger.write_error(traceback.format_exc()) |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
560 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
561 |
# Get the xml tree |
20 | 562 |
if self.PlugParams: |
203 | 563 |
try: |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
564 |
xmlfile = open(self.PluginXmlFilePath(PlugName), 'r') |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
565 |
tree = minidom.parse(xmlfile) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
566 |
self.PlugParams[1].loadXMLTree(tree.childNodes[0]) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
567 |
xmlfile.close() |
203 | 568 |
except Exception, exc: |
569 |
self.logger.write_error("Couldn't load plugin parameters %s :\n %s" % (PlugName, str(exc))) |
|
570 |
self.logger.write_error(traceback.format_exc()) |
|
571 |
||
572 |
def LoadChilds(self): |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
573 |
# Iterate over all PlugName@PlugType in plugin directory, and try to open them |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
574 |
for PlugDir in os.listdir(self.PlugPath()): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
575 |
if os.path.isdir(os.path.join(self.PlugPath(), PlugDir)) and \ |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
576 |
PlugDir.count(NameTypeSeparator) == 1: |
24 | 577 |
pname, ptype = PlugDir.split(NameTypeSeparator) |
203 | 578 |
try: |
579 |
self.PlugAddChild(pname, ptype) |
|
580 |
except Exception, exc: |
|
581 |
self.logger.write_error("Could not add child \"%s\", type %s :\n%s\n"%(pname, ptype, str(exc))) |
|
582 |
self.logger.write_error(traceback.format_exc()) |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
583 |
|
109
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
584 |
def EnableMethod(self, method, value): |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
585 |
for d in self.PluginMethods: |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
586 |
if d["method"]==method: |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
587 |
d["enabled"]=value |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
588 |
return True |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
589 |
return False |
f27ca37b6e7a
Added enable/disable of plugin method buttons. Fixed alpha graying problem with disabled buttons. Updated debug dialog message with bug report path
etisserant
parents:
108
diff
changeset
|
590 |
|
203 | 591 |
def ShowMethod(self, method, value): |
592 |
for d in self.PluginMethods: |
|
593 |
if d["method"]==method: |
|
594 |
d["shown"]=value |
|
595 |
return True |
|
596 |
return False |
|
597 |
||
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
598 |
def _GetClassFunction(name): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
599 |
def GetRootClass(): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
600 |
return getattr(__import__("plugins." + name), name).RootClass |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
601 |
return GetRootClass |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
602 |
|
20 | 603 |
|
604 |
#################################################################################### |
|
605 |
#################################################################################### |
|
606 |
#################################################################################### |
|
607 |
################################### ROOT ###################################### |
|
608 |
#################################################################################### |
|
609 |
#################################################################################### |
|
610 |
#################################################################################### |
|
611 |
||
81 | 612 |
if wx.Platform == '__WXMSW__': |
75 | 613 |
exe_ext=".exe" |
614 |
else: |
|
615 |
exe_ext="" |
|
616 |
||
617 |
iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+exe_ext) |
|
20 | 618 |
ieclib_path = os.path.join(base_folder, "matiec", "lib") |
619 |
||
620 |
# import for project creation timestamping |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
621 |
from threading import Timer, Lock, Thread, Semaphore |
20 | 622 |
from time import localtime |
623 |
from datetime import datetime |
|
624 |
# import necessary stuff from PLCOpenEditor |
|
625 |
from PLCOpenEditor import PLCOpenEditor, ProjectDialog |
|
626 |
from TextViewer import TextViewer |
|
203 | 627 |
from plcopen.structures import IEC_KEYWORDS, TypeHierarchy_list |
628 |
||
629 |
# Construct debugger natively supported types |
|
630 |
DebugTypes = [t for t in zip(*TypeHierarchy_list)[0] if not t.startswith("ANY")] + \ |
|
631 |
["STEP","TRANSITION","ACTION"] |
|
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
632 |
DebugTypesSize = {"BOOL" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
633 |
"STEP" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
634 |
"TRANSITION" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
635 |
"ACTION" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
636 |
"SINT" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
637 |
"USINT" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
638 |
"BYTE" : 1, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
639 |
"STRING" : 128, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
640 |
"INT" : 2, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
641 |
"UINT" : 2, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
642 |
"WORD" : 2, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
643 |
"WSTRING" : 0, #TODO |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
644 |
"DINT" : 4, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
645 |
"UDINT" : 4, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
646 |
"DWORD" : 4, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
647 |
"LINT" : 4, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
648 |
"ULINT" : 8, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
649 |
"LWORD" : 8, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
650 |
"REAL" : 4, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
651 |
"LREAL" : 8, |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
652 |
} |
203 | 653 |
|
22 | 654 |
import re |
203 | 655 |
import targets |
656 |
import connectors |
|
657 |
from discovery import DiscoveryDialog |
|
235 | 658 |
from weakref import WeakKeyDictionary |
20 | 659 |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
660 |
MATIEC_ERROR_MODEL = re.compile(".*\.st:(\d+)-(\d+)\.\.(\d+)-(\d+): error : (.*)$") |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
661 |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
662 |
class PluginsRoot(PlugTemplate, PLCControler): |
20 | 663 |
""" |
664 |
This class define Root object of the plugin tree. |
|
665 |
It is responsible of : |
|
666 |
- Managing project directory |
|
667 |
- Building project |
|
668 |
- Handling PLCOpenEditor controler and view |
|
669 |
- Loading user plugins and instanciante them as childs |
|
670 |
- ... |
|
671 |
||
672 |
""" |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
673 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
674 |
# For root object, available Childs Types are modules of the plugin packages. |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
675 |
PlugChildsTypes = [(name, _GetClassFunction(name), help) for name, help in zip(plugins.__all__,plugins.helps)] |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
676 |
|
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
677 |
XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
678 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
679 |
<xsd:element name="BeremizRoot"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
680 |
<xsd:complexType> |
86 | 681 |
<xsd:sequence> |
682 |
<xsd:element name="TargetType"> |
|
683 |
<xsd:complexType> |
|
684 |
<xsd:choice> |
|
203 | 685 |
"""+targets.targetchoices+""" |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
686 |
</xsd:choice> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
687 |
</xsd:complexType> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
688 |
</xsd:element> |
86 | 689 |
</xsd:sequence> |
204
f572ab819769
remove URI_location from XSD targets and add to pluginroot XSD
greg
parents:
203
diff
changeset
|
690 |
<xsd:attribute name="URI_location" type="xsd:string" use="optional" default=""/> |
338 | 691 |
<xsd:attribute name="Enable_Plugins" type="xsd:boolean" use="optional" default="true"/> |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
692 |
</xsd:complexType> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
693 |
</xsd:element> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
694 |
</xsd:schema> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
695 |
""" |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
696 |
|
290
3bd617ae7a05
Local Runtime (LOCAL://) now launched "on demand"
etisserant
parents:
288
diff
changeset
|
697 |
def __init__(self, frame, logger): |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
698 |
PLCControler.__init__(self) |
227
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
699 |
|
20 | 700 |
self.MandatoryParams = None |
701 |
self.AppFrame = frame |
|
203 | 702 |
self.logger = logger |
703 |
self._builder = None |
|
704 |
self._connector = None |
|
705 |
||
706 |
# Setup debug information |
|
227
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
707 |
self.IECdebug_datas = {} |
48c13b84505c
- Some improovements in debug data feedback data
etisserant
parents:
222
diff
changeset
|
708 |
self.IECdebug_lock = Lock() |
222
d0f7d36bf241
Added lock to avoid variable subsciption concurrent to transmission to PLC
etisserant
parents:
217
diff
changeset
|
709 |
|
235 | 710 |
self.DebugTimer=None |
203 | 711 |
self.ResetIECProgramsAndVariables() |
712 |
||
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
713 |
# Timer to pull PLC status |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
714 |
ID_STATUSTIMER = wx.NewId() |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
715 |
self.StatusTimer = wx.Timer(self.AppFrame, ID_STATUSTIMER) |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
716 |
self.AppFrame.Bind(wx.EVT_TIMER, self.PullPLCStatusProc, self.StatusTimer) |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
717 |
|
203 | 718 |
#This method are not called here... but in NewProject and OpenProject |
719 |
#self._AddParamsMembers() |
|
720 |
#self.PluggedChilds = {} |
|
721 |
||
118 | 722 |
# In both new or load scenario, no need to save |
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
723 |
self.ChangesToSave = False |
23 | 724 |
# root have no parent |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
725 |
self.PlugParent = None |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
726 |
# Keep track of the plugin type name |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
727 |
self.PlugType = "Beremiz" |
20 | 728 |
# After __init__ root plugin is not valid |
729 |
self.ProjectPath = None |
|
256 | 730 |
self.BuildPath = None |
20 | 731 |
self.PLCEditor = None |
243 | 732 |
self.PLCDebug = None |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
733 |
self.DebugThread = None |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
734 |
self.debug_break = False |
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
735 |
self.previous_plcstate = None |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
736 |
self.StatusPrint = {"Broken": self.logger.write_error, |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
737 |
None: lambda x: None} |
106
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
738 |
# copy PluginMethods so that it can be later customized |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
739 |
self.PluginMethods = [dic.copy() for dic in self.PluginMethods] |
325
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
740 |
self.LoadSTLibrary() |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
741 |
|
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
742 |
def PluginLibraryFilePath(self): |
f2604900bf25
Bug preventing loading STLibrary when adding a plugin fixed
lbessard
parents:
321
diff
changeset
|
743 |
return os.path.join(os.path.split(__file__)[0], "pous.xml") |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
744 |
|
118 | 745 |
def PlugTestModified(self): |
746 |
return self.ChangesToSave or not self.ProjectIsSaved() |
|
747 |
||
23 | 748 |
def GetPlugRoot(self): |
749 |
return self |
|
750 |
||
751 |
def GetCurrentLocation(self): |
|
752 |
return () |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
753 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
754 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
755 |
return "" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
756 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
757 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
758 |
return "" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
759 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
760 |
def GetProjectPath(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
761 |
return self.ProjectPath |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
762 |
|
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
763 |
def GetProjectName(self): |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
764 |
return os.path.split(self.ProjectPath)[1] |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
765 |
|
20 | 766 |
def GetPlugInfos(self): |
767 |
childs = [] |
|
768 |
for child in self.IterChilds(): |
|
769 |
childs.append(child.GetPlugInfos()) |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
770 |
return {"name" : "PLC (%s)"%self.GetProjectName(), "type" : None, "values" : childs} |
20 | 771 |
|
256 | 772 |
def NewProject(self, ProjectPath, BuildPath=None): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
773 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
774 |
Create a new project in an empty folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
775 |
@param ProjectPath: path of the folder where project have to be created |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
776 |
@param PLCParams: properties of the PLCOpen program created |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
777 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
778 |
# Verify that choosen folder is empty |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
779 |
if not os.path.isdir(ProjectPath) or len(os.listdir(ProjectPath)) > 0: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
780 |
return "Folder choosen isn't empty. You can't use it for a new project!" |
20 | 781 |
|
782 |
dialog = ProjectDialog(self.AppFrame) |
|
783 |
if dialog.ShowModal() == wx.ID_OK: |
|
784 |
values = dialog.GetValues() |
|
785 |
values["creationDateTime"] = datetime(*localtime()[:6]) |
|
786 |
dialog.Destroy() |
|
787 |
else: |
|
788 |
dialog.Destroy() |
|
789 |
return "Project not created" |
|
790 |
||
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
791 |
# Create PLCOpen program |
113 | 792 |
self.CreateNewProject(values) |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
793 |
# Change XSD into class members |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
794 |
self._AddParamsMembers() |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
795 |
self.PluggedChilds = {} |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
796 |
# Keep track of the root plugin (i.e. project path) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
797 |
self.ProjectPath = ProjectPath |
256 | 798 |
self.BuildPath = BuildPath |
114
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
799 |
# get plugins bloclist (is that usefull at project creation?) |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
800 |
self.RefreshPluginsBlockLists() |
114
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
801 |
# this will create files base XML files |
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
802 |
self.SaveProject() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
803 |
return None |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
804 |
|
256 | 805 |
def LoadProject(self, ProjectPath, BuildPath=None): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
806 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
807 |
Load a project contained in a folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
808 |
@param ProjectPath: path of the project folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
809 |
""" |
190 | 810 |
if os.path.basename(ProjectPath) == "": |
811 |
ProjectPath = os.path.dirname(ProjectPath) |
|
203 | 812 |
# Verify that project contains a PLCOpen program |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
813 |
plc_file = os.path.join(ProjectPath, "plc.xml") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
814 |
if not os.path.isfile(plc_file): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
815 |
return "Folder choosen doesn't contain a program. It's not a valid project!" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
816 |
# Load PLCOpen file |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
817 |
result = self.OpenXMLFile(plc_file) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
818 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
819 |
return result |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
820 |
# Change XSD into class members |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
821 |
self._AddParamsMembers() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
822 |
self.PluggedChilds = {} |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
823 |
# Keep track of the root plugin (i.e. project path) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
824 |
self.ProjectPath = ProjectPath |
256 | 825 |
self.BuildPath = BuildPath |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
826 |
# If dir have already be made, and file exist |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
827 |
if os.path.isdir(self.PlugPath()) and os.path.isfile(self.PluginXmlFilePath()): |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
828 |
#Load the plugin.xml file into parameters members |
203 | 829 |
result = self.LoadXMLParams() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
830 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
831 |
return result |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
832 |
#Load and init all the childs |
203 | 833 |
self.LoadChilds() |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
834 |
self.RefreshPluginsBlockLists() |
203 | 835 |
|
836 |
if os.path.exists(self._getBuildPath()): |
|
837 |
self.EnableMethod("_Clean", True) |
|
838 |
||
839 |
if os.path.isfile(self._getIECrawcodepath()): |
|
840 |
self.ShowMethod("_showIECcode", True) |
|
841 |
||
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
842 |
return None |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
843 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
844 |
def SaveProject(self): |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
845 |
if not self.SaveXMLFile(): |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
846 |
self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml')) |
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
847 |
if self.PLCEditor: |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
848 |
self.PLCEditor.RefreshTitle() |
250 | 849 |
result = self.PlugRequestSave() |
850 |
if result: |
|
851 |
self.logger.write_error(result) |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
852 |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
853 |
# Update PLCOpenEditor Plugin Block types from loaded plugins |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
854 |
def RefreshPluginsBlockLists(self): |
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
855 |
if getattr(self, "PluggedChilds", None) is not None: |
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
856 |
self.ClearPluginTypes() |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
857 |
self.AddPluginBlockList(self.BlockTypesFactory()) |
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
858 |
for child in self.IterChilds(): |
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
859 |
self.AddPluginBlockList(child.BlockTypesFactory()) |
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
860 |
if self.PLCEditor is not None: |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
861 |
self.PLCEditor.RefreshEditor() |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
862 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
863 |
def PlugPath(self, PlugName=None): |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
864 |
return self.ProjectPath |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
865 |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
866 |
def PluginXmlFilePath(self, PlugName=None): |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
867 |
return os.path.join(self.PlugPath(PlugName), "beremiz.xml") |
18 | 868 |
|
20 | 869 |
def _getBuildPath(self): |
256 | 870 |
if self.BuildPath is None: |
871 |
return os.path.join(self.ProjectPath, "build") |
|
872 |
return self.BuildPath |
|
20 | 873 |
|
203 | 874 |
def _getExtraFilesPath(self): |
875 |
return os.path.join(self._getBuildPath(), "extra_files") |
|
876 |
||
20 | 877 |
def _getIECcodepath(self): |
878 |
# define name for IEC code file |
|
879 |
return os.path.join(self._getBuildPath(), "plc.st") |
|
880 |
||
65 | 881 |
def _getIECgeneratedcodepath(self): |
882 |
# define name for IEC generated code file |
|
883 |
return os.path.join(self._getBuildPath(), "generated_plc.st") |
|
884 |
||
885 |
def _getIECrawcodepath(self): |
|
886 |
# define name for IEC raw code file |
|
203 | 887 |
return os.path.join(self.PlugPath(), "raw_plc.st") |
65 | 888 |
|
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
889 |
def _getPYTHONcodepath(self): |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
890 |
# define name for IEC raw code file |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
891 |
return os.path.join(self.PlugPath(), "runtime.py") |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
892 |
|
301 | 893 |
def _getWXGLADEpath(self): |
894 |
# define name for IEC raw code file |
|
895 |
return os.path.join(self.PlugPath(), "hmi.wxg") |
|
896 |
||
97 | 897 |
def GetLocations(self): |
898 |
locations = [] |
|
899 |
filepath = os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h") |
|
900 |
if os.path.isfile(filepath): |
|
901 |
# IEC2C compiler generate a list of located variables : LOCATED_VARIABLES.h |
|
902 |
location_file = open(os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h")) |
|
903 |
# each line of LOCATED_VARIABLES.h declares a located variable |
|
904 |
lines = [line.strip() for line in location_file.readlines()] |
|
905 |
# This regular expression parses the lines genereated by IEC2C |
|
348
054fbf1ae0f8
Bug while parsing long located variables in GetLocations fixed
lbessard
parents:
338
diff
changeset
|
906 |
LOCATED_MODEL = re.compile("__LOCATED_VAR\((?P<IEC_TYPE>[A-Z]*),(?P<NAME>[_A-Za-z0-9]*),(?P<DIR>[QMI])(?:,(?P<SIZE>[XBWDL]))?,(?P<LOC>[,0-9]*)\)") |
97 | 907 |
for line in lines: |
908 |
# If line match RE, |
|
909 |
result = LOCATED_MODEL.match(line) |
|
910 |
if result: |
|
911 |
# Get the resulting dict |
|
912 |
resdict = result.groupdict() |
|
913 |
# rewrite string for variadic location as a tuple of integers |
|
914 |
resdict['LOC'] = tuple(map(int,resdict['LOC'].split(','))) |
|
915 |
# set located size to 'X' if not given |
|
916 |
if not resdict['SIZE']: |
|
917 |
resdict['SIZE'] = 'X' |
|
918 |
# finally store into located variable list |
|
919 |
locations.append(resdict) |
|
920 |
return locations |
|
921 |
||
203 | 922 |
def _Generate_SoftPLC(self): |
20 | 923 |
""" |
64 | 924 |
Generate SoftPLC ST/IL/SFC code out of PLCOpenEditor controller, and compile it with IEC2C |
20 | 925 |
@param buildpath: path where files should be created |
926 |
""" |
|
927 |
||
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
928 |
# Update PLCOpenEditor Plugin Block types before generate ST code |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
929 |
self.RefreshPluginsBlockLists() |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
930 |
|
203 | 931 |
self.logger.write("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n") |
20 | 932 |
buildpath = self._getBuildPath() |
933 |
# ask PLCOpenEditor controller to write ST/IL/SFC code file |
|
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
934 |
program, errors, warnings = self.GenerateProgram(self._getIECgeneratedcodepath()) |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
935 |
if len(warnings) > 0: |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
936 |
self.logger.write_warning("Warnings in ST/IL/SFC code generator :\n") |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
937 |
for warning in warnings: |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
938 |
self.logger.write_warning("%s\n"%warning) |
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
939 |
if len(errors) > 0: |
20 | 940 |
# Failed ! |
309
6eb074f0dae9
Adding support for cancelling code generation of function with no input connected
lbessard
parents:
304
diff
changeset
|
941 |
self.logger.write_error("Error in ST/IL/SFC code generator :\n%s\n"%errors[0]) |
20 | 942 |
return False |
65 | 943 |
plc_file = open(self._getIECcodepath(), "w") |
274
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
944 |
if getattr(self, "PluggedChilds", None) is not None: |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
945 |
# Add ST Library from plugins |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
946 |
plc_file.write(self.STLibraryFactory()) |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
947 |
plc_file.write("\n") |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
948 |
for child in self.IterChilds(): |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
949 |
plc_file.write(child.STLibraryFactory()) |
8628f3dd0979
Adding support for defining plugin library as a plcopen xml file in plugin folder
greg
parents:
273
diff
changeset
|
950 |
plc_file.write("\n") |
65 | 951 |
if os.path.isfile(self._getIECrawcodepath()): |
952 |
plc_file.write(open(self._getIECrawcodepath(), "r").read()) |
|
953 |
plc_file.write("\n") |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
954 |
plc_file.close() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
955 |
plc_file = open(self._getIECcodepath(), "r") |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
956 |
self.ProgramOffset = 0 |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
957 |
for line in plc_file.xreadlines(): |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
958 |
self.ProgramOffset += 1 |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
959 |
plc_file.close() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
960 |
plc_file = open(self._getIECcodepath(), "a") |
65 | 961 |
plc_file.write(open(self._getIECgeneratedcodepath(), "r").read()) |
962 |
plc_file.close() |
|
203 | 963 |
self.logger.write("Compiling IEC Program in to C code...\n") |
20 | 964 |
# Now compile IEC code into many C files |
965 |
# files are listed to stdout, and errors to stderr. |
|
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
966 |
status, result, err_result = ProcessLogger( |
203 | 967 |
self.logger, |
351 | 968 |
"\"%s\" -f -I \"%s\" -T \"%s\" \"%s\""%( |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
969 |
iec2c_path, |
351 | 970 |
ieclib_path, |
971 |
buildpath, |
|
972 |
self._getIECcodepath()), |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
973 |
no_stdout=True, no_stderr=True).spin() |
20 | 974 |
if status: |
975 |
# Failed ! |
|
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
976 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
977 |
# parse iec2c's error message. if it contains a line number, |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
978 |
# then print those lines from the generated IEC file. |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
979 |
for err_line in err_result.split('\n'): |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
980 |
self.logger.write_warning(err_line + "\n") |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
981 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
982 |
m_result = MATIEC_ERROR_MODEL.match(err_line) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
983 |
if m_result is not None: |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
984 |
first_line, first_column, last_line, last_column, error = m_result.groups() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
985 |
first_line, last_line = int(first_line), int(last_line) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
986 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
987 |
last_section = None |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
988 |
f = open(self._getIECcodepath()) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
989 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
990 |
for i, line in enumerate(f.readlines()): |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
991 |
if line[0] not in '\t \r\n': |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
992 |
last_section = line |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
993 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
994 |
if first_line <= i <= last_line: |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
995 |
if last_section is not None: |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
996 |
self.logger.write_warning("In section: " + last_section) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
997 |
last_section = None # only write section once |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
998 |
self.logger.write_warning("%04d: %s" % (i, line)) |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
999 |
|
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
1000 |
f.close() |
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
1001 |
|
203 | 1002 |
self.logger.write_error("Error : IEC to C compiler returned %d\n"%status) |
20 | 1003 |
return False |
356
e9698d0ee5f3
Adding support for printing lines where matiec failed in Log console (thanks to Brendan)
lbessard
parents:
355
diff
changeset
|
1004 |
|
20 | 1005 |
# Now extract C files of stdout |
113 | 1006 |
C_files = [ fname for fname in result.splitlines() if fname[-2:]==".c" or fname[-2:]==".C" ] |
20 | 1007 |
# remove those that are not to be compiled because included by others |
1008 |
C_files.remove("POUS.c") |
|
115 | 1009 |
if not C_files: |
203 | 1010 |
self.logger.write_error("Error : At least one configuration and one ressource must be declared in PLC !\n") |
115 | 1011 |
return False |
20 | 1012 |
# transform those base names to full names with path |
23 | 1013 |
C_files = map(lambda filename:os.path.join(buildpath, filename), C_files) |
203 | 1014 |
self.logger.write("Extracting Located Variables...\n") |
97 | 1015 |
# Keep track of generated located variables for later use by self._Generate_C |
1016 |
self.PLCGeneratedLocatedVars = self.GetLocations() |
|
20 | 1017 |
# Keep track of generated C files for later use by self.PlugGenerate_C |
18 | 1018 |
self.PLCGeneratedCFiles = C_files |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1019 |
# compute CFLAGS for plc |
203 | 1020 |
self.plcCFLAGS = "\"-I"+ieclib_path+"\"" |
18 | 1021 |
return True |
1022 |
||
203 | 1023 |
def GetBuilder(self): |
1024 |
""" |
|
1025 |
Return a Builder (compile C code into machine code) |
|
1026 |
""" |
|
1027 |
# Get target, module and class name |
|
1028 |
targetname = self.BeremizRoot.getTargetType().getcontent()["name"] |
|
1029 |
modulename = "targets." + targetname |
|
1030 |
classname = targetname + "_target" |
|
1031 |
||
1032 |
# Get module reference |
|
1033 |
try : |
|
1034 |
targetmodule = getattr(__import__(modulename), targetname) |
|
1035 |
||
1036 |
except Exception, msg: |
|
1037 |
self.logger.write_error("Can't find module for target %s!\n"%targetname) |
|
1038 |
self.logger.write_error(str(msg)) |
|
1039 |
return None |
|
1040 |
||
1041 |
# Get target class |
|
1042 |
targetclass = getattr(targetmodule, classname) |
|
1043 |
||
1044 |
# if target already |
|
1045 |
if self._builder is None or not isinstance(self._builder,targetclass): |
|
1046 |
# Get classname instance |
|
1047 |
self._builder = targetclass(self) |
|
1048 |
return self._builder |
|
1049 |
||
1050 |
def GetLastBuildMD5(self): |
|
1051 |
builder=self.GetBuilder() |
|
1052 |
if builder is not None: |
|
1053 |
return builder.GetBinaryCodeMD5() |
|
1054 |
else: |
|
1055 |
return None |
|
1056 |
||
310 | 1057 |
def launch_wxglade(self, options, wait=False): |
301 | 1058 |
from wxglade import __file__ as fileName |
310 | 1059 |
path = os.path.dirname(fileName) |
1060 |
glade = os.path.join(path, 'wxglade.py') |
|
1061 |
if wx.Platform == '__WXMSW__': |
|
1062 |
glade = "\"%s\""%glade |
|
301 | 1063 |
mode = {False:os.P_NOWAIT, True:os.P_WAIT}[wait] |
310 | 1064 |
os.spawnv(mode, sys.executable, ["\"%s\""%sys.executable] + [glade] + options) |
301 | 1065 |
|
203 | 1066 |
####################################################################### |
1067 |
# |
|
1068 |
# C CODE GENERATION METHODS |
|
1069 |
# |
|
1070 |
####################################################################### |
|
1071 |
||
1072 |
def PlugGenerate_C(self, buildpath, locations): |
|
1073 |
""" |
|
1074 |
Return C code generated by iec2c compiler |
|
1075 |
when _generate_softPLC have been called |
|
1076 |
@param locations: ignored |
|
1077 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
|
1078 |
""" |
|
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1079 |
|
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1080 |
res = ([(C_file_name, self.plcCFLAGS) |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1081 |
for C_file_name in self.PLCGeneratedCFiles ], |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1082 |
"", # no ldflags |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1083 |
False) # do not expose retreive/publish calls |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1084 |
|
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1085 |
pyfile=self._getPYTHONcodepath() |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1086 |
if os.path.exists(pyfile): |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1087 |
res += (("runtime.py", file(pyfile,"rb")),) |
301 | 1088 |
wxgfile=self._getWXGLADEpath() |
1089 |
if os.path.exists(wxgfile): |
|
1090 |
hmipyfile=os.path.join(self._getBuildPath(),"hmi.py") |
|
312 | 1091 |
if wx.Platform == '__WXMSW__': |
1092 |
wxgfile = "\"%s\""%wxgfile |
|
313 | 1093 |
_hmipyfile = "\"%s\""%hmipyfile |
1094 |
else: |
|
1095 |
_hmipyfile = hmipyfile |
|
1096 |
self.launch_wxglade(['-o', _hmipyfile, '-g', 'python', wxgfile], wait=True) |
|
301 | 1097 |
res += (("hmi.py", file(hmipyfile,"rb")),) |
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1098 |
|
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1099 |
return res |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1100 |
|
203 | 1101 |
|
1102 |
def ResetIECProgramsAndVariables(self): |
|
1103 |
""" |
|
1104 |
Reset variable and program list that are parsed from |
|
1105 |
CSV file generated by IEC2C compiler. |
|
1106 |
""" |
|
1107 |
self._ProgramList = None |
|
1108 |
self._VariablesList = None |
|
1109 |
self._IECPathToIdx = None |
|
235 | 1110 |
self.TracedIECPath = [] |
1111 |
||
203 | 1112 |
def GetIECProgramsAndVariables(self): |
1113 |
""" |
|
1114 |
Parse CSV-like file VARIABLES.csv resulting from IEC2C compiler. |
|
1115 |
Each section is marked with a line staring with '//' |
|
1116 |
list of all variables used in various POUs |
|
1117 |
""" |
|
1118 |
if self._ProgramList is None or self._VariablesList is None: |
|
1119 |
try: |
|
1120 |
csvfile = os.path.join(self._getBuildPath(),"VARIABLES.csv") |
|
1121 |
# describes CSV columns |
|
1122 |
ProgramsListAttributeName = ["num", "C_path", "type"] |
|
1123 |
VariablesListAttributeName = ["num", "vartype", "IEC_path", "C_path", "type"] |
|
1124 |
self._ProgramList = [] |
|
1125 |
self._VariablesList = [] |
|
1126 |
self._IECPathToIdx = {} |
|
1127 |
||
1128 |
# Separate sections |
|
1129 |
ListGroup = [] |
|
1130 |
for line in open(csvfile,'r').xreadlines(): |
|
1131 |
strippedline = line.strip() |
|
1132 |
if strippedline.startswith("//"): |
|
1133 |
# Start new section |
|
1134 |
ListGroup.append([]) |
|
1135 |
elif len(strippedline) > 0 and len(ListGroup) > 0: |
|
1136 |
# append to this section |
|
1137 |
ListGroup[-1].append(strippedline) |
|
1138 |
||
1139 |
# first section contains programs |
|
1140 |
for line in ListGroup[0]: |
|
1141 |
# Split and Maps each field to dictionnary entries |
|
1142 |
attrs = dict(zip(ProgramsListAttributeName,line.strip().split(';'))) |
|
1143 |
# Truncate "C_path" to remove conf an ressources names |
|
1144 |
attrs["C_path"] = '__'.join(attrs["C_path"].split(".",2)[1:]) |
|
1145 |
# Push this dictionnary into result. |
|
1146 |
self._ProgramList.append(attrs) |
|
1147 |
||
1148 |
# second section contains all variables |
|
1149 |
for line in ListGroup[1]: |
|
1150 |
# Split and Maps each field to dictionnary entries |
|
1151 |
attrs = dict(zip(VariablesListAttributeName,line.strip().split(';'))) |
|
1152 |
# Truncate "C_path" to remove conf an ressources names |
|
1153 |
attrs["C_path"] = '__'.join(attrs["C_path"].split(".",2)[1:]) |
|
1154 |
# Push this dictionnary into result. |
|
1155 |
self._VariablesList.append(attrs) |
|
1156 |
# Fill in IEC<->C translation dicts |
|
1157 |
IEC_path=attrs["IEC_path"] |
|
1158 |
Idx=int(attrs["num"]) |
|
1159 |
self._IECPathToIdx[IEC_path]=Idx |
|
1160 |
except Exception,e: |
|
1161 |
self.logger.write_error("Cannot open/parse VARIABLES.csv!\n") |
|
1162 |
self.logger.write_error(traceback.format_exc()) |
|
1163 |
self.ResetIECProgramsAndVariables() |
|
1164 |
return False |
|
1165 |
||
1166 |
return True |
|
1167 |
||
1168 |
def Generate_plc_debugger(self): |
|
1169 |
""" |
|
1170 |
Generate trace/debug code out of PLC variable list |
|
1171 |
""" |
|
1172 |
self.GetIECProgramsAndVariables() |
|
1173 |
||
1174 |
# prepare debug code |
|
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
206
diff
changeset
|
1175 |
debug_code = targets.code("plc_debug") % { |
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
1176 |
"buffer_size": reduce(lambda x, y: x + y, [DebugTypesSize.get(v["type"], 0) for v in self._VariablesList], 0), |
203 | 1177 |
"programs_declarations": |
1178 |
"\n".join(["extern %(type)s %(C_path)s;"%p for p in self._ProgramList]), |
|
1179 |
"extern_variables_declarations":"\n".join([ |
|
1180 |
{"PT":"extern %(type)s *%(C_path)s;", |
|
1181 |
"VAR":"extern %(type)s %(C_path)s;"}[v["vartype"]]%v |
|
275 | 1182 |
for v in self._VariablesList if v["vartype"] != "FB" and v["C_path"].find('.')<0]), |
203 | 1183 |
"subscription_table_count": |
1184 |
len(self._VariablesList), |
|
1185 |
"variables_pointer_type_table_count": |
|
1186 |
len(self._VariablesList), |
|
1187 |
"variables_pointer_type_table_initializer":"\n".join([ |
|
1188 |
{"PT":" variable_table[%(num)s].ptrvalue = (void*)(%(C_path)s);\n", |
|
1189 |
"VAR":" variable_table[%(num)s].ptrvalue = (void*)(&%(C_path)s);\n"}[v["vartype"]]%v + |
|
1190 |
" variable_table[%(num)s].type = %(type)s_ENUM;\n"%v |
|
275 | 1191 |
for v in self._VariablesList if v["vartype"] != "FB" and v["type"] in DebugTypes ])} |
203 | 1192 |
|
1193 |
return debug_code |
|
1194 |
||
280
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1195 |
def Generate_plc_python(self): |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1196 |
""" |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1197 |
Generate trace/debug code out of PLC variable list |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1198 |
""" |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1199 |
self.GetIECProgramsAndVariables() |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1200 |
|
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1201 |
python_eval_fb_list = [] |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1202 |
for v in self._VariablesList : |
301 | 1203 |
if v["vartype"] == "FB" and v["type"] in ["PYTHON_EVAL","PYTHON_POLL"]: |
280
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1204 |
python_eval_fb_list.append(v) |
288 | 1205 |
python_eval_fb_count = max(1, len(python_eval_fb_list)) |
280
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1206 |
|
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1207 |
# prepare debug code |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1208 |
python_code = targets.code("plc_python") % { |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1209 |
"python_eval_fb_count": python_eval_fb_count} |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1210 |
return python_code |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1211 |
|
203 | 1212 |
def Generate_plc_common_main(self): |
1213 |
""" |
|
1214 |
Use plugins layout given in LocationCFilesAndCFLAGS to |
|
1215 |
generate glue code that dispatch calls to all plugins |
|
1216 |
""" |
|
1217 |
# filter location that are related to code that will be called |
|
1218 |
# in retreive, publish, init, cleanup |
|
1219 |
locstrs = map(lambda x:"_".join(map(str,x)), |
|
1220 |
[loc for loc,Cfiles,DoCalls in self.LocationCFilesAndCFLAGS if loc and DoCalls]) |
|
1221 |
||
1222 |
# Generate main, based on template |
|
338 | 1223 |
if self.BeremizRoot.getEnable_Plugins(): |
1224 |
plc_main_code = targets.code("plc_common_main") % { |
|
1225 |
"calls_prototypes":"\n".join([( |
|
1226 |
"int __init_%(s)s(int argc,char **argv);\n"+ |
|
1227 |
"void __cleanup_%(s)s();\n"+ |
|
1228 |
"void __retrieve_%(s)s();\n"+ |
|
1229 |
"void __publish_%(s)s();")%{'s':locstr} for locstr in locstrs]), |
|
1230 |
"retrieve_calls":"\n ".join([ |
|
1231 |
"__retrieve_%s();"%locstr for locstr in locstrs]), |
|
1232 |
"publish_calls":"\n ".join([ #Call publish in reverse order |
|
1233 |
"__publish_%s();"%locstrs[i-1] for i in xrange(len(locstrs), 0, -1)]), |
|
1234 |
"init_calls":"\n ".join([ |
|
1235 |
"init_level=%d; "%(i+1)+ |
|
1236 |
"if(res = __init_%s(argc,argv)){"%locstr + |
|
1237 |
#"printf(\"%s\"); "%locstr + #for debug |
|
1238 |
"return res;}" for i,locstr in enumerate(locstrs)]), |
|
1239 |
"cleanup_calls":"\n ".join([ |
|
1240 |
"if(init_level >= %d) "%i+ |
|
1241 |
"__cleanup_%s();"%locstrs[i-1] for i in xrange(len(locstrs), 0, -1)]) |
|
1242 |
} |
|
1243 |
else: |
|
1244 |
plc_main_code = targets.code("plc_common_main") % { |
|
1245 |
"calls_prototypes":"\n", |
|
1246 |
"retrieve_calls":"\n", |
|
1247 |
"publish_calls":"\n", |
|
1248 |
"init_calls":"\n", |
|
1249 |
"cleanup_calls":"\n" |
|
1250 |
} |
|
203 | 1251 |
|
1252 |
target_name = self.BeremizRoot.getTargetType().getcontent()["name"] |
|
209
08dc3d064cb5
Moved template C code to targets dir. Cleaned up some forgotten print.
etisserant
parents:
206
diff
changeset
|
1253 |
plc_main_code += targets.targetcode(target_name) |
203 | 1254 |
return plc_main_code |
1255 |
||
1256 |
||
1257 |
def _build(self): |
|
20 | 1258 |
""" |
1259 |
Method called by user to (re)build SoftPLC and plugin tree |
|
1260 |
""" |
|
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1261 |
if self.PLCEditor is not None: |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1262 |
self.PLCEditor.ClearErrors() |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1263 |
|
20 | 1264 |
buildpath = self._getBuildPath() |
1265 |
||
1266 |
# Eventually create build dir |
|
18 | 1267 |
if not os.path.exists(buildpath): |
1268 |
os.mkdir(buildpath) |
|
203 | 1269 |
# There is something to clean |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1270 |
self.EnableMethod("_Clean", True) |
203 | 1271 |
|
1272 |
self.logger.flush() |
|
1273 |
self.logger.write("Start build in %s\n" % buildpath) |
|
1274 |
||
1275 |
# Generate SoftPLC IEC code |
|
1276 |
IECGenRes = self._Generate_SoftPLC() |
|
1277 |
self.ShowMethod("_showIECcode", True) |
|
1278 |
||
1279 |
# If IEC code gen fail, bail out. |
|
1280 |
if not IECGenRes: |
|
1281 |
self.logger.write_error("IEC-61131-3 code generation failed !\n") |
|
20 | 1282 |
return False |
1283 |
||
203 | 1284 |
# Reset variable and program list that are parsed from |
1285 |
# CSV file generated by IEC2C compiler. |
|
1286 |
self.ResetIECProgramsAndVariables() |
|
18 | 1287 |
|
20 | 1288 |
# Generate C code and compilation params from plugin hierarchy |
203 | 1289 |
self.logger.write("Generating plugins C code\n") |
24 | 1290 |
try: |
203 | 1291 |
self.LocationCFilesAndCFLAGS, self.LDFLAGS, ExtraFiles = self._Generate_C( |
24 | 1292 |
buildpath, |
203 | 1293 |
self.PLCGeneratedLocatedVars) |
178
2390b409eb93
Added PLC tick alignement on external synchronization source feature.
etisserant
parents:
176
diff
changeset
|
1294 |
except Exception, exc: |
203 | 1295 |
self.logger.write_error("Plugins code generation failed !\n") |
1296 |
self.logger.write_error(traceback.format_exc()) |
|
24 | 1297 |
return False |
18 | 1298 |
|
203 | 1299 |
# Get temprary directory path |
1300 |
extrafilespath = self._getExtraFilesPath() |
|
1301 |
# Remove old directory |
|
1302 |
if os.path.exists(extrafilespath): |
|
1303 |
shutil.rmtree(extrafilespath) |
|
1304 |
# Recreate directory |
|
1305 |
os.mkdir(extrafilespath) |
|
1306 |
# Then write the files |
|
1307 |
for fname,fobject in ExtraFiles: |
|
1308 |
fpath = os.path.join(extrafilespath,fname) |
|
1309 |
open(fpath, "wb").write(fobject.read()) |
|
1310 |
# Now we can forget ExtraFiles (will close files object) |
|
1311 |
del ExtraFiles |
|
1312 |
||
1313 |
# Template based part of C code generation |
|
1314 |
# files are stacked at the beginning, as files of plugin tree root |
|
1315 |
for generator, filename, name in [ |
|
1316 |
# debugger code |
|
1317 |
(self.Generate_plc_debugger, "plc_debugger.c", "Debugger"), |
|
280
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1318 |
# IEC<->python gateway code |
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1319 |
(self.Generate_plc_python, "plc_python.c", "IEC-Python gateway"), |
203 | 1320 |
# init/cleanup/retrieve/publish, run and align code |
1321 |
(self.Generate_plc_common_main,"plc_common_main.c","Common runtime")]: |
|
1322 |
try: |
|
1323 |
# Do generate |
|
1324 |
code = generator() |
|
335
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
1325 |
if code is None: |
c5f3f71e7260
fixed bug : buffer overflow when debugging PLC with python blocks
greg
parents:
334
diff
changeset
|
1326 |
raise |
203 | 1327 |
code_path = os.path.join(buildpath,filename) |
1328 |
open(code_path, "w").write(code) |
|
1329 |
# Insert this file as first file to be compiled at root plugin |
|
1330 |
self.LocationCFilesAndCFLAGS[0][1].insert(0,(code_path, self.plcCFLAGS)) |
|
1331 |
except Exception, exc: |
|
1332 |
self.logger.write_error(name+" generation failed !\n") |
|
1333 |
self.logger.write_error(traceback.format_exc()) |
|
1334 |
return False |
|
1335 |
||
1336 |
self.logger.write("C code generated successfully.\n") |
|
1337 |
||
1338 |
# Get current or fresh builder |
|
1339 |
builder = self.GetBuilder() |
|
1340 |
if builder is None: |
|
1341 |
self.logger.write_error("Fatal : cannot get builder.\n") |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1342 |
return False |
203 | 1343 |
|
1344 |
# Build |
|
1345 |
try: |
|
1346 |
if not builder.build() : |
|
1347 |
self.logger.write_error("C Build failed.\n") |
|
1348 |
return False |
|
1349 |
except Exception, exc: |
|
1350 |
self.logger.write_error("C Build crashed !\n") |
|
1351 |
self.logger.write_error(traceback.format_exc()) |
|
1352 |
return False |
|
1353 |
||
1354 |
# Update GUI status about need for transfer |
|
1355 |
self.CompareLocalAndRemotePLC() |
|
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1356 |
return True |
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1357 |
|
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1358 |
def ShowError(self, logger, from_location, to_location): |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1359 |
chunk_infos = self.GetChunkInfos(from_location, to_location) |
215 | 1360 |
self._EditPLC() |
202
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1361 |
for infos, (start_row, start_col) in chunk_infos: |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1362 |
start = (from_location[0] - start_row, from_location[1] - start_col) |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1363 |
end = (to_location[0] - start_row, to_location[1] - start_col) |
cd81a7a6e55c
Adding support for highlighing compiling errors into PLCOpenEditor
lbessard
parents:
199
diff
changeset
|
1364 |
self.PLCEditor.ShowError(infos, start, end) |
203 | 1365 |
|
1366 |
def _showIECcode(self): |
|
20 | 1367 |
plc_file = self._getIECcodepath() |
173
2a9c4eec8645
Bug on Beremiz close with and IECcode and IECrawcode frames opened fixed
lbessard
parents:
158
diff
changeset
|
1368 |
new_dialog = wx.Frame(self.AppFrame) |
74 | 1369 |
ST_viewer = TextViewer(new_dialog, "", None, None) |
20 | 1370 |
#ST_viewer.Enable(False) |
1371 |
ST_viewer.SetKeywords(IEC_KEYWORDS) |
|
1372 |
try: |
|
1373 |
text = file(plc_file).read() |
|
1374 |
except: |
|
1375 |
text = '(* No IEC code have been generated at that time ! *)' |
|
65 | 1376 |
ST_viewer.SetText(text = text) |
1377 |
||
1378 |
new_dialog.Show() |
|
1379 |
||
203 | 1380 |
def _editIECrawcode(self): |
173
2a9c4eec8645
Bug on Beremiz close with and IECcode and IECrawcode frames opened fixed
lbessard
parents:
158
diff
changeset
|
1381 |
new_dialog = wx.Frame(self.AppFrame) |
66 | 1382 |
|
65 | 1383 |
controler = MiniTextControler(self._getIECrawcodepath()) |
74 | 1384 |
ST_viewer = TextViewer(new_dialog, "", None, controler) |
65 | 1385 |
#ST_viewer.Enable(False) |
1386 |
ST_viewer.SetKeywords(IEC_KEYWORDS) |
|
1387 |
ST_viewer.RefreshView() |
|
20 | 1388 |
|
1389 |
new_dialog.Show() |
|
1390 |
||
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1391 |
def _editPYTHONcode(self): |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1392 |
from PythonSTC import PythonCodePanel |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1393 |
new_dialog = wx.Frame(self.AppFrame) |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1394 |
|
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1395 |
PYTHON_viewer = PythonCodePanel(new_dialog, self.AppFrame) |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1396 |
#ST_viewer.Enable(False) |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1397 |
pyfile=self._getPYTHONcodepath() |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1398 |
PYTHON_viewer.LoadSourceFile(pyfile) |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1399 |
|
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1400 |
new_dialog.Show() |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1401 |
|
301 | 1402 |
def _editWXGLADE(self): |
1403 |
wxg_filename = self._getWXGLADEpath() |
|
1404 |
if not os.path.exists(wxg_filename): |
|
1405 |
open(wxg_filename,"w").write("""<?xml version="1.0"?> |
|
1406 |
<application path="" name="" class="" option="0" language="python" top_window="frame_1" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0"> |
|
1407 |
<object class="HMIFrame" name="frame_1" base="EditFrame"> |
|
1408 |
<style>wxDEFAULT_FRAME_STYLE</style> |
|
1409 |
<title>frame_1</title> |
|
1410 |
</object> |
|
1411 |
</application> |
|
1412 |
""") |
|
312 | 1413 |
if wx.Platform == '__WXMSW__': |
1414 |
wxg_filename = "\"%s\""%wxg_filename |
|
301 | 1415 |
self.launch_wxglade([wxg_filename]) |
1416 |
||
203 | 1417 |
def _EditPLC(self): |
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
1418 |
if self.PLCEditor is None: |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
1419 |
self.RefreshPluginsBlockLists() |
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1420 |
def _onclose(): |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1421 |
self.PLCEditor = None |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1422 |
def _onsave(): |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1423 |
self.SaveProject() |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
1424 |
self.PLCEditor = PLCOpenEditor(self.AppFrame, self) |
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1425 |
self.PLCEditor._onclose = _onclose |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1426 |
self.PLCEditor._onsave = _onsave |
20 | 1427 |
self.PLCEditor.Show() |
1428 |
||
203 | 1429 |
def _Clean(self): |
108 | 1430 |
if os.path.isdir(os.path.join(self._getBuildPath())): |
203 | 1431 |
self.logger.write("Cleaning the build directory\n") |
108 | 1432 |
shutil.rmtree(os.path.join(self._getBuildPath())) |
1433 |
else: |
|
203 | 1434 |
self.logger.write_error("Build directory already clean\n") |
1435 |
self.ShowMethod("_showIECcode", False) |
|
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1436 |
self.EnableMethod("_Clean", False) |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1437 |
# kill the builder |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1438 |
self._builder = None |
203 | 1439 |
self.CompareLocalAndRemotePLC() |
1440 |
||
1441 |
############# Real PLC object access ############# |
|
1442 |
def UpdateMethodsFromPLCStatus(self): |
|
1443 |
# Get PLC state : Running or Stopped |
|
1444 |
# TODO : use explicit status instead of boolean |
|
1445 |
if self._connector is not None: |
|
1446 |
status = self._connector.GetPLCstatus() |
|
107 | 1447 |
else: |
203 | 1448 |
status = "Disconnected" |
1449 |
for args in { |
|
1450 |
"Started":[("_Run", False), |
|
1451 |
("_Debug", False), |
|
1452 |
("_Stop", True)], |
|
1453 |
"Stopped":[("_Run", True), |
|
1454 |
("_Debug", True), |
|
1455 |
("_Stop", False)], |
|
1456 |
"Empty": [("_Run", False), |
|
1457 |
("_Debug", False), |
|
1458 |
("_Stop", False)], |
|
1459 |
"Dirty": [("_Run", True), |
|
1460 |
("_Debug", True), |
|
1461 |
("_Stop", False)], |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1462 |
"Broken": [("_Run", True), |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1463 |
("_Debug", True), |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1464 |
("_Stop", False)], |
203 | 1465 |
"Disconnected": [("_Run", False), |
1466 |
("_Debug", False), |
|
355 | 1467 |
("_Stop", False), |
1468 |
("_Transfer", False), |
|
1469 |
("_Connect", True), |
|
1470 |
("_Disconnect", False)], |
|
203 | 1471 |
}.get(status,[]): |
1472 |
self.ShowMethod(*args) |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1473 |
return status |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1474 |
|
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1475 |
def PullPLCStatusProc(self, event): |
355 | 1476 |
if self._connector is None: |
1477 |
self.StatusTimer.Stop() |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1478 |
current_status = self.UpdateMethodsFromPLCStatus() |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1479 |
if current_status != self.previous_plcstate: |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1480 |
self.previous_plcstate = current_status |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1481 |
self.StatusPrint.get(current_status, self.logger.write)("PLC is %s\n"%current_status) |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1482 |
self.AppFrame.RefreshAll() |
355 | 1483 |
|
203 | 1484 |
def _Run(self): |
1485 |
""" |
|
1486 |
Start PLC |
|
1487 |
""" |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1488 |
self._connector.StartPLC() |
203 | 1489 |
self.UpdateMethodsFromPLCStatus() |
1490 |
||
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1491 |
def RegisterDebugVarToConnector(self): |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1492 |
self.DebugTimer=None |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1493 |
Idxs = [] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1494 |
self.TracedIECPath = [] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1495 |
if self._connector is not None: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1496 |
self.IECdebug_lock.acquire() |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1497 |
IECPathsToPop = [] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1498 |
for IECPath,data_tuple in self.IECdebug_datas.iteritems(): |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1499 |
WeakCallableDict, data_log, status = data_tuple |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1500 |
if len(WeakCallableDict) == 0: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1501 |
# Callable Dict is empty. |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1502 |
# This variable is not needed anymore! |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1503 |
#print "Unused : " + IECPath |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1504 |
IECPathsToPop.append(IECPath) |
355 | 1505 |
elif IECPath != "__tick__": |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1506 |
# Convert |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1507 |
Idx = self._IECPathToIdx.get(IECPath,None) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1508 |
if Idx is not None: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1509 |
Idxs.append(Idx) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1510 |
self.TracedIECPath.append(IECPath) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1511 |
else: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1512 |
self.logger.write_warning("Debug : Unknown variable %s\n"%IECPath) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1513 |
for IECPathToPop in IECPathsToPop: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1514 |
self.IECdebug_datas.pop(IECPathToPop) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1515 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1516 |
self._connector.SetTraceVariablesList(Idxs) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1517 |
self.IECdebug_lock.release() |
243 | 1518 |
|
1519 |
#for IEC_path, IECdebug_data in self.IECdebug_datas.iteritems(): |
|
1520 |
# print IEC_path, IECdebug_data[0].keys() |
|
1521 |
||
1522 |
def ReArmDebugRegisterTimer(self): |
|
1523 |
if self.DebugTimer is not None: |
|
1524 |
self.DebugTimer.cancel() |
|
1525 |
||
1526 |
# Timer to prevent rapid-fire when registering many variables |
|
1527 |
# use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead |
|
1528 |
self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector]) |
|
1529 |
# Rearm anti-rapid-fire timer |
|
1530 |
self.DebugTimer.start() |
|
1531 |
||
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1532 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1533 |
def SubscribeDebugIECVariable(self, IECPath, callableobj, *args, **kwargs): |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1534 |
""" |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1535 |
Dispatching use a dictionnary linking IEC variable paths |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1536 |
to a WeakKeyDictionary linking |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1537 |
weakly referenced callables to optionnal args |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1538 |
""" |
355 | 1539 |
if IECPath != "__tick__" and self._IECPathToIdx.get(IECPath, None) is None: |
246 | 1540 |
return None |
1541 |
||
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1542 |
self.IECdebug_lock.acquire() |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1543 |
# If no entry exist, create a new one with a fresh WeakKeyDictionary |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1544 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1545 |
if IECdebug_data is None: |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1546 |
IECdebug_data = [ |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1547 |
WeakKeyDictionary(), # Callables |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1548 |
[], # Data storage [(tick, data),...] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1549 |
"Registered"] # Variable status |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1550 |
self.IECdebug_datas[IECPath] = IECdebug_data |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1551 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1552 |
IECdebug_data[0][callableobj]=(args, kwargs) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1553 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1554 |
self.IECdebug_lock.release() |
243 | 1555 |
|
1556 |
self.ReArmDebugRegisterTimer() |
|
1557 |
||
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1558 |
return IECdebug_data[1] |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1559 |
|
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1560 |
def UnsubscribeDebugIECVariable(self, IECPath, callableobj): |
243 | 1561 |
#print "Unsubscribe", IECPath, callableobj |
1562 |
self.IECdebug_lock.acquire() |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1563 |
IECdebug_data = self.IECdebug_datas.get(IECPath, None) |
243 | 1564 |
if IECdebug_data is not None: |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1565 |
IECdebug_data[0].pop(callableobj,None) |
243 | 1566 |
self.IECdebug_lock.release() |
1567 |
||
1568 |
self.ReArmDebugRegisterTimer() |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1569 |
|
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1570 |
def UnsubscribeAllDebugIECVariable(self): |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1571 |
self.IECdebug_lock.acquire() |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1572 |
IECdebug_data = {} |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1573 |
self.IECdebug_lock.release() |
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1574 |
|
355 | 1575 |
self.ReArmDebugRegisterTimer() |
1576 |
||
1577 |
def CallWeakcallables(self, IECPath, function_name, *cargs): |
|
1578 |
data_tuple = self.IECdebug_datas.get(IECPath, None) |
|
1579 |
if data_tuple is not None: |
|
1580 |
WeakCallableDict, data_log, status = data_tuple |
|
1581 |
#data_log.append((debug_tick, value)) |
|
1582 |
for weakcallable,(args,kwargs) in WeakCallableDict.iteritems(): |
|
1583 |
#print weakcallable, value, args, kwargs |
|
1584 |
function = getattr(weakcallable, function_name, None) |
|
1585 |
if function is not None: |
|
1586 |
function(*(cargs + args), **kwargs) |
|
1587 |
# This will block thread if more than one call is waiting |
|
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1588 |
|
235 | 1589 |
def DebugThreadProc(self): |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1590 |
""" |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1591 |
This thread waid PLC debug data, and dispatch them to subscribers |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1592 |
""" |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1593 |
# This lock is used to avoid flooding wx event stack calling callafter |
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1594 |
self.debug_break = False |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1595 |
while (not self.debug_break) and (self._connector is not None): |
235 | 1596 |
debug_tick, debug_vars = self._connector.GetTraceVariables() |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1597 |
#print debug_tick, debug_vars |
243 | 1598 |
self.IECdebug_lock.acquire() |
235 | 1599 |
if debug_vars is not None and \ |
1600 |
len(debug_vars) == len(self.TracedIECPath): |
|
1601 |
for IECPath,value in zip(self.TracedIECPath, debug_vars): |
|
321 | 1602 |
if value is not None: |
355 | 1603 |
self.CallWeakcallables(IECPath, "NewValue", debug_tick, value) |
1604 |
self.CallWeakcallables("__tick__", "NewDataAvailable") |
|
235 | 1605 |
elif debug_vars is not None: |
1606 |
wx.CallAfter(self.logger.write_warning, |
|
280
f2ef79f3dba0
Added native (not a plugin) asynchronous python eval function block - Beta. Code cleanup in C code templates.
etisserant
parents:
275
diff
changeset
|
1607 |
"Debug data not coherent %d != %d\n"%(len(debug_vars), len(self.TracedIECPath))) |
243 | 1608 |
elif debug_tick == -1: |
235 | 1609 |
#wx.CallAfter(self.logger.write, "Debugger unavailable\n") |
243 | 1610 |
pass |
235 | 1611 |
else: |
1612 |
wx.CallAfter(self.logger.write, "Debugger disabled\n") |
|
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1613 |
self.debug_break = True |
243 | 1614 |
self.IECdebug_lock.release() |
235 | 1615 |
|
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1616 |
def KillDebugThread(self): |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1617 |
self.debug_break = True |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1618 |
self.DebugThread.join(timeout=1) |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1619 |
if self.DebugThread.isAlive(): |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1620 |
self.logger.write_warning("Debug Thread couldn't be killed") |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1621 |
self.DebugThread = None |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1622 |
|
235 | 1623 |
def _Debug(self): |
203 | 1624 |
""" |
1625 |
Start PLC (Debug Mode) |
|
1626 |
""" |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1627 |
if self.GetIECProgramsAndVariables(): |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1628 |
self._connector.StartPLC(debug=True) |
203 | 1629 |
self.logger.write("Starting PLC (debug mode)\n") |
243 | 1630 |
if self.PLCDebug is None: |
1631 |
self.RefreshPluginsBlockLists() |
|
1632 |
def _onclose(): |
|
1633 |
self.PLCDebug = None |
|
1634 |
self.PLCDebug = PLCOpenEditor(self.AppFrame, self, debug=True) |
|
1635 |
self.PLCDebug._onclose = _onclose |
|
1636 |
self.PLCDebug.Show() |
|
328 | 1637 |
else: |
1638 |
self.PLCDebug.ResetGraphicViewers() |
|
235 | 1639 |
self.DebugThread = Thread(target=self.DebugThreadProc) |
1640 |
self.DebugThread.start() |
|
203 | 1641 |
else: |
1642 |
self.logger.write_error("Couldn't start PLC debug !\n") |
|
1643 |
self.UpdateMethodsFromPLCStatus() |
|
235 | 1644 |
|
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1645 |
|
235 | 1646 |
# def _Do_Test_Debug(self): |
1647 |
# # debug code |
|
1648 |
# self.temporary_non_weak_callable_refs = [] |
|
1649 |
# for IEC_Path, idx in self._IECPathToIdx.iteritems(): |
|
1650 |
# class tmpcls: |
|
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1651 |
# def __init__(_self): |
244 | 1652 |
# _self.buf = None |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1653 |
# def setbuf(_self,buf): |
244 | 1654 |
# _self.buf = buf |
239
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1655 |
# def SetValue(_self, value, idx, name): |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1656 |
# self.logger.write("debug call: %s %d %s\n"%(repr(value), idx, name)) |
112b4bc523b3
Fixed bad IPC choice for debugger/PLC/control thread collaboration
etisserant
parents:
236
diff
changeset
|
1657 |
# #self.logger.write("debug call: %s %d %s %s\n"%(repr(value), idx, name, repr(self.buf))) |
235 | 1658 |
# a = tmpcls() |
1659 |
# res = self.SubscribeDebugIECVariable(IEC_Path, a, idx, IEC_Path) |
|
1660 |
# a.setbuf(res) |
|
1661 |
# self.temporary_non_weak_callable_refs.append(a) |
|
203 | 1662 |
|
1663 |
def _Stop(self): |
|
1664 |
""" |
|
1665 |
Stop PLC |
|
1666 |
""" |
|
286
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1667 |
if self.DebugThread is not None: |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1668 |
self.logger.write("Stopping debug\n") |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1669 |
self.KillDebugThread() |
a2a8a52b0d4f
Minor changes to get better cleanup of debug and python_eval threads, accross multiple debug sessions and PLC runs.
etisserant
parents:
283
diff
changeset
|
1670 |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1671 |
if not self._connector.StopPLC(): |
203 | 1672 |
self.logger.write_error("Couldn't stop PLC !\n") |
1673 |
self.UpdateMethodsFromPLCStatus() |
|
1674 |
||
1675 |
def _Connect(self): |
|
1676 |
# don't accept re-connetion is already connected |
|
1677 |
if self._connector is not None: |
|
1678 |
self.logger.write_error("Already connected. Please disconnect\n") |
|
1679 |
return |
|
1680 |
||
1681 |
# Get connector uri |
|
1682 |
uri = self.\ |
|
1683 |
BeremizRoot.\ |
|
1684 |
getURI_location().\ |
|
1685 |
strip() |
|
1686 |
||
1687 |
# if uri is empty launch discovery dialog |
|
1688 |
if uri == "": |
|
1689 |
# Launch Service Discovery dialog |
|
1690 |
dia = DiscoveryDialog(self.AppFrame) |
|
1691 |
dia.ShowModal() |
|
1692 |
uri = dia.GetResult() |
|
1693 |
# Nothing choosed or cancel button |
|
1694 |
if uri is None: |
|
1695 |
return |
|
1696 |
else: |
|
1697 |
self.\ |
|
1698 |
BeremizRoot.\ |
|
1699 |
setURI_location(uri) |
|
1700 |
||
1701 |
# Get connector from uri |
|
1702 |
try: |
|
1703 |
self._connector = connectors.ConnectorFactory(uri, self) |
|
1704 |
except Exception, msg: |
|
1705 |
self.logger.write_error("Exception while connecting %s!\n"%uri) |
|
1706 |
self.logger.write_error(traceback.format_exc()) |
|
1707 |
||
1708 |
# Did connection success ? |
|
1709 |
if self._connector is None: |
|
1710 |
# Oups. |
|
1711 |
self.logger.write_error("Connection failed to %s!\n"%uri) |
|
1712 |
else: |
|
1713 |
self.ShowMethod("_Connect", False) |
|
1714 |
self.ShowMethod("_Disconnect", True) |
|
1715 |
self.ShowMethod("_Transfer", True) |
|
1716 |
||
1717 |
self.CompareLocalAndRemotePLC() |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1718 |
|
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1719 |
# Init with actual PLC status and print it |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1720 |
self.previous_plcstate = self.UpdateMethodsFromPLCStatus() |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1721 |
self.logger.write("PLC is %s\n"%self.previous_plcstate) |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1722 |
|
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1723 |
# Start the status Timer |
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1724 |
self.StatusTimer.Start(milliseconds=500, oneShot=False) |
203 | 1725 |
|
1726 |
def CompareLocalAndRemotePLC(self): |
|
1727 |
if self._connector is None: |
|
1728 |
return |
|
1729 |
# We are now connected. Update button status |
|
1730 |
MD5 = self.GetLastBuildMD5() |
|
1731 |
# Check remote target PLC correspondance to that md5 |
|
1732 |
if MD5 is not None: |
|
1733 |
if not self._connector.MatchMD5(MD5): |
|
1734 |
self.logger.write_warning( |
|
1735 |
"Latest build do not match with target, please transfer.\n") |
|
1736 |
self.EnableMethod("_Transfer", True) |
|
1737 |
else: |
|
1738 |
self.logger.write( |
|
1739 |
"Latest build match target, no transfer needed.\n") |
|
1740 |
self.EnableMethod("_Transfer", True) |
|
1741 |
#self.EnableMethod("_Transfer", False) |
|
1742 |
else: |
|
1743 |
self.logger.write_warning( |
|
1744 |
"Cannot compare latest build to target. Please build.\n") |
|
1745 |
self.EnableMethod("_Transfer", False) |
|
1746 |
||
1747 |
||
1748 |
def _Disconnect(self): |
|
1749 |
self._connector = None |
|
350
a3a5561bde1d
- now call load, start, free PLC from the python Thread
greg
parents:
348
diff
changeset
|
1750 |
self.StatusTimer.Stop() |
203 | 1751 |
self.UpdateMethodsFromPLCStatus() |
1752 |
||
1753 |
def _Transfer(self): |
|
1754 |
# Get the last build PLC's |
|
1755 |
MD5 = self.GetLastBuildMD5() |
|
1756 |
||
1757 |
# Check if md5 file is empty : ask user to build PLC |
|
1758 |
if MD5 is None : |
|
1759 |
self.logger.write_error("Failed : Must build before transfer.\n") |
|
1760 |
return False |
|
1761 |
||
1762 |
# Compare PLC project with PLC on target |
|
1763 |
if self._connector.MatchMD5(MD5): |
|
1764 |
self.logger.write( |
|
1765 |
"Latest build already match current target. Transfering anyway...\n") |
|
1766 |
||
1767 |
# Get temprary directory path |
|
1768 |
extrafilespath = self._getExtraFilesPath() |
|
1769 |
extrafiles = [(name, open(os.path.join(extrafilespath, name), |
|
1770 |
'rb').read()) \ |
|
1771 |
for name in os.listdir(extrafilespath) \ |
|
1772 |
if not name=="CVS"] |
|
1773 |
||
1774 |
# Send PLC on target |
|
1775 |
builder = self.GetBuilder() |
|
1776 |
if builder is not None: |
|
1777 |
data = builder.GetBinaryCode() |
|
1778 |
if data is not None : |
|
1779 |
if self._connector.NewPLC(MD5, data, extrafiles): |
|
328 | 1780 |
if self.PLCDebug is not None: |
1781 |
self.PLCDebug.Close() |
|
1782 |
self.PLCDebug = None |
|
334
b4131e5d10a4
Adding support for unsubscribe all variables while transferring
lbessard
parents:
328
diff
changeset
|
1783 |
self.UnsubscribeAllDebugIECVariable() |
246 | 1784 |
self.ProgramTransferred() |
203 | 1785 |
self.logger.write("Transfer completed successfully.\n") |
1786 |
else: |
|
1787 |
self.logger.write_error("Transfer failed\n") |
|
1788 |
else: |
|
1789 |
self.logger.write_error("No PLC to transfer (did build success ?)\n") |
|
1790 |
self.UpdateMethodsFromPLCStatus() |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1791 |
|
65 | 1792 |
PluginMethods = [ |
203 | 1793 |
{"bitmap" : opjimg("editPLC"), |
65 | 1794 |
"name" : "Edit PLC", |
1795 |
"tooltip" : "Edit PLC program with PLCOpenEditor", |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1796 |
"method" : "_EditPLC"}, |
203 | 1797 |
{"bitmap" : opjimg("Build"), |
65 | 1798 |
"name" : "Build", |
1799 |
"tooltip" : "Build project into build folder", |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1800 |
"method" : "_build"}, |
203 | 1801 |
{"bitmap" : opjimg("Clean"), |
65 | 1802 |
"name" : "Clean", |
203 | 1803 |
"enabled" : False, |
65 | 1804 |
"tooltip" : "Clean project build folder", |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1805 |
"method" : "_Clean"}, |
203 | 1806 |
{"bitmap" : opjimg("Run"), |
65 | 1807 |
"name" : "Run", |
203 | 1808 |
"shown" : False, |
1809 |
"tooltip" : "Start PLC", |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1810 |
"method" : "_Run"}, |
203 | 1811 |
{"bitmap" : opjimg("Debug"), |
1812 |
"name" : "Debug", |
|
1813 |
"shown" : False, |
|
1814 |
"tooltip" : "Start PLC (debug mode)", |
|
1815 |
"method" : "_Debug"}, |
|
235 | 1816 |
# {"bitmap" : opjimg("Debug"), |
1817 |
# "name" : "Do_Test_Debug", |
|
1818 |
# "tooltip" : "Test debug mode)", |
|
1819 |
# "method" : "_Do_Test_Debug"}, |
|
203 | 1820 |
{"bitmap" : opjimg("Stop"), |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1821 |
"name" : "Stop", |
203 | 1822 |
"shown" : False, |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1823 |
"tooltip" : "Stop Running PLC", |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1824 |
"method" : "_Stop"}, |
203 | 1825 |
{"bitmap" : opjimg("Connect"), |
1826 |
"name" : "Connect", |
|
1827 |
"tooltip" : "Connect to the target PLC", |
|
1828 |
"method" : "_Connect"}, |
|
1829 |
{"bitmap" : opjimg("Transfer"), |
|
1830 |
"name" : "Transfer", |
|
1831 |
"shown" : False, |
|
1832 |
"tooltip" : "Transfer PLC", |
|
1833 |
"method" : "_Transfer"}, |
|
1834 |
{"bitmap" : opjimg("Disconnect"), |
|
1835 |
"name" : "Disconnect", |
|
1836 |
"shown" : False, |
|
1837 |
"tooltip" : "Disconnect from PLC", |
|
1838 |
"method" : "_Disconnect"}, |
|
1839 |
{"bitmap" : opjimg("ShowIECcode"), |
|
199 | 1840 |
"name" : "Show code", |
203 | 1841 |
"shown" : False, |
65 | 1842 |
"tooltip" : "Show IEC code generated by PLCGenerator", |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1843 |
"method" : "_showIECcode"}, |
203 | 1844 |
{"bitmap" : opjimg("editIECrawcode"), |
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1845 |
"name" : "Raw IEC code", |
74 | 1846 |
"tooltip" : "Edit raw IEC code added to code generated by PLCGenerator", |
203 | 1847 |
"method" : "_editIECrawcode"}, |
283
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1848 |
{"bitmap" : opjimg("editPYTHONcode"), |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1849 |
"name" : "Python code", |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1850 |
"tooltip" : "Write Python runtime code, for use with python_eval FBs", |
d0e6fc0701fb
Added "runtime.py", a file that is executed in python thread in runtime, before handling python_eval FBs requests. Added small python editor taken from wxPython demo, and appropriate icon and button to launch it.
etisserant
parents:
280
diff
changeset
|
1851 |
"method" : "_editPYTHONcode"}, |
301 | 1852 |
{"bitmap" : opjimg("editWXGLADE"), |
1853 |
"name" : "WXGLADE GUI", |
|
1854 |
"tooltip" : "Edit a WxWidgets GUI with WXGlade", |
|
1855 |
"method" : "_editWXGLADE"}, |
|
65 | 1856 |
] |