plcopeneditor_history: comparison plcopen/plcopen.py

equal deleted inserted replaced

-:020420ad8914
+:07447ee3538e
 setattr(cls, "getconfiguration", getconfiguration)
 def addconfiguration(self, name):
 for configuration in self.instances.configurations.getconfiguration():
 if configuration.getname() == name:
-raise ValueError, "\"%s\" configuration already exists !!!"%name
+raise ValueError, _("\"%s\" configuration already exists !!!")%name
 new_configuration = PLCOpenClasses["configurations_configuration"]()
 new_configuration.setname(name)
 self.instances.configurations.appendconfiguration(new_configuration)
 setattr(cls, "addconfiguration", addconfiguration)
 if configuration.getname() == name:
 self.instances.configurations.removeconfiguration(idx)
 found = True
 break
 if not found:
-raise ValueError, "\"%s\" configuration doesn't exist !!!"%name
+raise ValueError, ("\"%s\" configuration doesn't exist !!!")%name
 setattr(cls, "removeconfiguration", removeconfiguration)
 def getconfigurationResource(self, config_name, name):
 configuration = self.getconfiguration(config_name)
 if configuration:
 def addconfigurationResource(self, config_name, name):
 configuration = self.getconfiguration(config_name)
 if configuration:
 for resource in configuration.getresource():
 if resource.getname() == name:
-raise ValueError, "\"%s\" resource already exists in \"%s\" configuration !!!"%(name, config_name)
+raise ValueError, _("\"%s\" resource already exists in \"%s\" configuration !!!")%(name, config_name)
 new_resource = PLCOpenClasses["configuration_resource"]()
 new_resource.setname(name)
 configuration.appendresource(new_resource)
 setattr(cls, "addconfigurationResource", addconfigurationResource)
 if resource.getname() == name:
 configuration.removeresource(idx)
 found = True
 break
 if not found:
-raise ValueError, "\"%s\" resource doesn't exist in \"%s\" configuration !!!"%(name, config_name)
+raise ValueError, _("\"%s\" resource doesn't exist in \"%s\" configuration !!!")%(name, config_name)
 setattr(cls, "removeconfigurationResource", removeconfigurationResource)
 def updateElementName(self, old_name, new_name):
 for datatype in self.types.getdataTypeElements():
 datatype_content = datatype.baseType.getcontent()
 if element.getname() == name:
 self.dataTypes.removedataType(idx)
 found = True
 break
 if not found:
-raise ValueError, "\"%s\" Data Type doesn't exist !!!"%name
+raise ValueError, _("\"%s\" Data Type doesn't exist !!!")%name
 setattr(cls, "removedataTypeElement", removedataTypeElement)
 def getpouElements(self):
 return self.pous.getpou()
 setattr(cls, "getpouElements", getpouElements)
 setattr(cls, "getpouElement", getpouElement)
 def appendpouElement(self, name, pou_type, body_type):
 for element in self.pous.getpou():
 if element.getname() == name:
-raise ValueError, "\"%s\" POU already exists !!!"%name
+raise ValueError, _("\"%s\" POU already exists !!!")%name
 new_pou = PLCOpenClasses["pous_pou"]()
 new_pou.setname(name)
 new_pou.setpouType(pou_type)
 new_pou.appendbody(PLCOpenClasses["body"]())
 new_pou.setbodyType(body_type)
 if element.getname() == name:
 self.pous.removepou(idx)
 found = True
 break
 if not found:
-raise ValueError, "\"%s\" POU doesn't exist !!!"%name
+raise ValueError, _("\"%s\" POU doesn't exist !!!")%name
 setattr(cls, "removepouElement", removepouElement)
 cls = PLCOpenClasses.get("pous_pou", None)
 if cls:
 if transitions[i].getname() == name:
 transitions.pop(i)
 removed = True
 i += 1
 if not removed:
-raise ValueError, "Transition with name %s doesn't exists!"%name
+raise ValueError, _("Transition with name %s doesn't exists!")%name
 setattr(cls, "removetransition", removetransition)
 def addaction(self, name, type):
 if not self.actions:
 self.addactions()
 if actions[i].getname() == name:
 actions.pop(i)
 removed = True
 i += 1
 if not removed:
-raise ValueError, "Action with name %s doesn't exists!"%name
+raise ValueError, _("Action with name %s doesn't exists!")%name
 setattr(cls, "removeaction", removeaction)
 def updateElementName(self, old_name, new_name):
 if self.interface:
 for content in self.interface.getcontent():
 if not isinstance(element["value"], (PLCOpenClasses.get("commonObjects_comment", None),
 PLCOpenClasses.get("commonObjects_connector", None),
 PLCOpenClasses.get("commonObjects_continuation", None))):
 element["value"].setexecutionOrderId(0)
 else:
-raise TypeError, "Can only generate execution order on FBD networks!"
+raise TypeError, _("Can only generate execution order on FBD networks!")
 setattr(cls, "resetexecutionOrder", resetexecutionOrder)
 def compileexecutionOrder(self):
 if self.content["name"] == "FBD":
 self.resetexecutionOrder()
 connections = element["value"].connectionPointIn.getconnections()
 if connections and len(connections) == 1:
 self.compileelementExecutionOrder(connections[0])
 element["value"].setexecutionOrderId(self.getnewExecutionOrderId())
 else:
