beremiz: comparison Beremiz.py

equal deleted inserted replaced

-:2f7721dae9a0
+:cbab4c1635bd
 sys.path.append(extension_folder)
 AddCatalog(os.path.join(extension_folder, "locale"))
 AddBitmapFolder(os.path.join(extension_folder, "images"))
 execfile(extfilename, locals())
-import wx.lib.buttons, wx.lib.statbmp
+import wx.lib.buttons, wx.lib.statbmp, wx.stc
 import cPickle
 import types, time, re, platform, time, traceback, commands
 from docutil import OpenHtmlFrame
 from IDEFrame import IDEFrame, AppendMenu
 dc.SetBrush(wx.Brush(colour ))
 dc.DrawRectangle(0, 0, *dc.GetSizeTuple())
 if self._bitmap:
 dc.DrawBitmap(self._bitmap, 0, 0, True)
+if wx.Platform == '__WXMSW__':
+faces = {
+'mono' : 'Courier New',
+'size' : 8,
+}
+else:
+faces = {
+'mono' : 'Courier',
+'size' : 10,
+}
 from threading import Lock,Timer,currentThread
 MainThread = currentThread().ident
 REFRESH_PERIOD = 0.1
 from time import time as gettime
 class LogPseudoFile:
 """ Base class for file like objects to facilitate StdOut for the Shell."""
 def __init__(self, output, risecall):
-self.red_white = wx.TextAttr("RED", "WHITE")
+self.red_white = 1
-self.red_yellow = wx.TextAttr("RED", "YELLOW")
+self.red_yellow = 2
-self.black_white = wx.TextAttr("BLACK", "WHITE")
+self.black_white = wx.stc.STC_STYLE_DEFAULT
-self.default_style = None
 self.output = output
 self.risecall = risecall
 # to prevent rapid fire on rising log panel
 self.rising_timer = 0
 self.lock = Lock()
 if self.output :
 self.output.Freeze()
 self.lock.acquire()
 for s, style in self.stack:
 if style is None : style=self.black_white
-if self.default_style != style:
+if style != self.black_white:
-self.output.SetDefaultStyle(style)
+self.output.StartStyling(self.output.GetLength(), 0xff)
-self.default_style = style
+self.output.AddText(s)
-self.output.AppendText(s)
+if style != self.black_white:
-self.output.ScrollLines(s.count('\n')+1)
+self.output.SetStyling(len(s), style)
 self.stack = []
 self.lock.release()
-self.output.ShowPosition(self.output.GetLastPosition())
+self.output.ScrollToLine(self.output.GetLineCount())
 self.output.Thaw()
 self.LastRefreshTime = gettime()
 try:
 self.RefreshLock.release()
 except:
 pass
 newtime = time.time()
 if newtime - self.rising_timer > 1:
-self.risecall()
+self.risecall(self.output)
 self.rising_timer = newtime
 def write_warning(self, s):
 self.write(s,self.red_white)
 def writeyield(self, s):
 self.write(s)
 wx.GetApp().Yield()
 def flush(self):
