author | etisserant |
Thu, 28 Feb 2008 18:12:16 +0100 | |
changeset 119 | f3819d2e8eff |
parent 118 | 185d0d371ea4 |
child 122 | 7676dba61281 |
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 |
|
20 | 5 |
import os,sys |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
6 |
import plugins |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
7 |
import types |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
8 |
import shutil |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
9 |
from xml.dom import minidom |
22 | 10 |
import wx |
20 | 11 |
|
12 |
#Quick hack to be able to find Beremiz IEC tools. Should be config params. |
|
13 |
base_folder = os.path.split(sys.path[0])[0] |
|
14 |
sys.path.append(os.path.join(base_folder, "plcopeneditor")) |
|
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 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
19 |
_BaseParamsClass = GenerateClassesFromXSDstring("""<?xml version="1.0" encoding="ISO-8859-1" ?> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
20 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
21 |
<xsd:element name="BaseParams"> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
22 |
<xsd:complexType> |
86 | 23 |
<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
|
24 |
<xsd:attribute name="IEC_Channel" type="xsd:integer" use="required"/> |
86 | 25 |
<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
|
26 |
</xsd:complexType> |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
27 |
</xsd:element> |
86 | 28 |
</xsd:schema>""")["BaseParams"] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
29 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
30 |
NameTypeSeparator = '@' |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
31 |
|
65 | 32 |
class MiniTextControler: |
33 |
||
34 |
def __init__(self, filepath): |
|
35 |
self.FilePath = filepath |
|
36 |
||
74 | 37 |
def SetEditedElementText(self, tagname, text): |
65 | 38 |
file = open(self.FilePath, "w") |
39 |
file.write(text) |
|
40 |
file.close() |
|
41 |
||
74 | 42 |
def GetEditedElementText(self, tagname): |
65 | 43 |
if os.path.isfile(self.FilePath): |
44 |
file = open(self.FilePath, "r") |
|
45 |
text = file.read() |
|
46 |
file.close() |
|
47 |
return text |
|
48 |
return "" |
|
49 |
||
74 | 50 |
def GetEditedElementInterfaceVars(self, tagname): |
51 |
return [] |
|
52 |
||
53 |
def GetEditedElementType(self, tagname): |
|
54 |
return "program" |
|
55 |
||
56 |
def GetBlockTypes(self, tagname = ""): |
|
57 |
return [] |
|
58 |
||
59 |
def GetEnumeratedDataValues(self): |
|
60 |
return [] |
|
61 |
||
65 | 62 |
def StartBuffering(self): |
63 |
pass |
|
64 |
||
65 |
def EndBuffering(self): |
|
66 |
pass |
|
67 |
||
68 |
def BufferProject(self): |
|
69 |
pass |
|
70 |
||
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
71 |
class PlugTemplate: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
72 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
73 |
This class is the one that define plugins. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
74 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
75 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
76 |
XSD = None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
77 |
PlugChildsTypes = [] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
78 |
PlugMaxCount = None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
79 |
PluginMethods = [] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
80 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
81 |
def _AddParamsMembers(self): |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
82 |
self.PlugParams = None |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
83 |
if self.XSD: |
86 | 84 |
Classes = GenerateClassesFromXSDstring(self.XSD) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
85 |
Classes = [(name, XSDclass) for name, XSDclass in Classes.items() if XSDclass.IsBaseClass] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
86 |
if len(Classes) == 1: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
87 |
name, XSDclass = Classes[0] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
88 |
obj = XSDclass() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
89 |
self.PlugParams = (name, obj) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
90 |
setattr(self, name, obj) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
91 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
92 |
def __init__(self): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
93 |
# Create BaseParam |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
94 |
self.BaseParams = _BaseParamsClass() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
95 |
self.MandatoryParams = ("BaseParams", self.BaseParams) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
96 |
self._AddParamsMembers() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
97 |
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
|
98 |
# 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
|
99 |
self.PluginMethods = [dic.copy() for dic in self.PluginMethods] |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
100 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
101 |
def PluginBaseXmlFilePath(self, PlugName=None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
102 |
return os.path.join(self.PlugPath(PlugName), "baseplugin.xml") |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
103 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
104 |
def PluginXmlFilePath(self, PlugName=None): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
105 |
return os.path.join(self.PlugPath(PlugName), "plugin.xml") |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
106 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
107 |
def PlugPath(self,PlugName=None): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
108 |
if not PlugName: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
109 |
PlugName = self.BaseParams.getName() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
110 |
return os.path.join(self.PlugParent.PlugPath(), PlugName + NameTypeSeparator + self.PlugType) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
111 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
112 |
def PlugTestModified(self): |
118 | 113 |
return self.ChangesToSave |
114 |
||
115 |
def ProjectTestModified(self): |
|
116 |
""" |
|
117 |
recursively check modified status |
|
118 |
""" |
|
119 |
if self.PlugTestModified(): |
|
120 |
return True |
|
121 |
||
122 |
for PlugChild in self.IterChilds(): |
|
123 |
if PlugChild.ProjectTestModified(): |
|
124 |
return True |
|
125 |
||
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
126 |
return False |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
127 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
128 |
def OnPlugSave(self): |
20 | 129 |
#Default, do nothing and return success |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
130 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
131 |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
132 |
def GetParamsAttributes(self, path = None): |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
133 |
if path: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
134 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
135 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
136 |
return self.MandatoryParams[1].getElementInfos(parts[0], parts[1]) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
137 |
elif self.PlugParams and parts[0] == self.PlugParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
138 |
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
|
139 |
else: |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
140 |
params = [] |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
141 |
if wx.VERSION < (2, 8, 0) and self.MandatoryParams: |
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
142 |
params.append(self.MandatoryParams[1].getElementInfos(self.MandatoryParams[0])) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
143 |
if self.PlugParams: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
144 |
params.append(self.PlugParams[1].getElementInfos(self.PlugParams[0])) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
145 |
return params |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
146 |
|
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
147 |
def SetParamsAttribute(self, path, value, logger): |
118 | 148 |
self.ChangesToSave = True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
149 |
# 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
|
150 |
if path == "BaseParams.IEC_Channel": |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
151 |
return self.FindNewIEC_Channel(value,logger), True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
152 |
elif path == "BaseParams.Name": |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
153 |
res = self.FindNewName(value,logger) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
154 |
self.PlugRequestSave() |
118 | 155 |
return res, True |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
156 |
|
19
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
157 |
parts = path.split(".", 1) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
158 |
if self.MandatoryParams and parts[0] == self.MandatoryParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
159 |
self.MandatoryParams[1].setElementValue(parts[1], value) |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
160 |
elif self.PlugParams and parts[0] == self.PlugParams[0]: |
73257cea38bd
Adding Plugin params visualization with basic controls
lbessard
parents:
18
diff
changeset
|
161 |
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
|
162 |
return value, False |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
163 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
164 |
def PlugRequestSave(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
165 |
# If plugin do not have corresponding directory |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
166 |
plugpath = self.PlugPath() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
167 |
if not os.path.isdir(plugpath): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
168 |
# Create it |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
169 |
os.mkdir(plugpath) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
170 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
171 |
# generate XML for base XML parameters controller of the plugin |
20 | 172 |
if self.MandatoryParams: |
173 |
BaseXMLFile = open(self.PluginBaseXmlFilePath(),'w') |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
174 |
BaseXMLFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
175 |
BaseXMLFile.write(self.MandatoryParams[1].generateXMLText(self.MandatoryParams[0], 0)) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
176 |
BaseXMLFile.close() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
177 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
178 |
# generate XML for XML parameters controller of the plugin |
20 | 179 |
if self.PlugParams: |
180 |
XMLFile = open(self.PluginXmlFilePath(),'w') |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
181 |
XMLFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
182 |
XMLFile.write(self.PlugParams[1].generateXMLText(self.PlugParams[0], 0)) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
183 |
XMLFile.close() |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
184 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
185 |
# Call the plugin specific OnPlugSave method |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
186 |
result = self.OnPlugSave() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
187 |
if not result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
188 |
return "Error while saving \"%s\""%self.PlugPath() |
118 | 189 |
|
190 |
# mark plugin as saved |
|
191 |
self.ChangesToSave = False |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
192 |
# go through all childs and do the same |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
193 |
for PlugChild in self.IterChilds(): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
194 |
result = PlugChild.PlugRequestSave() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
195 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
196 |
return result |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
197 |
return None |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
198 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
199 |
def PlugImport(self, src_PlugPath): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
200 |
shutil.copytree(src_PlugPath, self.PlugPath) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
201 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
202 |
|
24 | 203 |
def PlugGenerate_C(self, buildpath, locations, logger): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
204 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
205 |
Generate C code |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
206 |
@param locations: List of complete variables locations \ |
22 | 207 |
[{"IEC_TYPE" : the IEC type (i.e. "INT", "STRING", ...) |
208 |
"NAME" : name of the variable (generally "__IW0_1_2" style) |
|
209 |
"DIR" : direction "Q","I" or "M" |
|
210 |
"SIZE" : size "X", "B", "W", "D", "L" |
|
211 |
"LOC" : tuple of interger for IEC location (0,1,2,...) |
|
212 |
}, ...] |
|
18 | 213 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
214 |
""" |
|
115 | 215 |
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
|
216 |
return [],"",False |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
217 |
|
24 | 218 |
def _Generate_C(self, buildpath, locations, logger): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
219 |
# Generate plugins [(Cfiles, CFLAGS)], LDFLAGS |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
220 |
PlugCFilesAndCFLAGS, PlugLDFLAGS, DoCalls = self.PlugGenerate_C(buildpath, locations, logger) |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
221 |
# if some files heve been generated put them in the list with their location |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
222 |
if PlugCFilesAndCFLAGS: |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
223 |
LocationCFilesAndCFLAGS = [(self.GetCurrentLocation(), PlugCFilesAndCFLAGS, DoCalls)] |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
224 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
225 |
LocationCFilesAndCFLAGS = [] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
226 |
|
115 | 227 |
# plugin asks for some LDFLAGS |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
228 |
if PlugLDFLAGS: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
229 |
# LDFLAGS can be either string |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
230 |
if type(PlugLDFLAGS)==type(str()): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
231 |
LDFLAGS=[PlugLDFLAGS] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
232 |
#or list of strings |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
233 |
elif type(PlugLDFLAGS)==type(list()): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
234 |
LDFLAGS=PlugLDFLAGS[:] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
235 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
236 |
LDFLAGS=[] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
237 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
238 |
# 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
|
239 |
for PlugChild in self.IECSortedChilds(): |
24 | 240 |
new_location = PlugChild.GetCurrentLocation() |
241 |
# How deep are we in the tree ? |
|
242 |
depth=len(new_location) |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
243 |
_LocationCFilesAndCFLAGS, _LDFLAGS = \ |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
244 |
PlugChild._Generate_C( |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
245 |
#keep the same path |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
246 |
buildpath, |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
247 |
# filter locations that start with current IEC location |
24 | 248 |
[loc for loc in locations if loc["LOC"][0:depth] == new_location ], |
18 | 249 |
#propagete logger |
250 |
logger) |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
251 |
# stack the result |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
252 |
LocationCFilesAndCFLAGS += _LocationCFilesAndCFLAGS |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
253 |
LDFLAGS += _LDFLAGS |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
254 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
255 |
return LocationCFilesAndCFLAGS,LDFLAGS |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
256 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
257 |
def BlockTypesFactory(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
258 |
return [] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
259 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
260 |
def STLibraryFactory(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
261 |
return "" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
262 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
263 |
def IterChilds(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
264 |
for PlugType, PluggedChilds in self.PluggedChilds.items(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
265 |
for PlugInstance in PluggedChilds: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
266 |
yield PlugInstance |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
267 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
268 |
def IECSortedChilds(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
269 |
# reorder childs by IEC_channels |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
270 |
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
|
271 |
if ordered: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
272 |
ordered.sort() |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
273 |
return zip(*ordered)[1] |
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 |
return [] |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
276 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
277 |
def _GetChildBySomething(self, something, toks): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
278 |
for PlugInstance in self.IterChilds(): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
279 |
# if match component of the name |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
280 |
if getattr(PlugInstance.BaseParams, something) == toks[0]: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
281 |
# if Name have other components |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
282 |
if len(toks) >= 2: |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
283 |
# 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
|
284 |
return PlugInstance._GetChildBySomething( something, toks[1:]) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
285 |
# No sub name -> found |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
286 |
return PlugInstance |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
287 |
# Not found |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
288 |
return None |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
289 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
290 |
def GetChildByName(self, Name): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
291 |
if Name: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
292 |
toks = Name.split('.') |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
293 |
return self._GetChildBySomething("Name", toks) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
294 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
295 |
return self |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
296 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
297 |
def GetChildByIECLocation(self, Location): |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
298 |
if Location: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
299 |
return self._GetChildBySomething("IEC_Channel", Location) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
300 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
301 |
return self |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
302 |
|
23 | 303 |
def GetCurrentLocation(self): |
24 | 304 |
""" |
305 |
@return: Tupple containing plugin IEC location of current plugin : %I0.0.4.5 => (0,0,4,5) |
|
306 |
""" |
|
23 | 307 |
return self.PlugParent.GetCurrentLocation() + (self.BaseParams.getIEC_Channel(),) |
308 |
||
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
309 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
310 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
311 |
@return: String "ParentParentName.ParentName.Name" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
312 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
313 |
return self.PlugParent._GetCurrentName() + self.BaseParams.getName() |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
314 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
315 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
316 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
317 |
@return: String "ParentParentName.ParentName.Name." |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
318 |
""" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
319 |
return self.PlugParent._GetCurrentName() + self.BaseParams.getName() + "." |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
320 |
|
23 | 321 |
def GetPlugRoot(self): |
322 |
return self.PlugParent.GetPlugRoot() |
|
323 |
||
97 | 324 |
def GetFullIEC_Channel(self): |
325 |
return ".".join([str(i) for i in self.GetCurrentLocation()]) + ".x" |
|
326 |
||
327 |
def GetLocations(self): |
|
328 |
location = self.GetCurrentLocation() |
|
329 |
return [loc for loc in self.PlugParent.GetLocations() if loc["LOC"][0:len(location)] == location] |
|
330 |
||
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
331 |
def GetPlugInfos(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
332 |
childs = [] |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
333 |
# reorder childs by IEC_channels |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
334 |
for child in self.IECSortedChilds(): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
335 |
childs.append(child.GetPlugInfos()) |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
336 |
if wx.VERSION < (2, 8, 0): |
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
337 |
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
|
338 |
else: |
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
339 |
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
|
340 |
|
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
341 |
def FindNewName(self, DesiredName, logger): |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
342 |
""" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
343 |
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
|
344 |
@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
|
345 |
""" |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
346 |
# Get Current Name |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
347 |
CurrentName = self.BaseParams.getName() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
348 |
# 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
|
349 |
#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
|
350 |
# 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
|
351 |
AllNames=[] |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
352 |
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
|
353 |
if PlugInstance != self: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
354 |
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
|
355 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
356 |
# 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
|
357 |
res = DesiredName |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
358 |
suffix = 1 |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
359 |
while res in AllNames: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
360 |
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
|
361 |
suffix += 1 |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
362 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
363 |
# Get old path |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
364 |
oldname = self.PlugPath() |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
365 |
# Check previous plugin existance |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
366 |
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
|
367 |
# Set the new name |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
368 |
self.BaseParams.setName(res) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
369 |
# 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
|
370 |
if not dontexist: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
371 |
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
|
372 |
# 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
|
373 |
if DesiredName != res: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
374 |
logger.write_warning("A child names \"%s\" already exist -> \"%s\"\n"%(DesiredName,res)) |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
375 |
return res |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
376 |
|
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
377 |
def FindNewIEC_Channel(self, DesiredChannel, logger): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
378 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
379 |
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
|
380 |
@param DesiredChannel: The desired IEC channel (int) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
381 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
382 |
# Get Current IEC channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
383 |
CurrentChannel = self.BaseParams.getIEC_Channel() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
384 |
# 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
|
385 |
#if CurrentChannel == DesiredChannel: return CurrentChannel |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
386 |
# 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
|
387 |
AllChannels=[] |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
388 |
for PlugInstance in self.PlugParent.IterChilds(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
389 |
if PlugInstance != self: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
390 |
AllChannels.append(PlugInstance.BaseParams.getIEC_Channel()) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
391 |
AllChannels.sort() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
392 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
393 |
# Now, try to guess the nearest available channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
394 |
res = DesiredChannel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
395 |
while res in AllChannels: # While channel not free |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
396 |
if res < CurrentChannel: # Want to go down ? |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
397 |
res -= 1 # Test for n-1 |
33
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
398 |
if res < 0 : |
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
399 |
if logger : |
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
400 |
logger.write_warning("Cannot find lower free IEC channel than %d\n"%CurrentChannel) |
59b84ab7bf8b
Enhanced bahavior of plugin tree representation when changing IEC channel
etisserant
parents:
29
diff
changeset
|
401 |
return CurrentChannel # Can't go bellow 0, do nothing |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
402 |
else : # Want to go up ? |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
403 |
res += 1 # Test for n-1 |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
404 |
# Finally set IEC Channel |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
405 |
self.BaseParams.setIEC_Channel(res) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
406 |
if logger and DesiredChannel != res: |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
407 |
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
|
408 |
return res |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
409 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
410 |
def OnPlugClose(self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
411 |
return True |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
412 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
413 |
def _doRemoveChild(self, PlugInstance): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
414 |
# Remove all childs of child |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
415 |
for SubPlugInstance in PlugInstance.IterChilds(): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
416 |
PlugInstance._doRemoveChild(SubPlugInstance) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
417 |
# Call the OnCloseMethod |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
418 |
PlugInstance.OnPlugClose() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
419 |
# Delete plugin dir |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
420 |
shutil.rmtree(PlugInstance.PlugPath()) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
421 |
# Remove child of PluggedChilds |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
422 |
self.PluggedChilds[PlugInstance.PlugType].remove(PlugInstance) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
423 |
# Forget it... (View have to refresh) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
424 |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
425 |
def PlugRemove(self): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
426 |
# Fetch the plugin |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
427 |
#PlugInstance = self.GetChildByName(PlugName) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
428 |
# 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
|
429 |
self.PlugParent._doRemoveChild(self) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
430 |
|
24 | 431 |
def PlugAddChild(self, PlugName, PlugType, logger): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
432 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
433 |
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
|
434 |
@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
|
435 |
@param PlugName: string for the name of the plugin instance |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
436 |
""" |
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
|
437 |
# 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
|
438 |
# 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
|
439 |
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
|
440 |
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
|
441 |
# Check that adding this plugin is allowed |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
442 |
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
|
443 |
PlugClass, PlugHelp = PlugChildsTypes[PlugType] |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
444 |
except KeyError: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
445 |
raise Exception, "Cannot create child %s of type %s "%(PlugName, PlugType) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
446 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
447 |
# 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
|
448 |
if type(PlugClass) == types.FunctionType: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
449 |
PlugClass = PlugClass() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
450 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
451 |
# 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
|
452 |
PluggedChildsWithSameClass = self.PluggedChilds.setdefault(PlugType, list()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
453 |
# Check count |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
454 |
if getattr(PlugClass, "PlugMaxCount", None) and len(PluggedChildsWithSameClass) >= PlugClass.PlugMaxCount: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
455 |
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
|
456 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
457 |
# create the final class, derived of provided plugin and template |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
458 |
class FinalPlugClass(PlugClass, PlugTemplate): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
459 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
460 |
Plugin class is derivated into FinalPlugClass before being instanciated |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
461 |
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
|
462 |
before PlugClass.__init__, and to do the file related stuff. |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
463 |
""" |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
464 |
def __init__(_self): |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
465 |
# self is the parent |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
466 |
_self.PlugParent = self |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
467 |
# Keep track of the plugin type name |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
468 |
_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
|
469 |
# 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
|
470 |
_self.PlugHelp = PlugHelp |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
471 |
# 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
|
472 |
PlugTemplate.__init__(_self) |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
473 |
# check name is unique |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
474 |
NewPlugName = _self.FindNewName(PlugName, logger) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
475 |
# 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
|
476 |
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
|
477 |
#Load the plugin.xml file into parameters members |
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
|
478 |
_self.LoadXMLParams(logger, NewPlugName) |
20 | 479 |
# 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
|
480 |
if (_self.BaseParams.getName() != NewPlugName): |
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
481 |
raise Exception, "Project tree layout do not match plugin.xml %s!=%s "%(NewPlugName, _self.BaseParams.getName()) |
20 | 482 |
|
483 |
# Now, self.PlugPath() should be OK |
|
484 |
||
15
7a473efc4530
More precise design for plugins.... to be continued...
etisserant
parents:
14
diff
changeset
|
485 |
# Check that IEC_Channel is not already in use. |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
486 |
_self.FindNewIEC_Channel(_self.BaseParams.getIEC_Channel(),logger) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
487 |
# Call the plugin real __init__ |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
488 |
if getattr(PlugClass, "__init__", None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
489 |
PlugClass.__init__(_self) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
490 |
#Load and init all the childs |
24 | 491 |
_self.LoadChilds(logger) |
118 | 492 |
#just loaded, nothing to saved |
493 |
_self.ChangesToSave = False |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
494 |
else: |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
495 |
# If plugin do not have corresponding file/dirs - they will be created on Save |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
496 |
os.mkdir(_self.PlugPath()) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
497 |
# Find an IEC number |
29
282380dea497
Major improvements, plugin renaming and secured name/IEC channel attribution, various fixes on PlugTemplate
etisserant
parents:
25
diff
changeset
|
498 |
_self.FindNewIEC_Channel(0, None) |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
499 |
# Call the plugin real __init__ |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
500 |
if getattr(PlugClass, "__init__", None): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
501 |
PlugClass.__init__(_self) |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
502 |
_self.PlugRequestSave() |
118 | 503 |
#just created, must be saved |
504 |
_self.ChangesToSave = True |
|
77
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
505 |
|
7de69369373e
Adding file with generated master in build folder and a button for editing it with objdictedit
lbessard
parents:
75
diff
changeset
|
506 |
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
|
507 |
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
|
508 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
509 |
# Create the object out of the resulting class |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
510 |
newPluginOpj = FinalPlugClass() |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
511 |
# Store it in PluggedChils |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
512 |
PluggedChildsWithSameClass.append(newPluginOpj) |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
513 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
514 |
return newPluginOpj |
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
515 |
|
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
516 |
|
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 |
def LoadXMLParams(self, logger, PlugName = None): |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
518 |
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
|
519 |
if os.path.isfile(methode_name): |
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
|
520 |
logger.write("Info: %s plugin as some special methods in methods.py\n" % (PlugName or "Root")) |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
521 |
execfile(methode_name) |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
522 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
523 |
# Get the base xml tree |
20 | 524 |
if self.MandatoryParams: |
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
|
525 |
#try: |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
526 |
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
|
527 |
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
|
528 |
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
|
529 |
basexmlfile.close() |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
530 |
#except Exception, e: |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
531 |
# logger.write_error("Couldn't load plugin base parameters %s :\n %s" % (PlugName, str(e))) |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
532 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
533 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
534 |
# Get the xml tree |
20 | 535 |
if self.PlugParams: |
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
|
536 |
#try: |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
537 |
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
|
538 |
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
|
539 |
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
|
540 |
xmlfile.close() |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
541 |
#except Exception, e: |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
542 |
# logger.write_error("Couldn't load plugin parameters %s :\n %s" % (PlugName, str(e))) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
543 |
|
24 | 544 |
def LoadChilds(self, logger): |
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
545 |
# 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
|
546 |
for PlugDir in os.listdir(self.PlugPath()): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
547 |
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
|
548 |
PlugDir.count(NameTypeSeparator) == 1: |
24 | 549 |
pname, ptype = PlugDir.split(NameTypeSeparator) |
86 | 550 |
#try: |
551 |
self.PlugAddChild(pname, ptype, logger) |
|
552 |
#except Exception, e: |
|
553 |
# logger.write_error("Could not add child \"%s\", type %s :\n%s\n"%(pname, ptype, str(e))) |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
554 |
|
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
|
555 |
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
|
556 |
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
|
557 |
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
|
558 |
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
|
559 |
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
|
560 |
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
|
561 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
562 |
def _GetClassFunction(name): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
563 |
def GetRootClass(): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
564 |
return getattr(__import__("plugins." + name), name).RootClass |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
565 |
return GetRootClass |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
566 |
|
20 | 567 |
|
568 |
#################################################################################### |
|
569 |
#################################################################################### |
|
570 |
#################################################################################### |
|
571 |
################################### ROOT ###################################### |
|
572 |
#################################################################################### |
|
573 |
#################################################################################### |
|
574 |
#################################################################################### |
|
575 |
||
81 | 576 |
if wx.Platform == '__WXMSW__': |
75 | 577 |
exe_ext=".exe" |
578 |
else: |
|
579 |
exe_ext="" |
|
580 |
||
581 |
iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+exe_ext) |
|
20 | 582 |
ieclib_path = os.path.join(base_folder, "matiec", "lib") |
583 |
||
584 |
# import for project creation timestamping |
|
585 |
from time import localtime |
|
586 |
from datetime import datetime |
|
587 |
# import necessary stuff from PLCOpenEditor |
|
588 |
from PLCControler import PLCControler |
|
589 |
from PLCOpenEditor import PLCOpenEditor, ProjectDialog |
|
590 |
from TextViewer import TextViewer |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
591 |
from plcopen.structures import IEC_KEYWORDS, AddPluginBlockList, ClearPluginTypes, PluginTypes |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
592 |
import runtime |
22 | 593 |
import re |
20 | 594 |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
595 |
class PluginsRoot(PlugTemplate, PLCControler): |
20 | 596 |
""" |
597 |
This class define Root object of the plugin tree. |
|
598 |
It is responsible of : |
|
599 |
- Managing project directory |
|
600 |
- Building project |
|
601 |
- Handling PLCOpenEditor controler and view |
|
602 |
- Loading user plugins and instanciante them as childs |
|
603 |
- ... |
|
604 |
||
605 |
""" |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
606 |
|
14
eb9fdd316a40
More precise design for plugins.... to be continued...
etisserant
parents:
13
diff
changeset
|
607 |
# 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
|
608 |
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
|
609 |
|
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
610 |
XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
611 |
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
612 |
<xsd:element name="BeremizRoot"> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
613 |
<xsd:complexType> |
86 | 614 |
<xsd:sequence> |
615 |
<xsd:element name="TargetType"> |
|
616 |
<xsd:complexType> |
|
617 |
<xsd:choice> |
|
618 |
<xsd:element name="Win32"> |
|
619 |
<xsd:complexType> |
|
620 |
<xsd:attribute name="Priority" type="xsd:integer" use="required"/> |
|
621 |
</xsd:complexType> |
|
622 |
</xsd:element> |
|
623 |
<xsd:element name="Linux"> |
|
624 |
<xsd:complexType> |
|
625 |
<xsd:attribute name="Nice" type="xsd:integer" use="required"/> |
|
626 |
</xsd:complexType> |
|
627 |
</xsd:element> |
|
628 |
<xsd:element name="Xenomai"> |
|
629 |
<xsd:complexType> |
|
630 |
<xsd:attribute name="xeno_config" type="xsd:string" use="optional" default="/usr/xenomai/"/> |
|
631 |
<xsd:attribute name="Priority" type="xsd:integer" use="required"/> |
|
632 |
</xsd:complexType> |
|
633 |
</xsd:element> |
|
634 |
<xsd:element name="RTAI"> |
|
635 |
<xsd:complexType> |
|
636 |
<xsd:attribute name="rtai_config" type="xsd:string" use="required"/> |
|
637 |
<xsd:attribute name="Priority" type="xsd:integer" use="required"/> |
|
638 |
</xsd:complexType> |
|
639 |
</xsd:element> |
|
640 |
<xsd:element name="Library"> |
|
641 |
<xsd:complexType> |
|
642 |
<xsd:attribute name="Dynamic" type="xsd:boolean" use="optional" default="true"/> |
|
643 |
</xsd:complexType> |
|
644 |
</xsd:element> |
|
645 |
</xsd:choice> |
|
646 |
</xsd:complexType> |
|
647 |
</xsd:element> |
|
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
|
648 |
<xsd:element name="Connection"> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
649 |
<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
|
650 |
<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
|
651 |
<xsd:element name="Local"/> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
652 |
<xsd:element name="TCP_IP"> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
653 |
<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
|
654 |
<xsd:attribute name="Host" type="xsd:string" use="required"/> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
655 |
</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
|
656 |
</xsd:element> |
9810689febb0
Added plugins creation helpstrings, changed GUI layout (more compact), solved staticbitmap issues on win32, re-designed some icons...
etisserant
parents:
105
diff
changeset
|
657 |
</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
|
658 |
</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
|
659 |
</xsd:element> |
86 | 660 |
</xsd:sequence> |
661 |
<xsd:attribute name="Compiler" type="xsd:string" use="optional" default="gcc"/> |
|
662 |
<xsd:attribute name="CFLAGS" type="xsd:string" use="required"/> |
|
663 |
<xsd:attribute name="Linker" type="xsd:string" use="optional" default="ld"/> |
|
664 |
<xsd:attribute name="LDFLAGS" type="xsd:string" use="required"/> |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
665 |
</xsd:complexType> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
666 |
</xsd:element> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
667 |
</xsd:schema> |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
668 |
""" |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
669 |
|
20 | 670 |
def __init__(self, frame): |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
671 |
PLCControler.__init__(self) |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
672 |
|
20 | 673 |
self.MandatoryParams = None |
674 |
self.AppFrame = frame |
|
675 |
||
676 |
""" |
|
677 |
This method are not called here... but in NewProject and OpenProject |
|
678 |
self._AddParamsMembers() |
|
679 |
self.PluggedChilds = {} |
|
680 |
""" |
|
118 | 681 |
# In both new or load scenario, no need to save |
682 |
self.ChangesToSave = False |
|
23 | 683 |
# root have no parent |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
684 |
self.PlugParent = None |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
685 |
# Keep track of the plugin type name |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
686 |
self.PlugType = "Beremiz" |
20 | 687 |
# After __init__ root plugin is not valid |
688 |
self.ProjectPath = None |
|
689 |
self.PLCEditor = 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
|
690 |
# 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
|
691 |
self.PluginMethods = [dic.copy() for dic in self.PluginMethods] |
118 | 692 |
# special root member for handlig PLC execution |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
693 |
self.runningPLC = None |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
694 |
|
118 | 695 |
def PlugTestModified(self): |
696 |
return self.ChangesToSave or not self.ProjectIsSaved() |
|
697 |
||
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
698 |
def HasProjectOpened(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
699 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
700 |
Return if a project is actually opened |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
701 |
""" |
20 | 702 |
return self.ProjectPath != None |
23 | 703 |
|
704 |
def GetPlugRoot(self): |
|
705 |
return self |
|
706 |
||
707 |
def GetCurrentLocation(self): |
|
708 |
return () |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
709 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
710 |
def GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
711 |
return "" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
712 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
713 |
def _GetCurrentName(self): |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
714 |
return "" |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
715 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
716 |
def GetProjectPath(self): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
717 |
return self.ProjectPath |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
718 |
|
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
719 |
def GetProjectName(self): |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
720 |
return os.path.split(self.ProjectPath)[1] |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
721 |
|
20 | 722 |
def GetPlugInfos(self): |
723 |
childs = [] |
|
724 |
for child in self.IterChilds(): |
|
725 |
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
|
726 |
return {"name" : "PLC (%s)"%self.GetProjectName(), "type" : None, "values" : childs} |
20 | 727 |
|
728 |
def NewProject(self, ProjectPath): |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
729 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
730 |
Create a new project in an empty folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
731 |
@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
|
732 |
@param PLCParams: properties of the PLCOpen program created |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
733 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
734 |
# Verify that choosen folder is empty |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
735 |
if not os.path.isdir(ProjectPath) or len(os.listdir(ProjectPath)) > 0: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
736 |
return "Folder choosen isn't empty. You can't use it for a new project!" |
20 | 737 |
|
738 |
dialog = ProjectDialog(self.AppFrame) |
|
739 |
if dialog.ShowModal() == wx.ID_OK: |
|
740 |
values = dialog.GetValues() |
|
741 |
values["creationDateTime"] = datetime(*localtime()[:6]) |
|
742 |
dialog.Destroy() |
|
743 |
else: |
|
744 |
dialog.Destroy() |
|
745 |
return "Project not created" |
|
746 |
||
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
747 |
# Create PLCOpen program |
113 | 748 |
self.CreateNewProject(values) |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
749 |
# Change XSD into class members |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
750 |
self._AddParamsMembers() |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
751 |
self.PluggedChilds = {} |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
752 |
# 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
|
753 |
self.ProjectPath = ProjectPath |
114
2e3d8d4480e7
Now .xml files are automatically created when creating a new project no need to save explicitely.
etisserant
parents:
113
diff
changeset
|
754 |
# get plugins bloclist (is that usefull at project creation?) |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
755 |
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
|
756 |
# 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
|
757 |
self.SaveProject() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
758 |
return None |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
759 |
|
24 | 760 |
def LoadProject(self, ProjectPath, logger): |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
761 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
762 |
Load a project contained in a folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
763 |
@param ProjectPath: path of the project folder |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
764 |
""" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
765 |
# Verify that project contains a PLCOpen program |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
766 |
plc_file = os.path.join(ProjectPath, "plc.xml") |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
767 |
if not os.path.isfile(plc_file): |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
768 |
return "Folder choosen doesn't contain a program. It's not a valid project!" |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
769 |
# Load PLCOpen file |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
770 |
result = self.OpenXMLFile(plc_file) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
771 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
772 |
return result |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
773 |
# Change XSD into class members |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
774 |
self._AddParamsMembers() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
775 |
self.PluggedChilds = {} |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
776 |
# 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
|
777 |
self.ProjectPath = ProjectPath |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
778 |
# 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
|
779 |
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
|
780 |
#Load the plugin.xml file into parameters members |
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
|
781 |
result = self.LoadXMLParams(logger) |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
782 |
if result: |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
783 |
return result |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
784 |
#Load and init all the childs |
24 | 785 |
self.LoadChilds(logger) |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
786 |
self.RefreshPluginsBlockLists() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
787 |
return None |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
788 |
|
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
789 |
def SaveProject(self): |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
790 |
if not self.SaveXMLFile(): |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
791 |
self.SaveXMLFile(os.path.join(self.ProjectPath, 'plc.xml')) |
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
792 |
if self.PLCEditor: |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
793 |
self.PLCEditor.RefreshTitle() |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
794 |
self.PlugRequestSave() |
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
795 |
|
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
796 |
# Update PLCOpenEditor Plugin Block types from loaded plugins |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
797 |
def RefreshPluginsBlockLists(self): |
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
798 |
if getattr(self, "PluggedChilds", None) is not None: |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
799 |
ClearPluginTypes() |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
800 |
AddPluginBlockList(self.BlockTypesFactory()) |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
801 |
for child in self.IterChilds(): |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
802 |
AddPluginBlockList(child.BlockTypesFactory()) |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
803 |
if self.PLCEditor is not None: |
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
804 |
self.PLCEditor.RefreshEditor() |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
805 |
|
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
806 |
def PlugPath(self, PlugName=None): |
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
807 |
return self.ProjectPath |
17
ee8cb104dbe0
First commit of Beremiz new version with plugin support
lbessard
parents:
16
diff
changeset
|
808 |
|
13
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
809 |
def PluginXmlFilePath(self, PlugName=None): |
f1f0edbeb313
More precise design for plugins.... to be continued...
etisserant
parents:
diff
changeset
|
810 |
return os.path.join(self.PlugPath(PlugName), "beremiz.xml") |
18 | 811 |
|
24 | 812 |
def PlugGenerate_C(self, buildpath, locations, logger): |
18 | 813 |
""" |
814 |
Generate C code |
|
815 |
@param locations: List of complete variables locations \ |
|
816 |
[(IEC_loc, IEC_Direction, IEC_Type, Name)]\ |
|
817 |
ex: [((0,0,4,5),'I','STRING','__IX_0_0_4_5'),...] |
|
818 |
@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND |
|
819 |
""" |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
820 |
return [(C_file_name, self.CFLAGS) for C_file_name in self.PLCGeneratedCFiles ] , "", False |
20 | 821 |
|
822 |
def _getBuildPath(self): |
|
823 |
return os.path.join(self.ProjectPath, "build") |
|
824 |
||
825 |
def _getIECcodepath(self): |
|
826 |
# define name for IEC code file |
|
827 |
return os.path.join(self._getBuildPath(), "plc.st") |
|
828 |
||
65 | 829 |
def _getIECgeneratedcodepath(self): |
830 |
# define name for IEC generated code file |
|
831 |
return os.path.join(self._getBuildPath(), "generated_plc.st") |
|
832 |
||
833 |
def _getIECrawcodepath(self): |
|
834 |
# define name for IEC raw code file |
|
835 |
return os.path.join(self._getBuildPath(), "raw_plc.st") |
|
836 |
||
97 | 837 |
def GetLocations(self): |
838 |
locations = [] |
|
839 |
filepath = os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h") |
|
840 |
if os.path.isfile(filepath): |
|
841 |
# IEC2C compiler generate a list of located variables : LOCATED_VARIABLES.h |
|
842 |
location_file = open(os.path.join(self._getBuildPath(),"LOCATED_VARIABLES.h")) |
|
843 |
# each line of LOCATED_VARIABLES.h declares a located variable |
|
844 |
lines = [line.strip() for line in location_file.readlines()] |
|
845 |
# This regular expression parses the lines genereated by IEC2C |
|
846 |
LOCATED_MODEL = re.compile("__LOCATED_VAR\((?P<IEC_TYPE>[A-Z]*),(?P<NAME>[_A-Za-z0-9]*),(?P<DIR>[QMI])(?:,(?P<SIZE>[XBWD]))?,(?P<LOC>[,0-9]*)\)") |
|
847 |
for line in lines: |
|
848 |
# If line match RE, |
|
849 |
result = LOCATED_MODEL.match(line) |
|
850 |
if result: |
|
851 |
# Get the resulting dict |
|
852 |
resdict = result.groupdict() |
|
853 |
# rewrite string for variadic location as a tuple of integers |
|
854 |
resdict['LOC'] = tuple(map(int,resdict['LOC'].split(','))) |
|
855 |
# set located size to 'X' if not given |
|
856 |
if not resdict['SIZE']: |
|
857 |
resdict['SIZE'] = 'X' |
|
858 |
# finally store into located variable list |
|
859 |
locations.append(resdict) |
|
860 |
return locations |
|
861 |
||
20 | 862 |
def _Generate_SoftPLC(self, logger): |
863 |
""" |
|
64 | 864 |
Generate SoftPLC ST/IL/SFC code out of PLCOpenEditor controller, and compile it with IEC2C |
20 | 865 |
@param buildpath: path where files should be created |
866 |
@param logger: the log pseudo file |
|
867 |
""" |
|
868 |
||
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
869 |
# Update PLCOpenEditor Plugin Block types before generate ST code |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
870 |
self.RefreshPluginsBlockLists() |
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
871 |
|
20 | 872 |
logger.write("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n") |
873 |
buildpath = self._getBuildPath() |
|
874 |
# ask PLCOpenEditor controller to write ST/IL/SFC code file |
|
65 | 875 |
result = self.GenerateProgram(self._getIECgeneratedcodepath()) |
113 | 876 |
if result is not None: |
20 | 877 |
# Failed ! |
113 | 878 |
logger.write_error("Error in ST/IL/SFC code generator :\n%s\n"%result) |
20 | 879 |
return False |
65 | 880 |
plc_file = open(self._getIECcodepath(), "w") |
881 |
if os.path.isfile(self._getIECrawcodepath()): |
|
882 |
plc_file.write(open(self._getIECrawcodepath(), "r").read()) |
|
883 |
plc_file.write("\n") |
|
884 |
plc_file.write(open(self._getIECgeneratedcodepath(), "r").read()) |
|
885 |
plc_file.close() |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
886 |
logger.write("Compiling IEC Program in to C code...\n") |
20 | 887 |
# Now compile IEC code into many C files |
888 |
# 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
|
889 |
status, result, err_result = ProcessLogger( |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
890 |
logger, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
891 |
"%s \"%s\" -I \"%s\" \"%s\""%( |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
892 |
iec2c_path, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
893 |
self._getIECcodepath(), |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
894 |
ieclib_path, buildpath), |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
895 |
no_stdout=True).spin() |
20 | 896 |
if status: |
897 |
# Failed ! |
|
22 | 898 |
logger.write_error("Error : IEC to C compiler returned %d\n"%status) |
20 | 899 |
return False |
900 |
# Now extract C files of stdout |
|
113 | 901 |
C_files = [ fname for fname in result.splitlines() if fname[-2:]==".c" or fname[-2:]==".C" ] |
20 | 902 |
# remove those that are not to be compiled because included by others |
903 |
C_files.remove("POUS.c") |
|
115 | 904 |
if not C_files: |
905 |
logger.write_error("Error : At least one configuration and one ressource must be declared in PLC !\n") |
|
906 |
return False |
|
20 | 907 |
# transform those base names to full names with path |
23 | 908 |
C_files = map(lambda filename:os.path.join(buildpath, filename), C_files) |
20 | 909 |
logger.write("Extracting Located Variables...\n") |
97 | 910 |
# Keep track of generated located variables for later use by self._Generate_C |
911 |
self.PLCGeneratedLocatedVars = self.GetLocations() |
|
20 | 912 |
# Keep track of generated C files for later use by self.PlugGenerate_C |
18 | 913 |
self.PLCGeneratedCFiles = C_files |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
914 |
# compute CFLAGS for plc |
96
0c06f7874a3f
Fixed some bugs with install path containing white spaces
etisserant
parents:
86
diff
changeset
|
915 |
self.CFLAGS = "\"-I"+ieclib_path+"\"" |
18 | 916 |
return True |
917 |
||
918 |
def _build(self, logger): |
|
20 | 919 |
""" |
920 |
Method called by user to (re)build SoftPLC and plugin tree |
|
921 |
""" |
|
922 |
buildpath = self._getBuildPath() |
|
923 |
||
924 |
# Eventually create build dir |
|
18 | 925 |
if not os.path.exists(buildpath): |
926 |
os.mkdir(buildpath) |
|
927 |
||
24 | 928 |
logger.flush() |
22 | 929 |
logger.write("Start build in %s\n" % buildpath) |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
930 |
|
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
931 |
self.EnableMethod("_Clean", True) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
932 |
self.EnableMethod("_showIECcode", True) |
18 | 933 |
|
20 | 934 |
# Generate SoftPLC code |
935 |
if not self._Generate_SoftPLC(logger): |
|
22 | 936 |
logger.write_error("SoftPLC code generation failed !\n") |
20 | 937 |
return False |
938 |
||
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
939 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
940 |
#logger.write("SoftPLC code generation successfull\n") |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
941 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
942 |
logger.write("Generating plugins code ...\n") |
18 | 943 |
|
20 | 944 |
# Generate C code and compilation params from plugin hierarchy |
24 | 945 |
try: |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
946 |
LocationCFilesAndCFLAGS,LDFLAGS = self._Generate_C( |
24 | 947 |
buildpath, |
948 |
self.PLCGeneratedLocatedVars, |
|
949 |
logger) |
|
950 |
except Exception, msg: |
|
951 |
logger.write_error("Plugins code generation Failed !\n") |
|
952 |
logger.write_error(str(msg)) |
|
953 |
return False |
|
18 | 954 |
|
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
955 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
956 |
#debug |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
957 |
#import pprint |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
958 |
#pp = pprint.PrettyPrinter(indent=4) |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
959 |
#logger.write("LocationCFilesAndCFLAGS :\n"+pp.pformat(LocationCFilesAndCFLAGS)+"\n") |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
960 |
#logger.write("LDFLAGS :\n"+pp.pformat(LDFLAGS)+"\n") |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
961 |
|
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
962 |
# Generate main |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
963 |
locstrs = map(lambda x:"_".join(map(str,x)), [loc for loc,Cfiles,DoCalls in LocationCFilesAndCFLAGS if loc and DoCalls]) |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
964 |
plc_main = runtime.code("plc_common_main") % { |
57 | 965 |
"calls_prototypes":"\n".join( |
966 |
["int __init_%(s)s(int argc,char **argv);\nvoid __cleanup_%(s)s();\nvoid __retrive_%(s)s();\nvoid __publish_%(s)s();"% |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
967 |
{'s':locstr} for locstr in locstrs]), |
57 | 968 |
"retrive_calls":" \n".join(["__retrive_%(s)s();"%{'s':locstr} for locstr in locstrs]), |
969 |
"publish_calls":" \n".join(["__publish_%(s)s();"%{'s':locstr} for locstr in locstrs]), |
|
970 |
"init_calls":" \n".join(["init_level++; if(res = __init_%(s)s(argc,argv)) return res;"%{'s':locstr} for locstr in locstrs]), |
|
971 |
"cleanup_calls":" \n".join(["if(init_level-- > 0) __cleanup_%(s)s();"%{'s':locstr} for locstr in locstrs])} |
|
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
972 |
target_name = self.BeremizRoot.TargetType.content["name"] |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
973 |
plc_main += runtime.code("plc_%s_main"%target_name) |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
974 |
|
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
975 |
main_path = os.path.join(buildpath, "main.c" ) |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
976 |
f = open(main_path,'w') |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
977 |
f.write(plc_main) |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
978 |
f.close() |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
979 |
# First element is necessarely root |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
980 |
LocationCFilesAndCFLAGS[0][1].insert(0,(main_path, self.CFLAGS)) |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
981 |
|
20 | 982 |
# Compile the resulting code into object files. |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
983 |
compiler = self.BeremizRoot.getCompiler() |
75 | 984 |
_CFLAGS = self.BeremizRoot.getCFLAGS() |
985 |
linker = self.BeremizRoot.getLinker() |
|
986 |
_LDFLAGS = self.BeremizRoot.getLDFLAGS() |
|
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
987 |
obns = [] |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
988 |
objs = [] |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
989 |
for Location, CFilesAndCFLAGS, DoCalls in LocationCFilesAndCFLAGS: |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
990 |
if Location: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
991 |
logger.write("Plugin : " + self.GetChildByIECLocation(Location).GetCurrentName() + " " + str(Location)+"\n") |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
992 |
else: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
993 |
logger.write("PLC :\n") |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
994 |
|
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
995 |
for CFile, CFLAGS in CFilesAndCFLAGS: |
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
996 |
bn = os.path.basename(CFile) |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
997 |
obn = os.path.splitext(bn)[0]+".o" |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
998 |
obns.append(obn) |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
999 |
logger.write(" [CC] "+bn+" -> "+obn+"\n") |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1000 |
objectfilename = os.path.splitext(CFile)[0]+".o" |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1001 |
|
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1002 |
status, result, err_result = ProcessLogger( |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1003 |
logger, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1004 |
"\"%s\" -c \"%s\" -o \"%s\" %s %s"% |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1005 |
(compiler, CFile, objectfilename, _CFLAGS, CFLAGS) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1006 |
).spin() |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1007 |
|
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1008 |
if status != 0: |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1009 |
logger.write_error("Build failed\n") |
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1010 |
return False |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1011 |
objs.append(objectfilename) |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1012 |
# Link all the object files into one executable |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1013 |
logger.write("Linking :\n") |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1014 |
exe = self.GetProjectName() |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1015 |
if target_name == "Win32": |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1016 |
exe += ".exe" |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1017 |
exe_path = os.path.join(buildpath, exe) |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1018 |
logger.write(" [CC] " + ' '.join(obns)+" -> " + exe + "\n") |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1019 |
status, result, err_result = ProcessLogger( |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1020 |
logger, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1021 |
"\"%s\" \"%s\" -o \"%s\" %s"% |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1022 |
(linker, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1023 |
'" "'.join(objs), |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1024 |
exe_path, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1025 |
' '.join(LDFLAGS+[_LDFLAGS])) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1026 |
).spin() |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1027 |
if status != 0: |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1028 |
logger.write_error("Build failed\n") |
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
|
1029 |
self.EnableMethod("_Run", False) |
51
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1030 |
return False |
c31c55601556
Added project linking, and plugin init,cleanup,retrive and publish method calls in main
etisserant
parents:
49
diff
changeset
|
1031 |
|
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
|
1032 |
self.EnableMethod("_Run", True) |
49
45dc6a944ab6
On the long wat towards generated code comilation...
etisserant
parents:
47
diff
changeset
|
1033 |
return True |
47
fd45c291fed0
PLC and plugins compilation with gcc now starts (and fail).
etisserant
parents:
41
diff
changeset
|
1034 |
|
20 | 1035 |
|
1036 |
def _showIECcode(self, logger): |
|
1037 |
plc_file = self._getIECcodepath() |
|
1038 |
new_dialog = wx.Frame(None) |
|
74 | 1039 |
ST_viewer = TextViewer(new_dialog, "", None, None) |
20 | 1040 |
#ST_viewer.Enable(False) |
1041 |
ST_viewer.SetKeywords(IEC_KEYWORDS) |
|
1042 |
try: |
|
1043 |
text = file(plc_file).read() |
|
1044 |
except: |
|
1045 |
text = '(* No IEC code have been generated at that time ! *)' |
|
65 | 1046 |
ST_viewer.SetText(text = text) |
1047 |
||
1048 |
new_dialog.Show() |
|
1049 |
||
1050 |
def _editIECrawcode(self, logger): |
|
1051 |
new_dialog = wx.Frame(None) |
|
66 | 1052 |
|
1053 |
buildpath = self._getBuildPath() |
|
1054 |
# Eventually create build dir |
|
1055 |
if not os.path.exists(buildpath): |
|
1056 |
os.mkdir(buildpath) |
|
1057 |
||
65 | 1058 |
controler = MiniTextControler(self._getIECrawcodepath()) |
74 | 1059 |
ST_viewer = TextViewer(new_dialog, "", None, controler) |
65 | 1060 |
#ST_viewer.Enable(False) |
1061 |
ST_viewer.SetKeywords(IEC_KEYWORDS) |
|
1062 |
ST_viewer.RefreshView() |
|
20 | 1063 |
|
1064 |
new_dialog.Show() |
|
1065 |
||
1066 |
def _EditPLC(self, logger): |
|
62
ddf0cdd71558
Adding support for refresh block list where beremiz loose focus
lbessard
parents:
57
diff
changeset
|
1067 |
if self.PLCEditor is None: |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
1068 |
self.RefreshPluginsBlockLists() |
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1069 |
def _onclose(): |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1070 |
self.PLCEditor = None |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1071 |
def _onsave(): |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1072 |
self.SaveProject() |
41
1608a434fb8c
Adding support for refreshing PLCOpenEditor block list
lbessard
parents:
40
diff
changeset
|
1073 |
self.PLCEditor = PLCOpenEditor(self.AppFrame, self) |
20 | 1074 |
self.PLCEditor.RefreshProjectTree() |
1075 |
self.PLCEditor.RefreshFileMenu() |
|
1076 |
self.PLCEditor.RefreshEditMenu() |
|
1077 |
self.PLCEditor.RefreshToolBar() |
|
25
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1078 |
self.PLCEditor._onclose = _onclose |
fa7503684c28
Adding support for using Networkedit et PLCOpenEditor in Beremiz
lbessard
parents:
24
diff
changeset
|
1079 |
self.PLCEditor._onsave = _onsave |
20 | 1080 |
self.PLCEditor.Show() |
1081 |
||
22 | 1082 |
def _Clean(self, logger): |
108 | 1083 |
if os.path.isdir(os.path.join(self._getBuildPath())): |
1084 |
logger.write("Cleaning the build directory\n") |
|
1085 |
shutil.rmtree(os.path.join(self._getBuildPath())) |
|
1086 |
else: |
|
1087 |
logger.write_error("Build directory already clean\n") |
|
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1088 |
self.EnableMethod("_showIECcode", False) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1089 |
self.EnableMethod("_Clean", False) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1090 |
self.EnableMethod("_Run", False) |
22 | 1091 |
|
1092 |
def _Run(self, logger): |
|
107 | 1093 |
command_start_plc = os.path.join(self._getBuildPath(),self.GetProjectName() + exe_ext) |
1094 |
if os.path.isfile(command_start_plc): |
|
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1095 |
logger.write("Starting PLC\n") |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1096 |
def this_plc_finish_callback(*args): |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1097 |
if self.runningPLC is not None: |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1098 |
self.runningPLC = None |
113 | 1099 |
self.reset_finished() |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1100 |
self.runningPLC = ProcessLogger( |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1101 |
logger, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1102 |
command_start_plc, |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1103 |
finish_callback = this_plc_finish_callback) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1104 |
self.EnableMethod("_Clean", False) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1105 |
self.EnableMethod("_Run", False) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1106 |
self.EnableMethod("_Stop", True) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1107 |
self.EnableMethod("_build", False) |
107 | 1108 |
else: |
108 | 1109 |
logger.write_error("%s doesn't exist\n" %command_start_plc) |
22 | 1110 |
|
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1111 |
def reset_finished(self): |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1112 |
self.EnableMethod("_Clean", True) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1113 |
self.EnableMethod("_Run", True) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1114 |
self.EnableMethod("_Stop", False) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1115 |
self.EnableMethod("_build", True) |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1116 |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1117 |
def _Stop(self, logger): |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1118 |
if self.runningPLC is not None: |
107 | 1119 |
logger.write("Stopping PLC\n") |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1120 |
was_runningPLC = self.runningPLC |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1121 |
self.runningPLC = None |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1122 |
was_runningPLC.kill() |
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1123 |
self.reset_finished() |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1124 |
|
65 | 1125 |
PluginMethods = [ |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
1126 |
{"bitmap" : os.path.join("images", "editPLC"), |
65 | 1127 |
"name" : "Edit PLC", |
1128 |
"tooltip" : "Edit PLC program with PLCOpenEditor", |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1129 |
"method" : "_EditPLC"}, |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
1130 |
{"bitmap" : os.path.join("images", "Build"), |
65 | 1131 |
"name" : "Build", |
1132 |
"tooltip" : "Build project into build folder", |
|
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1133 |
"method" : "_build"}, |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
1134 |
{"bitmap" : os.path.join("images", "Clean"), |
65 | 1135 |
"name" : "Clean", |
1136 |
"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
|
1137 |
"method" : "_Clean"}, |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
1138 |
{"bitmap" : os.path.join("images", "Run"), |
65 | 1139 |
"name" : "Run", |
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
|
1140 |
"enabled" : False, |
65 | 1141 |
"tooltip" : "Run PLC from build folder", |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1142 |
"method" : "_Run"}, |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1143 |
{"bitmap" : os.path.join("images", "Stop"), |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1144 |
"name" : "Stop", |
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
|
1145 |
"enabled" : False, |
105
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1146 |
"tooltip" : "Stop Running PLC", |
434aed8dc58d
Added ability to override plugin methods with arbitrary python code (methods.py) when loading plugins
etisserant
parents:
97
diff
changeset
|
1147 |
"method" : "_Stop"}, |
82
d7b4dd1f543f
Beremiz layout improved for wx2.8 by inserting all control in TreeCtrl
lbessard
parents:
81
diff
changeset
|
1148 |
{"bitmap" : os.path.join("images", "ShowIECcode"), |
65 | 1149 |
"name" : "Show IEC code", |
110
a05e8b30c024
Fixed way apps are launched in parralel with single log window... Tested in win32 only.
etisserant
parents:
109
diff
changeset
|
1150 |
"enabled" : False, |
65 | 1151 |
"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
|
1152 |
"method" : "_showIECcode"}, |
74 | 1153 |
{"name" : "Edit raw IEC code", |
1154 |
"tooltip" : "Edit raw IEC code added to 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
|
1155 |
"method" : "_editIECrawcode"} |
65 | 1156 |
] |