Skip to content

Make eventlogviewer str/bytes robust #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
David-Baddeley merged 2 commits into from
Jan 11, 2022
Merged

Make eventlogviewer str/bytes robust #1182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4910d3
Make the eventlogviewer safe for either str or bytes as event names
David-Baddeley Jan 11, 2022
e00e858
fix missing str cast
David-Baddeley Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions PYME/DSView/eventLogViewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import wx
import numpy as np
import time
import six
# import pylab
from matplotlib import cm
from PYME.Analysis.piecewiseMapping import times_to_frames, frames_to_times
Expand Down Expand Up @@ -174,9 +175,11 @@ def DoPaint(self, dc):
t = e['Time'] - startT
if t > minT and t < maxT:
y = (t -minT)*pixPerS + 2*textHeight

event_name = six.ensure_str(e['EventName'])

dc.SetPen(wx.Pen(self.lineColours[e['EventName']]))
dc.SetTextForeground(self.lineColours[e['EventName']])
dc.SetPen(wx.Pen(self.lineColours[event_name]))
dc.SetTextForeground(self.lineColours[event_name])

if y < (lastEvY + 2) or (numSkipped > 0 and y < (lastEvY + 1.2*textHeight)): #no room - skip
if ((tTickPositions - y)**2).min() < (0.3*textHeight)**2:
Expand Down Expand Up @@ -228,10 +231,7 @@ def DoPaint(self, dc):
for c in self.charts:
cname = c[0]
cmapping = c[1]
sourceEv = c[2]

if not isinstance(sourceEv, bytes):
sourceEv = sourceEv.encode()
sourceEv = six.ensure_str(c[2]) # sourceEv may sometimes be `bytes`

dc.SetTextForeground(self.lineColours[sourceEv])

Expand Down Expand Up @@ -366,7 +366,7 @@ def SetEventSource(self, eventSource):
self.eventSource = eventSource
self.evKeyNames = set()
for e in self.eventSource:
self.evKeyNames.add(bytes(e['EventName']))
self.evKeyNames.add(six.ensure_str(e['EventName']))

colours = 0.9*cm.gist_rainbow(np.arange(len(self.evKeyNames))/float(len(self.evKeyNames)))[:,:3]

Expand Down Expand Up @@ -578,8 +578,11 @@ def DoPaint(self, dc):
y = eys[i]
t = ets[i]
#print y
dc.SetPen(wx.Pen(self.lineColours[e['EventName']]))
dc.SetTextForeground(self.lineColours[e['EventName']])
event_name = six.ensure_str(e['EventName'])

dc.SetPen(wx.Pen(self.lineColours[event_name]))
dc.SetTextForeground(self.lineColours[event_name])

if (y < (lastLineY + 2) or (numSkipped > 0 and y < (lastLineY + 1.2*textHeight))) and dys[i] < (1.2*textHeight + 2*numSkipped): #no room - skip
if ((tTickPositions - y)**2).min() < (0.3*textHeight)**2:
dc.DrawLine(x0, y, x0 + barWidth, y)
Expand Down Expand Up @@ -627,9 +630,9 @@ def DoPaint(self, dc):
for c in self.charts:
cname = c[0]
cmapping = c[1]
sourceEv = c[2]
sourceEv = six.ensure_str(c[2])

dc.SetTextForeground(self.lineColours[sourceEv])
dc.SetTextForeground(self.lineColours[six.ensure_str(sourceEv)])

dc.DrawText(cname, x4 + chartWidth/2 - dc.GetTextExtent(cname)[0]/2, 0)

Expand Down Expand Up @@ -775,7 +778,7 @@ def SetEventSource(self, eventSource):
self.eventSource = eventSource
self.evKeyNames = set()
for e in self.eventSource:
self.evKeyNames.add(e['EventName'])
self.evKeyNames.add(six.ensure_str(e['EventName']))

colours = 0.9*cm.gist_rainbow(np.arange(len(self.evKeyNames))/float(len(self.evKeyNames)))[:,:3]

Expand Down