diff -r eecc53781498 -r fd1f6ae26d4f PLCControler.py --- a/PLCControler.py Mon Jan 19 17:07:03 2009 +0100 +++ b/PLCControler.py Mon Jan 19 17:08:17 2009 +0100 @@ -499,9 +499,11 @@ return False def GenerateProgram(self, filepath=None): + errors = [] + warnings = [] if self.Project is not None: try: - self.ProgramChunks = GenerateCurrentProgram(self, self.Project) + self.ProgramChunks = GenerateCurrentProgram(self, self.Project, errors, warnings) self.NextCompiledProject = self.Copy(self.Project) program_text = "".join([item[0] for item in self.ProgramChunks]) if filepath is not None: @@ -509,12 +511,12 @@ programfile.write(program_text) programfile.close() self.ProgramFilePath = filepath - return None - else: - return program_text + return program_text, errors, warnings except PLCGenException, e: - return e.message - return "No project opened" + errors.append(e.message) + else: + errors.append("No project opened") + return "", errors, warnings def ProgramTransferred(self): self.CurrentCompiledProject = self.NextCompiledProject