diff -r f7df265edd54 -r d8425712acef LDViewer.py --- a/LDViewer.py Fri Sep 05 18:12:23 2008 +0200 +++ b/LDViewer.py Fri Sep 05 18:13:18 2008 +0200 @@ -166,8 +166,8 @@ class LD_Viewer(Viewer): - def __init__(self, parent, tagname, window, controler): - Viewer.__init__(self, parent, tagname, window, controler) + def __init__(self, parent, tagname, window, controler, debug = False, instancepath = ""): + Viewer.__init__(self, parent, tagname, window, controler, debug, instancepath) self.Rungs = [] self.RungComments = [] self.CurrentLanguage = "LD" @@ -176,6 +176,11 @@ # Refresh functions #------------------------------------------------------------------------------- + def ResetView(self): + self.Rungs = [] + self.RungComments = [] + Viewer.ResetView(self) + def RefreshView(self): Viewer.RefreshView(self) for i, rung in enumerate(self.Rungs): @@ -450,12 +455,12 @@ dialog = LDElementDialog(self.ParentWindow, "coil") dialog.SetPreviewFont(self.GetFont()) varlist = [] - vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) + vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) if vars: for var in vars: if var["Class"] != "Input" and var["Type"] == "BOOL": varlist.append(var["Name"]) - returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) + returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) if returntype == "BOOL": varlist.append(self.Controler.GetEditedElementName(self.TagName)) dialog.SetVariables(varlist) @@ -540,7 +545,7 @@ dialog = LDElementDialog(self.ParentWindow, "contact") dialog.SetPreviewFont(self.GetFont()) varlist = [] - vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) + vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) if vars: for var in vars: if var["Class"] != "Output" and var["Type"] == "BOOL": @@ -762,12 +767,12 @@ dialog = LDElementDialog(self.ParentWindow, "coil") dialog.SetPreviewFont(self.GetFont()) varlist = [] - vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) + vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) if vars: for var in vars: if var["Class"] != "Input" and var["Type"] == "BOOL": varlist.append(var["Name"]) - returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) + returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) if returntype == "BOOL": varlist.append(self.Controler.GetEditedElementName(self.TagName)) dialog.SetVariables(varlist) @@ -1184,7 +1189,7 @@ dialog = LDElementDialog(self.ParentWindow, "contact") dialog.SetPreviewFont(self.GetFont()) varlist = [] - vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) + vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) if vars: for var in vars: if var["Class"] != "Output" and var["Type"] == "BOOL": @@ -1208,12 +1213,12 @@ dialog = LDElementDialog(self.ParentWindow, "coil") dialog.SetPreviewFont(self.GetFont()) varlist = [] - vars = self.Controler.GetEditedElementInterfaceVars(self.TagName) + vars = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug) if vars: for var in vars: if var["Class"] != "Input" and var["Type"] == "BOOL": varlist.append(var["Name"]) - returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName) + returntype = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug) if returntype == "BOOL": varlist.append(self.Controler.GetEditedElementName(self.TagName)) dialog.SetVariables(varlist)