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