diff -r e9d01d824086 -r 93bc4c2cf376 LDViewer.py --- a/LDViewer.py Thu Feb 01 18:09:34 2007 +0100 +++ b/LDViewer.py Wed Feb 07 18:43:32 2007 +0100 @@ -977,7 +977,7 @@ vars = self.Controler.GetCurrentElementEditingInterfaceVars() if vars: for var in vars: - if var["Type"] != "Output" and var["Value"] == "BOOL": + if var["Class"] != "Output" and var["Type"] == "BOOL": varlist.append(var["Name"]) dialog.SetVariables(varlist) dialog.SetValues({"name":contact.GetName(),"type":contact.GetType()}) @@ -995,7 +995,7 @@ vars = self.Controler.GetCurrentElementEditingInterfaceVars() if vars: for var in vars: - if var["Type"] != "Input" and var["Value"] == "BOOL": + if var["Class"] != "Input" and var["Type"] == "BOOL": varlist.append(var["Name"]) returntype = self.Controler.GetCurrentElementEditingInterfaceReturnType() if returntype == "BOOL": @@ -1097,10 +1097,10 @@ def __init__(self, parent, type): self.Type = type if type == "contact": - self._init_ctrls(parent, "Edit Contact Values", ['Normal','Reverse','Rising Edge','Falling Edge']) + self._init_ctrls(parent, "Edit Contact Values", ['Normal','Negate','Rising Edge','Falling Edge']) self.Element = LD_Contact(self.Preview, CONTACT_NORMAL, "") elif type == "coil": - self._init_ctrls(parent, "Edit Coil Values", ['Normal','Reverse','Set','Reset']) + self._init_ctrls(parent, "Edit Coil Values", ['Normal','Negate','Set','Reset']) self.Element = LD_Coil(self.Preview, COIL_NORMAL, "") self.Element.SetPosition((150 - LD_ELEMENT_SIZE[0]) / 2, (150 - LD_ELEMENT_SIZE[1]) / 2)