equal
deleted
inserted
replaced
268 |
268 |
269 def ResourceTagName(self, context, *args): |
269 def ResourceTagName(self, context, *args): |
270 self.TagName = self.Controller.ComputeConfigurationResourceName(args[0][0], args[1][0]) |
270 self.TagName = self.Controller.ComputeConfigurationResourceName(args[0][0], args[1][0]) |
271 |
271 |
272 def PouTagName(self, context, *args): |
272 def PouTagName(self, context, *args): |
273 #print "PouTagName", etree.tostring(args[0][0]) |
|
274 self.TagName = self.Controller.ComputePouName(args[0][0]) |
273 self.TagName = self.Controller.ComputePouName(args[0][0]) |
275 |
274 |
276 def ActionTagName(self, context, *args): |
275 def ActionTagName(self, context, *args): |
277 self.TagName = self.Controller.ComputePouActionName(args[0][0], args[0][1]) |
276 self.TagName = self.Controller.ComputePouActionName(args[0][0], args[0][1]) |
278 |
277 |
1321 def GetVariableDictionary(self, object_with_vars, tree=False, debug=False): |
1320 def GetVariableDictionary(self, object_with_vars, tree=False, debug=False): |
1322 variables = [] |
1321 variables = [] |
1323 factory = VariablesInfosFactory(variables) |
1322 factory = VariablesInfosFactory(variables) |
1324 |
1323 |
1325 parser = etree.XMLParser() |
1324 parser = etree.XMLParser() |
1326 if tree: |
1325 parser.resolvers.add(LibraryResolver(self, debug)) |
1327 parser.resolvers.add(LibraryResolver(self, debug)) |
|
1328 |
1326 |
1329 variables_infos_xslt_tree = etree.XSLT( |
1327 variables_infos_xslt_tree = etree.XSLT( |
1330 etree.parse( |
1328 etree.parse( |
1331 os.path.join(ScriptDirectory, "plcopen", "variables_infos.xslt"), |
1329 os.path.join(ScriptDirectory, "plcopen", "variables_infos.xslt"), |
1332 parser), |
1330 parser), |