-raise TypeError, "Can only generate execution order on FBD networks!"
+raise TypeError, _("Can only generate execution order on FBD networks!")
 setattr(cls, "compileexecutionOrder", compileexecutionOrder)
 def compileelementExecutionOrder(self, link):
 if self.content["name"] == "FBD":
 localid = link.getrefLocalId()
 if isinstance(tmp_instance, PLCOpenClasses.get("commonObjects_connector", None)) and tmp_instance.getname() == name and tmp_instance.getexecutionOrderId() == 0:
 connections = tmp_instance.connectionPointIn.getconnections()
 if connections and len(connections) == 1:
 self.compileelementExecutionOrder(connections[0])
 else:
-raise TypeError, "Can only generate execution order on FBD networks!"
+raise TypeError, _("Can only generate execution order on FBD networks!")
 setattr(cls, "compileelementExecutionOrder", compileelementExecutionOrder)
 def setelementExecutionOrder(self, instance, new_executionOrder):
 if self.content["name"] == "FBD":
 old_executionOrder = instance.getexecutionOrderId()
 element["value"].setexecutionOrderId(element_executionOrder - 1)
 if new_executionOrder <= element_executionOrder <= old_executionOrder:
 element["value"].setexecutionOrderId(element_executionOrder + 1)
 instance.setexecutionOrderId(new_executionOrder)
 else:
-raise TypeError, "Can only generate execution order on FBD networks!"
+raise TypeError, _("Can only generate execution order on FBD networks!")
 setattr(cls, "setelementExecutionOrder", setelementExecutionOrder)
 def appendcontentInstance(self, name, instance):
 if self.content["name"] in ["LD","FBD","SFC"]:
 self.content["value"].appendcontent({"name" : name, "value" : instance})
 else:
-raise TypeError, "%s body don't have instances!"%self.content["name"]
+raise TypeError, _("%s body don't have instances!")%self.content["name"]
 setattr(cls, "appendcontentInstance", appendcontentInstance)
 def getcontentInstances(self):
 if self.content["name"] in ["LD","FBD","SFC"]:
 instances = []
 for element in self.content["value"].getcontent():
 instances.append(element["value"])
 return instances
 else:
-raise TypeError, "%s body don't have instances!"%self.content["name"]
+raise TypeError, _("%s body don't have instances!")%self.content["name"]
 setattr(cls, "getcontentInstances", getcontentInstances)
 def getcontentInstance(self, id):
 if self.content["name"] in ["LD","FBD","SFC"]:
 for element in self.content["value"].getcontent():
 if element["value"].getlocalId() == id:
 return element["value"]
 return None
 else:
-raise TypeError, "%s body don't have instances!"%self.content["name"]
+raise TypeError, _("%s body don't have instances!")%self.content["name"]
 setattr(cls, "getcontentInstance", getcontentInstance)
 def getcontentRandomInstance(self, exclude):
 if self.content["name"] in ["LD","FBD","SFC"]:
 for element in self.content["value"].getcontent():
 if element["value"].getlocalId() not in exclude:
 return element["value"]
 return None
 else:
-raise TypeError, "%s body don't have instances!"%self.content["name"]
+raise TypeError, _("%s body don't have instances!")%self.content["name"]
 setattr(cls, "getcontentRandomInstance", getcontentRandomInstance)
 def getcontentInstanceByName(self, name):
 if self.content["name"] in ["LD","FBD","SFC"]:
 for element in self.content["value"].getcontent():
 if isinstance(element["value"], PLCOpenClasses.get("fbdObjects_block", None)) and element["value"].getinstanceName() == name:
 return element["value"]
 else:
-raise TypeError, "%s body don't have instances!"%self.content["name"]
+raise TypeError, _("%s body don't have instances!")%self.content["name"]
 setattr(cls, "getcontentInstanceByName", getcontentInstanceByName)
 def removecontentInstance(self, id):
 if self.content["name"] in ["LD","FBD","SFC"]:
 i = 0
 if elements[i]["value"].getlocalId() == id:
 self.content["value"].removecontent(i)
 removed = True
 i += 1
 if not removed:
-raise ValueError, "Instance with id %d doesn't exists!"%id
+raise ValueError, _("Instance with id %d doesn't exists!")%id
 else:
 raise TypeError, "%s body don't have instances!"%self.content["name"]
 setattr(cls, "removecontentInstance", removecontentInstance)
 def settext(self, text):
 if self.content["name"] in ["IL","ST"]:
 self.content["value"].settext(text)
 else:
-raise TypeError, "%s body don't have text!"%self.content["name"]
+raise TypeError, _("%s body don't have text!")%self.content["name"]
 setattr(cls, "settext", settext)
 def gettext(self):
 if self.content["name"] in ["IL","ST"]:
 return self.content["value"].gettext()
 else:
-raise TypeError, "%s body don't have text!"%self.content["name"]
+raise TypeError, _("%s body don't have text!")%self.content["name"]
 setattr(cls, "gettext", gettext)
 def updateElementName(self, old_name, new_name):
 if self.content["name"] in ["IL", "ST"]:
 self.content["value"].updateElementName(old_name, new_name)
 if opened > closed:
 items[i - 1] = ','.join([items[i - 1], items.pop(i)])
 elif opened == closed:
 i += 1
 else:
-raise ValueError, "\"%s\" is an invalid value!"%value
+raise ValueError, _("\"%s\" is an invalid value!")%value
 return items
 cls = PLCOpenClasses.get("value_arrayValue", None)
 if cls:
 arrayValue_model = re.compile("([0-9]*)\((.*)\)$")

changeset 391	07447ee3538e
parent 389	6a72016d721a
child 394	2e9fc0ad6095