-self.output.SetValue("")
+self.output.SetText("")
 def isatty(self):
 return false
 [ID_BEREMIZ, ID_BEREMIZMAINSPLITTER,
 self.Bind(wx.EVT_MENU, OnMethodGen(self,method), id=newid)
 accels += [wx.AcceleratorEntry(wx.ACCEL_NORMAL, shortcut,newid)]
 self.SetAcceleratorTable(wx.AcceleratorTable(accels))
-self.LogConsole = wx.TextCtrl(id=ID_BEREMIZLOGCONSOLE, value='',
+self.LogConsole = wx.stc.StyledTextCtrl(id=ID_BEREMIZLOGCONSOLE,
 name='LogConsole', parent=self.BottomNoteBook, pos=wx.Point(0, 0),
-size=wx.Size(0, 0), style=wx.TE_MULTILINE|wx.TE_RICH2)
+size=wx.Size(0, 0))
-self.LogConsole.Bind(wx.EVT_LEFT_DCLICK, self.OnLogConsoleDClick)
+# Define Log Console styles
+self.LogConsole.StyleSetSpec(wx.stc.STC_STYLE_DEFAULT, "face:%(mono)s,size:%(size)d" % faces)
+self.LogConsole.StyleClearAll()
+self.LogConsole.StyleSetSpec(1, "face:%(mono)s,fore:#FF0000,size:%(size)d" % faces)
+self.LogConsole.StyleSetSpec(2, "face:%(mono)s,fore:#FF0000,back:#FFFF00,size:%(size)d" % faces)
+# Define Log Console markers
+self.LogConsole.SetMarginSensitive(1, True)
+self.LogConsole.SetMarginType(1, wx.stc.STC_MARGIN_SYMBOL)
+self.LogConsole.MarkerDefine(0, wx.stc.STC_MARK_CIRCLE, "BLACK", "RED")
+self.LogConsole.SetModEventMask(wx.stc.STC_MOD_INSERTTEXT)
+self.LogConsole.Bind(wx.stc.EVT_STC_MARGINCLICK, self.OnLogConsoleMarginClick)
+self.LogConsole.Bind(wx.stc.EVT_STC_MODIFIED, self.OnLogConsoleModified)
 self.MainTabs["LogConsole"] = (self.LogConsole, _("Console"))
 self.BottomNoteBook.AddPage(*self.MainTabs["LogConsole"])
+#self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT)
 self.LogViewer = LogViewer(self.BottomNoteBook, self)
 self.MainTabs["LogViewer"] = (self.LogViewer, _("PLC Log"))
 self.BottomNoteBook.AddPage(*self.MainTabs["LogViewer"])
 #self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogViewer), wx.RIGHT)
-self.BottomNoteBook.Split(self.BottomNoteBook.GetPageIndex(self.LogConsole), wx.RIGHT)
 StatusToolBar = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize,
 wx.TB_FLAT | wx.TB_NODIVIDER | wx.NO_BORDER)
 StatusToolBar.SetToolBitmapSize(wx.Size(25, 25))
 StatusToolBar.Realize()
 self.AUIManager.Update()
 def __init__(self, parent, projectOpen=None, buildpath=None, ctr=None, debug=True):
 IDEFrame.__init__(self, parent, debug)
-self.Log = LogPseudoFile(self.LogConsole,self.RiseLogConsole)
+self.Log = LogPseudoFile(self.LogConsole,self.SelectTab)
 self.local_runtime = None
 self.runtime_port = None
 self.local_runtime_tmpdir = None
 self._Refresh(TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU)
 self.RefreshAll()
 self.LogConsole.SetFocus()
-def RiseLogConsole(self):
-self.BottomNoteBook.SetSelection(self.BottomNoteBook.GetPageIndex(self.LogConsole))
 def RefreshTitle(self):
 name = _("Beremiz")
 if self.CTR is not None:
 projectname = self.CTR.GetProjectName()
 if self.CTR.ProjectTestModified():
 wnd = wx.FindWindowAtPointer()
 if not wnd:
 wnd = self
 InspectionTool().Show(wnd, True)
-def OnLogConsoleDClick(self, event):
+def OnLogConsoleMarginClick(self, event):
-wx.CallAfter(self.SearchLineForError)
+line_idx = self.LogConsole.LineFromPosition(event.GetPosition())
+wx.CallAfter(self.SearchLineForError, self.LogConsole.GetLine(line_idx))
 event.Skip()
-def SearchLineForError(self):
+def OnLogConsoleModified(self, event):
+line_idx = self.LogConsole.LineFromPosition(event.GetPosition())
+line = self.LogConsole.GetLine(line_idx)
+if line:
+result = MATIEC_ERROR_MODEL.match(line)
+if result is not None:
+self.LogConsole.MarkerAdd(line_idx, 0)
+event.Skip()
+def SearchLineForError(self, line):
 if self.CTR is not None:
-text = self.LogConsole.GetRange(0, self.LogConsole.GetInsertionPoint())
-line = self.LogConsole.GetLineText(len(text.splitlines()) - 1)
 result = MATIEC_ERROR_MODEL.match(line)
 if result is not None:
 first_line, first_column, last_line, last_column, error = result.groups()
 infos = self.CTR.ShowError(self.Log,
 (int(first_line), int(first_column)),

changeset 999	cbab4c1635bd
parent 994	0401295d9804
child 1000	d19af9341d28