PLCControler.py
changeset 1337 204ef2daa33c
parent 1331 38c5de794e62
child 1338 c1e6c712cc35
equal deleted inserted replaced
1336:1054cb01b523 1337:204ef2daa33c
  2218             exclude = {}
  2218             exclude = {}
  2219             for instance in instances:
  2219             for instance in instances:
  2220                 element.addinstance(instance)
  2220                 element.addinstance(instance)
  2221                 instance_type = instance.getLocalTag()
  2221                 instance_type = instance.getLocalTag()
  2222                 if instance_type == "block":
  2222                 if instance_type == "block":
       
  2223                     blocktype = instance.gettypeName()
       
  2224                     blocktype_infos = self.GetBlockType(blocktype)
  2223                     blockname = instance.getinstanceName()
  2225                     blockname = instance.getinstanceName()
  2224                     if blockname is not None:
  2226                     if blocktype_infos["type"] != "function" and blockname is not None:
  2225                         blocktype = instance.gettypeName()
       
  2226                         if element_type == "function":
  2227                         if element_type == "function":
  2227                             return _("FunctionBlock \"%s\" can't be pasted in a Function!!!")%blocktype
  2228                             return _("FunctionBlock \"%s\" can't be pasted in a Function!!!")%blocktype
  2228                         blockname = self.GenerateNewName(tagname, 
  2229                         blockname = self.GenerateNewName(tagname, 
  2229                                                          blockname, 
  2230                                                          blockname, 
  2230                                                          "%s%%d"%blocktype, 
  2231                                                          "%s%%d"%blocktype, 
  2446                     self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
  2447                     self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
  2447             elif new_name != old_name:
  2448             elif new_name != old_name:
  2448                 self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
  2449                 self.ChangeEditedElementPouVar(tagname, old_type, old_name, new_type, new_name)
  2449             for param, value in infos.items():
  2450             for param, value in infos.items():
  2450                 if param == "name":
  2451                 if param == "name":
  2451                     block.setinstanceName(value)
  2452                     if value != "":
       
  2453                         block.setinstanceName(value)
       
  2454                     else:
       
  2455                         block.attrib.pop("instanceName", None)
  2452                 elif param == "type":
  2456                 elif param == "type":
  2453                     block.settypeName(value)
  2457                     block.settypeName(value)
  2454                 elif param == "executionOrder" and block.getexecutionOrderId() != value:
  2458                 elif param == "executionOrder" and block.getexecutionOrderId() != value:
  2455                     element.setelementExecutionOrder(block, value)
  2459                     element.setelementExecutionOrder(block, value)
  2456                 elif param == "height":
  2460                 elif param == "height":