Mercurial Mercurial > beremiz / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
c_ext/CFileEditor.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Thu, 28 Apr 2016 13:05:57 +0300
changeset 1507 d7f474d10210
parent 1138 cf2a6a7c87e8
child 1511 91538d0c242c
permissions -rw-r--r--
fix issue with sometimes wrong return code of ProcessLogger


As a result of wrong return code Beremiz gives folowing traceback:
Traceback (most recent call last):
File "./Beremiz.py", line 850, in OnMenu
getattr(self.CTR, method)()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 925, in _Build
IECGenRes = self._Generate_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 568, in _Generate_SoftPLC
return self._Compile_ST_to_SoftPLC()
File "/home/developer/WorkData/PLC/beremiz/beremiz/ProjectController.py", line 661, in _Compile_ST_to_SoftPLC
C_files.remove("POUS.c")
ValueError: list.remove(x): x not in list

The problem is that both threads (for reading stdout and stderr) call self.Proc.poll(),
that updates internal returncode field. This call is done without any locking and the first thread gets correct result,
but other gets 0 as retval. If 0 gets thread, that afterwards calls callback finish, then wrong return code is returned
to the parent. Now only the thread with a callback polls for the return code, other thread just checked local value.

Additionally function spin() waits now until all threads finish reading their pipes, so the results are always correct.
145
94855f7b08a9 Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file
lbessard
parents:
diff changeset 
     1
 







630






91b2ae63ea3d
Including external tools for editing plugin informations into Beremiz window



laurent


parents: 
626

diff
changeset




     2


import wx.stc as stc













91b2ae63ea3d
Including external tools for editing plugin informations into Beremiz window



laurent


parents: 
626

diff
changeset




     3









1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




     4


from controls.CustomStyledTextCtrl import faces













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




     5


from editors.CodeFileEditor import CodeFileEditor, CodeEditor








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




     6









1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




     7


class CppEditor(CodeEditor):








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




     8









1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




     9


    KEYWORDS = ["asm", "auto", "bool", "break", "case", "catch", "char", "class", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    10


        "const", "const_cast", "continue", "default", "delete", "do", "double", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    11


        "dynamic_cast", "else", "enum", "explicit", "export", "extern", "false", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    12


        "float", "for", "friend", "goto", "if", "inline", "int", "long", "mutable", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    13


        "namespace", "new", "operator", "private", "protected", "public", "register", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    14


        "reinterpret_cast", "return", "short", "signed", "sizeof", "static", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    15


        "static_cast", "struct", "switch", "template", "this", "throw", "true", "try",













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    16


        "typedef", "typeid", "typename", "union", "unsigned", "using", "virtual", 













c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    17


        "void", "volatile", "wchar_t", "while"]








1110






b6e252733c64
Fixed code section headers in CodeFileEditor



Laurent Bessard


parents: 
1097

diff
changeset




    18


    COMMENT_HEADER = "/"








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    19


    








1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    20


    def SetCodeLexer(self):








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    21


        self.SetLexer(stc.STC_LEX_CPP)













94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    22


        








1060






ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    23


        self.StyleSetSpec(stc.STC_C_COMMENT, 'fore:#408060,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    24


        self.StyleSetSpec(stc.STC_C_COMMENTLINE, 'fore:#408060,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    25


        self.StyleSetSpec(stc.STC_C_COMMENTDOC, 'fore:#408060,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    26


        self.StyleSetSpec(stc.STC_C_NUMBER, 'fore:#0076AE,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    27


        self.StyleSetSpec(stc.STC_C_WORD, 'bold,fore:#800056,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    28


        self.StyleSetSpec(stc.STC_C_STRING, 'fore:#2a00ff,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    29


        self.StyleSetSpec(stc.STC_C_PREPROCESSOR, 'bold,fore:#800056,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    30


        self.StyleSetSpec(stc.STC_C_OPERATOR, 'bold,size:%(size)d' % faces)













ac9896336b90
Fixed unexpected scrolling when PythonEditor, TextViewer and CFileEditor get focus



Laurent Bessard


parents: 
920

diff
changeset




    31


        self.StyleSetSpec(stc.STC_C_STRINGEOL, 'back:#FFD5FF,size:%(size)d' % faces)








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    32














94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    33


#-------------------------------------------------------------------------------








1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    34


#                          CFileEditor Main Frame Class








145






94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    35


#-------------------------------------------------------------------------------













94855f7b08a9
Improving c_ext plugin by adding an XML file format for saving C files and an graphical interface for editing this file



lbessard


parents: 

diff
changeset




    36









1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    37


class CFileEditor(CodeFileEditor):








651






cbeb769b0a56
Adding support for unifying grid table control elements



laurent


parents: 
637

diff
changeset




    38


    








1138






cf2a6a7c87e8
Replaced the 2 tabs variable and code in CodeFileEditor by only one type with SplitterWindow and fixed drag'n drop of variable from variable to code.



Laurent Bessard


parents: 
1110

diff
changeset




    39


    CONFNODEEDITOR_TABS = [













cf2a6a7c87e8
Replaced the 2 tabs variable and code in CodeFileEditor by only one type with SplitterWindow and fixed drag'n drop of variable from variable to code.



Laurent Bessard


parents: 
1110

diff
changeset




    40


        (_("C code"), "_create_CodePanel")]













cf2a6a7c87e8
Replaced the 2 tabs variable and code in CodeFileEditor by only one type with SplitterWindow and fixed drag'n drop of variable from variable to code.



Laurent Bessard


parents: 
1110

diff
changeset




    41


    CODE_EDITOR = CppEditor








1096






c9ace6a881c9
Fixed CFileEditor replacing folding panels by variable panel and STC



Laurent Bessard


parents: 
1091

diff
changeset




    42









1097






233681f2a00e
Fixed Python editor adding variable panel



Laurent Bessard


parents: 
1096

diff
changeset




    43









1138






cf2a6a7c87e8
Replaced the 2 tabs variable and code in CodeFileEditor by only one type with SplitterWindow and fixed drag'n drop of variable from variable to code.



Laurent Bessard


parents: 
1110

diff
changeset




    44














beremiz