beremiz: comparison controls/LogViewer.py

equal deleted inserted replaced

-:31e63e25b4cc
+:64beb9e9c749
 from util.BitmapLibrary import GetBitmap
 from weakref import proxy
 THUMB_SIZE_RATIO = 1. / 8.
 def ArrowPoints(direction, width, height, xoffset, yoffset):
 if direction == wx.TOP:
 return [wx.Point(xoffset + 1, yoffset + height - 2),
 wx.Point(xoffset + width / 2, yoffset + 1),
 wx.Point(xoffset + width - 1, yoffset + height - 2)]
 else:
 return [wx.Point(xoffset + 1, yoffset - height + 1),
 wx.Point(xoffset + width / 2, yoffset - 2),
 wx.Point(xoffset + width - 1, yoffset - height + 1)]
 class LogScrollBar(wx.Panel):
 def __init__(self, parent, size):
 wx.Panel.__init__(self, parent, size=size)
 self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
 self.Bind(wx.EVT_MOTION, self.OnMotion)
 self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
 self.Bind(wx.EVT_PAINT, self.OnPaint)
 self.Bind(wx.EVT_SIZE, self.OnResize)
-self.ThumbPosition = 0. # -1 <= ThumbPosition <= 1
+self.ThumbPosition = 0.  # -1 <= ThumbPosition <= 1
 self.ThumbScrollingStartPos = None
 def GetRangeRect(self):
 width, height = self.GetClientSize()
 return wx.Rect(0, width, width, height - 2 * width)
 thumb_rect.width, thumb_rect.height)
 dc.EndDrawing()
 event.Skip()
 BUTTON_SIZE = (70, 15)
 class LogButton():
 def __init__(self, label, callback):
 self.Position = wx.Point(0, 0)
 dc.DrawRectangle(self.Position.x, self.Position.y,
 self.Size.width, self.Size.height)
 w, h = dc.GetTextExtent(self.Label)
 dc.DrawText(self.Label,
 self.Position.x + (self.Size.width - w) / 2,
 self.Position.y + (self.Size.height - h) / 2)
 DATE_INFO_SIZE = 10
 MESSAGE_INFO_SIZE = 18
 class LogMessage:
 def __init__(self, tv_sec, tv_nsec, level, level_bitmap, msg):
 self.Date = datetime.utcfromtimestamp(tv_sec)
 def GetHeight(self, draw_date):
 if draw_date:
 return DATE_INFO_SIZE + MESSAGE_INFO_SIZE
 return MESSAGE_INFO_SIZE
 SECOND = 1
 MINUTE = 60 * SECOND
 HOUR = 60 * MINUTE
 DAY = 24 * HOUR
 CHANGE_TIMESTAMP_BUTTONS = [(_("1d"), DAY),
 (_("1h"), HOUR),
 (_("1m"), MINUTE),
 (_("1s"), SECOND)]
 class LogViewer(DebugViewer, wx.Panel):
 def __init__(self, parent, window):
-wx.Panel.__init__(self, parent, style=wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
+wx.Panel.__init__(self, parent, style=wx.TAB_TRAVERSAL | wx.SUNKEN_BORDER)
 DebugViewer.__init__(self, None, False, False)
 main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=5)
 main_sizer.AddGrowableCol(0)
 main_sizer.AddGrowableRow(1)
 filter_sizer = wx.BoxSizer(wx.HORIZONTAL)
-main_sizer.AddSizer(filter_sizer, border=5, flag=wx.TOP|wx.LEFT|wx.RIGHT|wx.GROW)
+main_sizer.AddSizer(filter_sizer, border=5, flag=wx.TOP | wx.LEFT | wx.RIGHT | wx.GROW)
 self.MessageFilter = wx.ComboBox(self, style=wx.CB_READONLY)
 self.MessageFilter.Append(_("All"))
 levels = LogLevels[:3]
 levels.reverse()
 for level in levels:
 self.MessageFilter.Append(_(level))
 self.Bind(wx.EVT_COMBOBOX, self.OnMessageFilterChanged, self.MessageFilter)
-filter_sizer.AddWindow(self.MessageFilter, 1, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+filter_sizer.AddWindow(self.MessageFilter, 1, border=5, flag=wx.RIGHT | wx.ALIGN_CENTER_VERTICAL)
 self.SearchMessage = wx.SearchCtrl(self, style=wx.TE_PROCESS_ENTER)
 self.SearchMessage.ShowSearchButton(True)
 self.SearchMessage.ShowCancelButton(True)
 self.Bind(wx.EVT_TEXT_ENTER, self.OnSearchMessageChanged, self.SearchMessage)
 self.Bind(wx.EVT_SEARCHCTRL_SEARCH_BTN,
 self.OnSearchMessageSearchButtonClick, self.SearchMessage)
 self.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN,
 self.OnSearchMessageCancelButtonClick, self.SearchMessage)
-filter_sizer.AddWindow(self.SearchMessage, 3, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+filter_sizer.AddWindow(self.SearchMessage, 3, border=5, flag=wx.RIGHT | wx.ALIGN_CENTER_VERTICAL)
 self.CleanButton = wx.lib.buttons.GenBitmapButton(self, bitmap=GetBitmap("Clean"),
 size=wx.Size(28, 28), style=wx.NO_BORDER)
 self.CleanButton.SetToolTipString(_("Clean log messages"))
 self.Bind(wx.EVT_BUTTON, self.OnCleanButton, self.CleanButton)
 filter_sizer.AddWindow(self.CleanButton)
 message_panel_sizer = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
 message_panel_sizer.AddGrowableCol(0)
 message_panel_sizer.AddGrowableRow(0)
-main_sizer.AddSizer(message_panel_sizer, border=5, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.GROW)
+main_sizer.AddSizer(message_panel_sizer, border=5, flag=wx.LEFT | wx.RIGHT | wx.BOTTOM | wx.GROW)
 self.MessagePanel = wx.Panel(self)
 if wx.Platform == '__WXMSW__':
 self.Font = wx.Font(8, wx.SWISS, wx.NORMAL, wx.NORMAL, faceName='Courier New')
 else:
 return LogMessage(tv_sec, tv_nsec, level, self.LevelIcons[level], msg)
 return None
 def ResetLogCounters(self):
 self.previous_log_count = [None]*LogLevelsCount
 def SetLogCounters(self, log_count):
 new_messages = []
 for level, count, prev in zip(xrange(LogLevelsCount), log_count, self.previous_log_count):
 if count is not None and prev != count:
 if prev is None:
 dump_end = max(-1, count - 10)
 oldest_message = (-1, None)
 else:
 dump_end = prev - 1
-for msgidx in xrange(count-1, dump_end,-1):
+for msgidx in xrange(count-1, dump_end, -1):
 new_message = self.GetLogMessageFromSource(msgidx, level)
 if new_message is None:
 if prev is None:
 oldest_message = (-1, None)
 break
 dc.EndDrawing()
 self.MessageScrollBar.RefreshThumbPosition()
 def IsPLCLogEmpty(self):
-empty=True
+empty = True
 for level, prev in zip(xrange(LogLevelsCount), self.previous_log_count):
 if prev is not None:
-empty=False
+empty = False
 break
 return empty
 def IsMessagePanelTop(self, message_idx=None):
 if message_idx is None:
 message_idx = self.CurrentMessage
 if message_idx is not None:
 return self.GetNextMessage(message_idx)[0] is None

changeset 1784	64beb9e9c749
parent 1768	691083b5682a
child 1831	56b48961cc68