--- a/c_ext/c_ext.py Wed May 08 21:37:31 2013 +0200
+++ b/c_ext/c_ext.py Wed May 08 22:52:55 2013 +0200
@@ -50,7 +50,6 @@
text += '#include "iec_types_all.h"'
- base_types = self.GetCTRoot().GetBaseTypes()
config = self.GetCTRoot().GetProjectConfigNames()[0]
text += "/* User variables reference */\n"
for variable in self.CodeFile.variables.variable:
--- a/editors/CodeFileEditor.py Wed May 08 21:37:31 2013 +0200
+++ b/editors/CodeFileEditor.py Wed May 08 22:52:55 2013 +0200
@@ -5,14 +5,23 @@
+from plcopen.plcopen import TestTextElement from controls import CustomGrid, CustomTable
from editors.ConfTreeNodeEditor import ConfTreeNodeEditor
from util.BitmapLibrary import GetBitmap
from controls.CustomStyledTextCtrl import CustomStyledTextCtrl, faces, GetCursorPos
+from graphics.GraphicCommons import ERROR_HIGHLIGHT, SEARCH_RESULT_HIGHLIGHT, REFRESH_HIGHLIGHT_PERIOD SECTIONS_NAMES = ["Includes", "Globals", "Init",
"CleanUp", "Retrieve", "Publish"]
+[STC_CODE_ERROR, STC_CODE_SEARCH_RESULT] = range(15, 17) + ERROR_HIGHLIGHT: STC_CODE_ERROR, + SEARCH_RESULT_HIGHLIGHT: STC_CODE_SEARCH_RESULT, class CodeEditor(CustomStyledTextCtrl):
@@ -71,6 +80,10 @@
self.StyleSetSpec(stc.STC_STYLE_BRACELIGHT, "fore:#FFFFFF,back:#0000FF,bold")
self.StyleSetSpec(stc.STC_STYLE_BRACEBAD, "fore:#000000,back:#FF0000,bold")
+ self.StyleSetSpec(STC_CODE_ERROR, 'fore:#FF0000,back:#FFFF00,size:%(size)d' % faces) + self.StyleSetSpec(STC_CODE_SEARCH_RESULT, 'fore:#FFFFFF,back:#FFA500,size:%(size)d' % faces) # register some images for use in the AutoComplete box.
#self.RegisterImage(1, images.getSmilesBitmap())
@@ -93,6 +106,14 @@
self.DisableEvents = True
self.CurrentAction = None
+ self.SearchParams = None + self.SearchResults = None + self.CurrentFindHighlight = None + self.RefreshHighlightsTimer = wx.Timer(self, -1) + self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer, self.RefreshHighlightsTimer) self.SectionsComments = {}
for section in SECTIONS_NAMES:
section_start_comment = "%s %s section\n" % (self.COMMENT_HEADER, section)
@@ -194,6 +215,8 @@
self.DisableEvents = False
return self.ParentWindow.GetPanelBestSize()
@@ -375,6 +398,91 @@
+ def Find(self, direction, search_params): + if self.SearchParams != search_params: + self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT) + self.SearchParams = search_params + "raw_pattern": search_params["find_pattern"], + "pattern": re.compile(search_params["find_pattern"]), + "case_sensitive": search_params["case_sensitive"], + "regular_expression": search_params["regular_expression"], + (start, end, SEARCH_RESULT_HIGHLIGHT) + for start, end, text in + TestTextElement(self.GetText(), criteria)] + self.CurrentFindHighlight = None + if len(self.SearchResults) > 0: + if self.CurrentFindHighlight is not None: + old_idx = self.SearchResults.index(self.CurrentFindHighlight) + if self.SearchParams["wrap"]: + idx = (old_idx + direction) % len(self.SearchResults) + idx = max(0, min(old_idx + direction, len(self.SearchResults) - 1)) + self.RemoveHighlight(*self.CurrentFindHighlight) + self.CurrentFindHighlight = self.SearchResults[idx] + self.AddHighlight(*self.CurrentFindHighlight) + self.CurrentFindHighlight = self.SearchResults[0] + self.AddHighlight(*self.CurrentFindHighlight) + if self.CurrentFindHighlight is not None: + self.RemoveHighlight(*self.CurrentFindHighlight) + self.CurrentFindHighlight = None +#------------------------------------------------------------------------------- +# Highlights showing functions +#------------------------------------------------------------------------------- + def OnRefreshHighlightsTimer(self, event): + def ClearHighlights(self, highlight_type=None): + if highlight_type is None: + highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) + if highlight_type is not None: + self.Highlights = [(start, end, highlight) for (start, end, highlight) in self.Highlights if highlight != highlight_type] + def AddHighlight(self, start, end, highlight_type): + highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) + if highlight_type is not None: + self.Highlights.append((start, end, highlight_type)) + self.GotoPos(self.PositionFromLine(start[0]) + start[1]) + self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) + def RemoveHighlight(self, start, end, highlight_type): + highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None) + if (highlight_type is not None and + (start, end, highlight_type) in self.Highlights): + self.Highlights.remove((start, end, highlight_type)) + self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True) + def ShowHighlights(self): + for start, end, highlight_type in self.Highlights: + highlight_start_pos = start[1] + highlight_start_pos = self.GetLineEndPosition(start[0] - 1) + start[1] + 1 + highlight_end_pos = end[1] - indent + 1 + highlight_end_pos = self.GetLineEndPosition(end[0] - 1) + end[1] + 2 + self.StartStyling(highlight_start_pos, 0xff) + self.SetStyling(highlight_end_pos - highlight_start_pos, highlight_type) + self.StartStyling(highlight_start_pos, 0x00) + self.SetStyling(len(self.GetText()) - highlight_end_pos, stc.STC_STYLE_DEFAULT) #-------------------------------------------------------------------------------
# Helper for VariablesGrid values
@@ -429,13 +537,7 @@
main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=4)
main_sizer.AddGrowableCol(0)
- main_sizer.AddGrowableRow(0)
- self.VariablesGrid = CustomGrid(self, size=wx.Size(-1, 300), style=wx.VSCROLL)
- self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnVariablesGridCellChange)
- self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnVariablesGridCellLeftClick)
- self.VariablesGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN, self.OnVariablesGridEditorShown)
- main_sizer.AddWindow(self.VariablesGrid, flag=wx.GROW)
+ main_sizer.AddGrowableRow(1) controls_sizer = wx.BoxSizer(wx.HORIZONTAL)
main_sizer.AddSizer(controls_sizer, border=5, flag=wx.TOP|wx.ALIGN_RIGHT)
@@ -449,7 +551,13 @@
size=wx.Size(28, 28), style=wx.NO_BORDER)
button.SetToolTipString(help)
setattr(self, name, button)
- controls_sizer.AddWindow(button, border=5, flag=wx.LEFT)
+ controls_sizer.AddWindow(button, border=5, flag=wx.RIGHT) + self.VariablesGrid = CustomGrid(self, size=wx.Size(-1, 300), style=wx.VSCROLL) + self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_CHANGE, self.OnVariablesGridCellChange) + self.VariablesGrid.Bind(wx.grid.EVT_GRID_CELL_LEFT_CLICK, self.OnVariablesGridCellLeftClick) + self.VariablesGrid.Bind(wx.grid.EVT_GRID_EDITOR_SHOWN, self.OnVariablesGridEditorShown) + main_sizer.AddWindow(self.VariablesGrid, flag=wx.GROW) self.SetSizer(main_sizer)
@@ -531,7 +639,7 @@
self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(base_type), id=new_id)
type_menu.AppendMenu(wx.NewId(), "Base Types", base_menu)
datatype_menu = wx.Menu(title='')
- for datatype in self.Controler.GetDataTypes(basetypes=False, only_locatables=True):
+ for datatype in self.Controler.GetDataTypes(): datatype_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=datatype)
self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(datatype), id=new_id)
--- a/py_ext/PythonEditor.py Wed May 08 21:37:31 2013 +0200
+++ b/py_ext/PythonEditor.py Wed May 08 22:52:55 2013 +0200
@@ -1,554 +1,70 @@
-from plcopen.plcopen import TestTextElement
-from graphics.GraphicCommons import ERROR_HIGHLIGHT, SEARCH_RESULT_HIGHLIGHT, REFRESH_HIGHLIGHT_PERIOD
-from editors.ConfTreeNodeEditor import ConfTreeNodeEditor
-from controls.CustomStyledTextCtrl import CustomStyledTextCtrl, faces, GetCursorPos
+from controls.CustomStyledTextCtrl import faces +from editors.CodeFileEditor import CodeFileEditor, CodeEditor +class PythonCodeEditor(CodeEditor): -[STC_PYTHON_ERROR, STC_PYTHON_SEARCH_RESULT] = range(15, 17)
+ KEYWORDS = keyword.kwlist + def SetCodeLexer(self): + self.SetLexer(stc.STC_LEX_PYTHON) + # Line numbers in margin + self.StyleSetSpec(stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_STYLE_BRACEBAD,'fore:#00009D,back:#FF0000,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_STYLE_INDENTGUIDE, 'fore:#CDCDCD,size:%(size)d' % faces)
- ERROR_HIGHLIGHT: STC_PYTHON_ERROR,
- SEARCH_RESULT_HIGHLIGHT: STC_PYTHON_SEARCH_RESULT,
+ self.StyleSetSpec(stc.STC_P_DEFAULT, 'fore:#000000,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_COMMENTLINE, 'fore:#008000,back:#F0FFF0,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_COMMENTBLOCK, 'fore:#008000,back:#F0FFF0,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_NUMBER, 'fore:#008080,size:%(size)d' % faces) + # Strings and characters + self.StyleSetSpec(stc.STC_P_STRING, 'fore:#800080,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_CHARACTER, 'fore:#800080,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_WORD, 'fore:#000080,bold,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_TRIPLE, 'fore:#800080,back:#FFFFEA,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_TRIPLEDOUBLE, 'fore:#800080,back:#FFFFEA,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_CLASSNAME, 'fore:#0000FF,bold,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_DEFNAME, 'fore:#008080,bold,size:%(size)d' % faces) + self.StyleSetSpec(stc.STC_P_OPERATOR, 'fore:#800000,bold,size:%(size)d' % faces) + # Identifiers. I leave this as not bold because everything seems + # to be an identifier if it doesn't match the above criterae + self.StyleSetSpec(stc.STC_P_IDENTIFIER, 'fore:#000000,size:%(size)d' % faces)
-] = [wx.NewId() for _init_ctrls in range(1)]
+#------------------------------------------------------------------------------- +# CFileEditor Main Frame Class +#------------------------------------------------------------------------------- -class PythonEditor(ConfTreeNodeEditor):
- CONFNODEEDITOR_TABS = [
+class PythonEditor(CodeFileEditor): + CONFNODEEDITOR_TABS = CodeFileEditor.CONFNODEEDITOR_TABS + [ (_("Python code"), "_create_PythonCodeEditor")]
def _create_PythonCodeEditor(self, prnt):
- self.PythonCodeEditor = CustomStyledTextCtrl(id=ID_PYTHONEDITOR, parent=prnt,
- name="TextViewer", pos=wx.DefaultPosition,
- size=wx.DefaultSize, style=0)
- self.PythonCodeEditor.ParentWindow = self
- self.PythonCodeEditor.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)
- self.PythonCodeEditor.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT)
- self.PythonCodeEditor.SetLexer(stc.STC_LEX_PYTHON)
- self.PythonCodeEditor.SetKeyWords(0, " ".join(keyword.kwlist))
- self.PythonCodeEditor.SetProperty("fold", "1")
- self.PythonCodeEditor.SetProperty("tab.timmy.whinge.level", "1")
- self.PythonCodeEditor.SetMargins(0,0)
- self.PythonCodeEditor.SetViewWhiteSpace(False)
- self.PythonCodeEditor.SetEdgeMode(stc.STC_EDGE_BACKGROUND)
- self.PythonCodeEditor.SetEdgeColumn(78)
- # Set up the numbers in the margin for margin #1
- self.PythonCodeEditor.SetMarginType(1, wx.stc.STC_MARGIN_NUMBER)
- # Reasonable value for, say, 4-5 digits using a mono font (40 pix)
- self.PythonCodeEditor.SetMarginWidth(1, 40)
- # Setup a margin to hold fold markers
- self.PythonCodeEditor.SetMarginType(2, stc.STC_MARGIN_SYMBOL)
- self.PythonCodeEditor.SetMarginMask(2, stc.STC_MASK_FOLDERS)
- self.PythonCodeEditor.SetMarginSensitive(2, True)
- self.PythonCodeEditor.SetMarginWidth(2, 12)
- if self.fold_symbols == 0:
- # Arrow pointing right for contracted folders, arrow pointing down for expanded
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_ARROWDOWN, "black", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_ARROW, "black", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "black", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "black", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black")
- elif self.fold_symbols == 1:
- # Plus for contracted folders, minus for expanded
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_MINUS, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_PLUS, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black")
- elif self.fold_symbols == 2:
- # Like a flattened tree control using circular headers and curved joins
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_CIRCLEMINUS, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_CIRCLEPLUS, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNERCURVE, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_CIRCLEPLUSCONNECTED, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_CIRCLEMINUSCONNECTED, "white", "#404040")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNERCURVE, "white", "#404040")
- elif self.fold_symbols == 3:
- # Like a flattened tree control using square headers
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_BOXMINUS, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_BOXPLUS, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNER, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_BOXPLUSCONNECTED, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_BOXMINUSCONNECTED, "white", "#808080")
- self.PythonCodeEditor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNER, "white", "#808080")
- self.PythonCodeEditor.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdateUI)
- self.PythonCodeEditor.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)
- self.PythonCodeEditor.Bind(wx.EVT_KEY_DOWN, self.OnKeyPressed)
- if wx.Platform == '__WXMSW__':
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Courier New')
- elif wx.Platform == '__WXMAC__':
- # TODO: if this looks fine on Linux too, remove the Mac-specific case
- # and use this whenever OS != MSW.
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Monaco')
- defsize = wx.SystemSettings.GetFont(wx.SYS_ANSI_FIXED_FONT).GetPointSize()
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Courier,size:%d'%defsize)
- # Clear styles and revert to default.
- self.PythonCodeEditor.StyleClearAll()
- # Following style specs only indicate differences from default.
- # The rest remains unchanged.
- # Line numbers in margin
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_BRACEBAD,'fore:#00009D,back:#FF0000,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_STYLE_INDENTGUIDE, 'fore:#CDCDCD,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_DEFAULT, 'fore:#000000,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_COMMENTLINE, 'fore:#008000,back:#F0FFF0,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_COMMENTBLOCK, 'fore:#008000,back:#F0FFF0,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_NUMBER, 'fore:#008080,size:%(size)d' % faces)
- # Strings and characters
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_STRING, 'fore:#800080,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_CHARACTER, 'fore:#800080,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_WORD, 'fore:#000080,bold,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_TRIPLE, 'fore:#800080,back:#FFFFEA,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_TRIPLEDOUBLE, 'fore:#800080,back:#FFFFEA,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_CLASSNAME, 'fore:#0000FF,bold,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_DEFNAME, 'fore:#008080,bold,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_OPERATOR, 'fore:#800000,bold,size:%(size)d' % faces)
- # Identifiers. I leave this as not bold because everything seems
- # to be an identifier if it doesn't match the above criterae
- self.PythonCodeEditor.StyleSetSpec(stc.STC_P_IDENTIFIER, 'fore:#000000,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(STC_PYTHON_ERROR, 'fore:#FF0000,back:#FFFF00,size:%(size)d' % faces)
- self.PythonCodeEditor.StyleSetSpec(STC_PYTHON_SEARCH_RESULT, 'fore:#FFFFFF,back:#FFA500,size:%(size)d' % faces)
- self.PythonCodeEditor.SetCaretForeground("BLUE")
- self.PythonCodeEditor.SetSelBackground(1, '#66CCFF')
- self.PythonCodeEditor.SetSelBackground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))
- self.PythonCodeEditor.SetSelForeground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
- # register some images for use in the AutoComplete box.
- #self.RegisterImage(1, images.getSmilesBitmap())
- self.PythonCodeEditor.RegisterImage(1,
- wx.ArtProvider.GetBitmap(wx.ART_DELETE, size=(16,16)))
- self.PythonCodeEditor.RegisterImage(2,
- wx.ArtProvider.GetBitmap(wx.ART_NEW, size=(16,16)))
- self.PythonCodeEditor.RegisterImage(3,
- wx.ArtProvider.GetBitmap(wx.ART_COPY, size=(16,16)))
- # Indentation and tab stuff
- self.PythonCodeEditor.SetIndent(4) # Proscribed indent size for wx
- self.PythonCodeEditor.SetIndentationGuides(True) # Show indent guides
- self.PythonCodeEditor.SetBackSpaceUnIndents(True)# Backspace unindents rather than delete 1 space
- self.PythonCodeEditor.SetTabIndents(True) # Tab key indents
- self.PythonCodeEditor.SetTabWidth(4) # Proscribed tab size for wx
- self.PythonCodeEditor.SetUseTabs(False) # Use spaces rather than tabs, or
- # TabTimmy will complain!
- self.PythonCodeEditor.SetViewWhiteSpace(False) # Don't view white space
- # EOL: Since we are loading/saving ourselves, and the
- # strings will always have \n's in them, set the STC to
- self.PythonCodeEditor.SetEOLMode(stc.STC_EOL_LF)
- self.PythonCodeEditor.SetViewEOL(False)
- # No right-edge mode indicator
- self.PythonCodeEditor.SetEdgeMode(stc.STC_EDGE_NONE)
- self.PythonCodeEditor.SetModEventMask(stc.STC_MOD_BEFOREINSERT|stc.STC_MOD_BEFOREDELETE)
- self.PythonCodeEditor.Bind(wx.stc.EVT_STC_DO_DROP, self.OnDoDrop, id=ID_PYTHONEDITOR)
- self.PythonCodeEditor.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus)
- self.PythonCodeEditor.Bind(wx.stc.EVT_STC_MODIFIED, self.OnModification, id=ID_PYTHONEDITOR)
+ self.PythonCodeEditor = PythonCodeEditor(prnt, self.ParentWindow, self.Controler) return self.PythonCodeEditor
- def __init__(self, parent, controler, window):
- ConfTreeNodeEditor.__init__(self, parent, controler, window)
- self.DisableEvents = False
- self.CurrentAction = None
- self.SearchParams = None
- self.SearchResults = None
- self.CurrentFindHighlight = None
- self.RefreshHighlightsTimer = wx.Timer(self, -1)
- self.Bind(wx.EVT_TIMER, self.OnRefreshHighlightsTimer, self.RefreshHighlightsTimer)
- def GetBufferState(self):
- return self.Controler.GetBufferState()
- self.Controler.LoadPrevious()
- self.Controler.LoadNext()
- def OnModification(self, event):
- if not self.DisableEvents:
- mod_type = event.GetModificationType()
- if not (mod_type&wx.stc.STC_PERFORMED_UNDO or mod_type&wx.stc.STC_PERFORMED_REDO):
- if mod_type&wx.stc.STC_MOD_BEFOREINSERT:
- if self.CurrentAction is None:
- elif self.CurrentAction[0] != "Add" or self.CurrentAction[1] != event.GetPosition() - 1:
- self.Controler.EndBuffering()
- self.CurrentAction = ("Add", event.GetPosition())
- wx.CallAfter(self.RefreshModel)
- elif mod_type&wx.stc.STC_MOD_BEFOREDELETE:
- if self.CurrentAction == None:
- elif self.CurrentAction[0] != "Delete" or self.CurrentAction[1] != event.GetPosition() + 1:
- self.Controler.EndBuffering()
- self.CurrentAction = ("Delete", event.GetPosition())
- wx.CallAfter(self.RefreshModel)
- def OnDoDrop(self, event):
- wx.CallAfter(self.RefreshModel)
- # Buffer the last model state
- def RefreshBuffer(self):
- self.Controler.BufferPython()
- if self.ParentWindow is not None:
- self.ParentWindow.RefreshTitle()
- self.ParentWindow.RefreshFileMenu()
- self.ParentWindow.RefreshEditMenu()
- self.ParentWindow.RefreshPageTitles()
- def StartBuffering(self):
- self.Controler.StartBuffering()
- if self.ParentWindow is not None:
- self.ParentWindow.RefreshTitle()
- self.ParentWindow.RefreshFileMenu()
- self.ParentWindow.RefreshEditMenu()
- self.ParentWindow.RefreshPageTitles()
- if self.CurrentAction != None:
- self.Controler.EndBuffering()
- self.CurrentAction = None
- ConfTreeNodeEditor.RefreshView(self)
- self.DisableEvents = True
- old_cursor_pos = self.PythonCodeEditor.GetCurrentPos()
- line = self.PythonCodeEditor.GetFirstVisibleLine()
- column = self.PythonCodeEditor.GetXOffset()
- old_text = self.PythonCodeEditor.GetText()
- new_text = self.Controler.GetPythonCode()
- if old_text != new_text:
- self.PythonCodeEditor.SetText(new_text)
- new_cursor_pos = GetCursorPos(old_text, new_text)
- self.PythonCodeEditor.LineScroll(column, line)
- if new_cursor_pos != None:
- self.PythonCodeEditor.GotoPos(new_cursor_pos)
- self.PythonCodeEditor.GotoPos(old_cursor_pos)
- self.PythonCodeEditor.EmptyUndoBuffer()
- self.DisableEvents = False
- self.PythonCodeEditor.Colourise(0, -1)
+ CodeFileEditor.RefreshView(self)
- def RefreshModel(self):
- self.Controler.SetPythonCode(self.PythonCodeEditor.GetText())
- def OnKeyPressed(self, event):
- if self.PythonCodeEditor.CallTipActive():
- self.PythonCodeEditor.CallTipCancel()
- key = event.GetKeyCode()
- if key == 32 and event.ControlDown():
- pos = self.PythonCodeEditor.GetCurrentPos()
- if not event.ShiftDown():
- self.PythonCodeEditor.AutoCompSetIgnoreCase(False) # so this needs to match
- # Images are specified with a appended "?type"
- self.PythonCodeEditor.AutoCompShow(0, " ".join([word + "?1" for word in keyword.kwlist]))
- def OnKillFocus(self, event):
- self.PythonCodeEditor.AutoCompCancel()
- def OnUpdateUI(self, evt):
- # check for matching braces
- caretPos = self.PythonCodeEditor.GetCurrentPos()
- charBefore = self.PythonCodeEditor.GetCharAt(caretPos - 1)
- styleBefore = self.PythonCodeEditor.GetStyleAt(caretPos - 1)
- if charBefore and chr(charBefore) in "[]{}()" and styleBefore == stc.STC_P_OPERATOR:
- braceAtCaret = caretPos - 1
- charAfter = self.PythonCodeEditor.GetCharAt(caretPos)
- styleAfter = self.PythonCodeEditor.GetStyleAt(caretPos)
- if charAfter and chr(charAfter) in "[]{}()" and styleAfter == stc.STC_P_OPERATOR:
- braceAtCaret = caretPos
- braceOpposite = self.PythonCodeEditor.BraceMatch(braceAtCaret)
- if braceAtCaret != -1 and braceOpposite == -1:
- self.PythonCodeEditor.BraceBadLight(braceAtCaret)
- self.PythonCodeEditor.BraceHighlight(braceAtCaret, braceOpposite)
- def OnMarginClick(self, evt):
- # fold and unfold as needed
- if evt.GetMargin() == 2:
- if evt.GetShift() and evt.GetControl():
- lineClicked = self.PythonCodeEditor.LineFromPosition(evt.GetPosition())
- if self.PythonCodeEditor.GetFoldLevel(lineClicked) & stc.STC_FOLDLEVELHEADERFLAG:
- self.PythonCodeEditor.SetFoldExpanded(lineClicked, True)
- self.Expand(lineClicked, True, True, 1)
- if self.PythonCodeEditor.GetFoldExpanded(lineClicked):
- self.PythonCodeEditor.SetFoldExpanded(lineClicked, False)
- self.Expand(lineClicked, False, True, 0)
- self.PythonCodeEditor.SetFoldExpanded(lineClicked, True)
- self.Expand(lineClicked, True, True, 100)
- self.PythonCodeEditor.ToggleFold(lineClicked)
- lineCount = self.PythonCodeEditor.GetLineCount()
- # find out if we are folding or unfolding
- for lineNum in range(lineCount):
- if self.PythonCodeEditor.GetFoldLevel(lineNum) & stc.STC_FOLDLEVELHEADERFLAG:
- expanding = not self.PythonCodeEditor.GetFoldExpanded(lineNum)
- while lineNum < lineCount:
- level = self.PythonCodeEditor.GetFoldLevel(lineNum)
- if level & stc.STC_FOLDLEVELHEADERFLAG and \
- (level & stc.STC_FOLDLEVELNUMBERMASK) == stc.STC_FOLDLEVELBASE:
- self.PythonCodeEditor.SetFoldExpanded(lineNum, True)
- lineNum = self.Expand(lineNum, True)
- lastChild = self.PythonCodeEditor.GetLastChild(lineNum, -1)
- self.PythonCodeEditor.SetFoldExpanded(lineNum, False)
- if lastChild > lineNum:
- self.PythonCodeEditor.HideLines(lineNum+1, lastChild)
- def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):
- lastChild = self.PythonCodeEditor.GetLastChild(line, level)
- while line <= lastChild:
- self.PythonCodeEditor.ShowLines(line, line)
- self.PythonCodeEditor.HideLines(line, line)
- self.PythonCodeEditor.ShowLines(line, line)
- level = self.PythonCodeEditor.GetFoldLevel(line)
- if level & stc.STC_FOLDLEVELHEADERFLAG:
- self.PythonCodeEditor.SetFoldExpanded(line, True)
- self.PythonCodeEditor.SetFoldExpanded(line, False)
- line = self.Expand(line, doExpand, force, visLevels-1)
- if doExpand and self.PythonCodeEditor.GetFoldExpanded(line):
- line = self.Expand(line, True, force, visLevels-1)
- line = self.Expand(line, False, force, visLevels-1)
- self.DisableEvents = True
- self.PythonCodeEditor.CmdKeyExecute(wx.stc.STC_CMD_CUT)
- self.DisableEvents = False
- self.PythonCodeEditor.CmdKeyExecute(wx.stc.STC_CMD_COPY)
- self.DisableEvents = True
- self.PythonCodeEditor.CmdKeyExecute(wx.stc.STC_CMD_PASTE)
- self.DisableEvents = False
+ self.PythonCodeEditor.RefreshView() def Find(self, direction, search_params):
- if self.SearchParams != search_params:
- self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
- self.SearchParams = search_params
- "raw_pattern": search_params["find_pattern"],
- "pattern": re.compile(search_params["find_pattern"]),
- "case_sensitive": search_params["case_sensitive"],
- "regular_expression": search_params["regular_expression"],
- (start, end, SEARCH_RESULT_HIGHLIGHT)
- for start, end, text in
- TestTextElement(self.PythonCodeEditor.GetText(), criteria)]
- self.CurrentFindHighlight = None
- if len(self.SearchResults) > 0:
- if self.CurrentFindHighlight is not None:
- old_idx = self.SearchResults.index(self.CurrentFindHighlight)
- if self.SearchParams["wrap"]:
- idx = (old_idx + direction) % len(self.SearchResults)
- idx = max(0, min(old_idx + direction, len(self.SearchResults) - 1))
- self.RemoveHighlight(*self.CurrentFindHighlight)
- self.CurrentFindHighlight = self.SearchResults[idx]
- self.AddHighlight(*self.CurrentFindHighlight)
- self.CurrentFindHighlight = self.SearchResults[0]
- self.AddHighlight(*self.CurrentFindHighlight)
- if self.CurrentFindHighlight is not None:
- self.RemoveHighlight(*self.CurrentFindHighlight)
- self.CurrentFindHighlight = None
-#-------------------------------------------------------------------------------
-# Highlights showing functions
-#-------------------------------------------------------------------------------
- def OnRefreshHighlightsTimer(self, event):
- def ClearHighlights(self, highlight_type=None):
- if highlight_type is None:
- highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None)
- if highlight_type is not None:
- self.Highlights = [(start, end, highlight) for (start, end, highlight) in self.Highlights if highlight != highlight_type]
- def AddHighlight(self, start, end, highlight_type):
- highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None)
- if highlight_type is not None:
- self.Highlights.append((start, end, highlight_type))
- self.PythonCodeEditor.GotoPos(self.PythonCodeEditor.PositionFromLine(start[0]) + start[1])
- self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True)
- def RemoveHighlight(self, start, end, highlight_type):
- highlight_type = HIGHLIGHT_TYPES.get(highlight_type, None)
- if (highlight_type is not None and
- (start, end, highlight_type) in self.Highlights):
- self.Highlights.remove((start, end, highlight_type))
- self.RefreshHighlightsTimer.Start(int(REFRESH_HIGHLIGHT_PERIOD * 1000), oneShot=True)
- def ShowHighlights(self):
- for start, end, highlight_type in self.Highlights:
- highlight_start_pos = start[1]
- highlight_start_pos = self.PythonCodeEditor.GetLineEndPosition(start[0] - 1) + start[1] + 1
- highlight_end_pos = end[1] - indent + 1
- highlight_end_pos = self.PythonCodeEditor.GetLineEndPosition(end[0] - 1) + end[1] + 2
- self.PythonCodeEditor.StartStyling(highlight_start_pos, 0xff)
- self.PythonCodeEditor.SetStyling(highlight_end_pos - highlight_start_pos, highlight_type)
- self.PythonCodeEditor.StartStyling(highlight_start_pos, 0x00)
- self.PythonCodeEditor.SetStyling(len(self.PythonCodeEditor.GetText()) - highlight_end_pos, stc.STC_STYLE_DEFAULT)
+ self.PythonCodeEditor.Find(direction, search_params) --- a/py_ext/PythonFileCTNMixin.py Wed May 08 21:37:31 2013 +0200
+++ b/py_ext/PythonFileCTNMixin.py Wed May 08 22:52:55 2013 +0200
@@ -6,17 +6,20 @@
+from CodeFileTreeNode import CodeFile PythonClasses = GenerateClassesFromXSD(os.path.join(os.path.dirname(__file__), "py_ext_xsd.xsd"))
-class PythonFileCTNMixin:
+class PythonFileCTNMixin(CodeFile): EditorType = PythonEditor
+ CodeFile.__init__(self) filepath = self.PythonFileName()
- self.PythonCode = PythonClasses["Python"]()
+ python_code = PythonClasses["Python"]() if os.path.isfile(filepath):
xmlfile = open(filepath, 'r')
tree = minidom.parse(xmlfile)
@@ -24,87 +27,58 @@
for child in tree.childNodes:
if child.nodeType == tree.ELEMENT_NODE and child.nodeName == "Python":
- self.PythonCode.loadXMLTree(child, ["xmlns", "xmlns:xsi", "xsi:schemaLocation"])
- self.CreatePythonBuffer(True)
- self.CreatePythonBuffer(False)
+ python_code.loadXMLTree(child, ["xmlns", "xmlns:xsi", "xsi:schemaLocation"]) + self.CodeFile.globals.settext(python_code.gettext()) + self.CreateCodeFileBuffer(False) + def CodeFileName(self): + return os.path.join(self.CTNPath(), "pyfile.xml") def PythonFileName(self):
return os.path.join(self.CTNPath(), "py_ext.xml")
- if self.PythonBuffer.IsCurrentSaved():
- def SetPythonCode(self, text):
- self.PythonCode.settext(text)
+ def GetPythonCode(self): + current_location = self.GetCurrentLocation() + # define a unique name for the generated C file + location_str = "_".join(map(str, current_location)) + text = "## Code generated by Beremiz python mixin confnode\n\n" + text += "## User includes\n" + text += self.CodeFile.includes.gettext() + text += "## User variables reference\n" + for variable in self.CodeFile.variables.variable: + text += "%s = %s\n" % (variable.getname(), + str(variable.getinitial())) - def GetPythonCode(self):
- return self.PythonCode.gettext()
- def CTNTestModified(self):
- return self.ChangesToSave or not self.PythonIsSaved()
- def OnCTNSave(self, from_project_path=None):
- filepath = self.PythonFileName()
+ # Adding user global variables and routines + text += "## User internal user variables and routines\n" + text += self.CodeFile.globals.gettext() - text = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
- extras = {"xmlns":"http://www.w3.org/2001/XMLSchema",
- "xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance",
- "xsi:schemaLocation" : "py_ext_xsd.xsd"}
- text += self.PythonCode.generateXMLText("Python", 0, extras)
- xmlfile = open(filepath,"w")
- xmlfile.write(text.encode("utf-8"))
+ # Adding Beremiz confnode functions + text += "## Beremiz confnode functions\n" + for func, args, return_code, code_object in [ + ("__init_", "*args, **kwargs", + "return 0", self.CodeFile.initFunction), + ("__cleanup_", "", "", self.CodeFile.cleanUpFunction), + ("__retrieve_", "", "", self.CodeFile.retrieveFunction), + ("__publish_", "", "", self.CodeFile.publishFunction),]: + text += "def %s%s(%s):\n" % (func, location_str, args) + lines = code_object.gettext().splitlines() + if len(lines) > 0 or return_code != "": + for line in code_object.gettext().splitlines(): + text += " " + return_code + "\n\n" - self.MarkPythonAsSaved()
-#-------------------------------------------------------------------------------
-# Current Buffering Management Functions
-#-------------------------------------------------------------------------------
- Return a copy of the project
- return cPickle.loads(cPickle.dumps(model))
- def CreatePythonBuffer(self, saved):
- self.PythonBuffer = UndoBuffer(cPickle.dumps(self.PythonCode), saved)
- def BufferPython(self):
- self.PythonBuffer.Buffering(cPickle.dumps(self.PythonCode))
- def StartBuffering(self):
- def EndBuffering(self):
- self.PythonBuffer.Buffering(cPickle.dumps(self.PythonCode))
- def MarkPythonAsSaved(self):
- self.PythonBuffer.CurrentSaved()
- def PythonIsSaved(self):
- return self.PythonBuffer.IsCurrentSaved() and not self.Buffering
- def LoadPrevious(self):
- self.PythonCode = cPickle.loads(self.PythonBuffer.Previous())
- self.PythonCode = cPickle.loads(self.PythonBuffer.Next())
- def GetBufferState(self):
- first = self.PythonBuffer.IsFirst() and not self.Buffering
- last = self.PythonBuffer.IsLast()
- return not first, not last