--- a/GraphicViewer.py Tue Mar 27 23:55:10 2012 +0200
+++ b/GraphicViewer.py Tue Mar 27 23:57:51 2012 +0200
@@ -25,7 +25,8 @@
import wx
import wx.lib.plot as plot
import numpy
-from graphics.GraphicCommons import DebugViewer
+import math
+from graphics.GraphicCommons import DebugViewer, MODE_SELECTION, MODE_MOTION
from controls import EditorPanel
colours = ['blue', 'red', 'green', 'yellow', 'orange', 'purple', 'brown', 'cyan',
@@ -41,16 +42,18 @@
MINUTE = 60 * SECOND
HOUR = 60 * MINUTE
-RANGE_VALUES = [(str(25 * 2 ** i), 25 * 2 ** i) for i in xrange(6)]
+ZOOM_VALUES = map(lambda x:("x %.1f" % x, x), [math.sqrt(2) ** i for i in xrange(8)])
+RANGE_VALUES = map(lambda x: (str(x), x), [25 * 2 ** i for i in xrange(6)])
TIME_RANGE_VALUES = [("%ds" % i, i * SECOND) for i in (1, 2, 5, 10, 20, 30)] + \
[("%dm" % i, i * MINUTE) for i in (1, 2, 5, 10, 20, 30)] + \
[("%dh" % i, i * HOUR) for i in (1, 2, 3, 6, 12, 24)]
-[ID_GRAPHICVIEWER, ID_GRAPHICVIEWERCANVAS,
- ID_GRAPHICVIEWERCANVASRANGE, ID_GRAPHICVIEWERCANVASPOSITION,
- ID_GRAPHICVIEWERRESETBUTTON, ID_GRAPHICVIEWERCURRENTBUTTON,
- ID_GRAPHICVIEWERSTATICTEXT1, ID_GRAPHICVIEWERSTATICTEXT2,
-] = [wx.NewId() for _init_ctrls in range(8)]
+[ID_GRAPHICVIEWER, ID_GRAPHICVIEWERCANVAS,
+ ID_GRAPHICVIEWERCANVASRANGE, ID_GRAPHICVIEWERCANVASZOOM,
+ ID_GRAPHICVIEWERCANVASPOSITION, ID_GRAPHICVIEWERRESETBUTTON,
+ ID_GRAPHICVIEWERCURRENTBUTTON, ID_GRAPHICVIEWERSTATICTEXT1,
+ ID_GRAPHICVIEWERSTATICTEXT2, ID_GRAPHICVIEWERSTATICTEXT3,
+] = [wx.NewId() for _init_ctrls in range(10)]
class GraphicViewer(EditorPanel, DebugViewer):
@@ -68,6 +71,8 @@
# generated method, don't edit
parent.AddWindow(self.staticbox1, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
parent.AddWindow(self.CanvasRange, 0, border=5, flag=wx.ALL)
+ parent.AddWindow(self.staticbox3, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
+ parent.AddWindow(self.CanvasZoom, 0, border=5, flag=wx.ALL)
parent.AddWindow(self.staticText2, 0, border=5, flag=wx.ALIGN_CENTER_VERTICAL|wx.ALL)
parent.AddWindow(self.CanvasPosition, 0, border=5, flag=wx.GROW|wx.ALL)
parent.AddWindow(self.ResetButton, 0, border=5, flag=wx.ALL)
@@ -81,7 +86,7 @@
def _init_sizers(self):
# generated method, don't edit
self.MainGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
- self.RangeSizer = wx.FlexGridSizer(cols=6, hgap=0, rows=1, vgap=0)
+ self.RangeSizer = wx.FlexGridSizer(cols=8, hgap=0, rows=1, vgap=0)
self._init_coll_MainGridSizer_Items(self.MainGridSizer)
self._init_coll_MainGridSizer_Growables(self.MainGridSizer)
@@ -108,7 +113,11 @@
return plot.PlotCanvas._axisInterval(self.Canvas, spec, lower, upper)
self.Canvas._axisInterval = _axisInterval
self.Canvas.SetYSpec('border')
-
+ self.Canvas.canvas.Bind(wx.EVT_LEFT_DOWN, self.OnCanvasLeftDown)
+ self.Canvas.canvas.Bind(wx.EVT_LEFT_UP, self.OnCanvasLeftUp)
+ self.Canvas.canvas.Bind(wx.EVT_MOTION, self.OnCanvasMotion)
+ self.Canvas.canvas.Bind(wx.EVT_MOUSEWHEEL, self.OnCanvasMouseWheel)
+
self.staticbox1 = wx.StaticText(id=ID_GRAPHICVIEWERSTATICTEXT1,
label=_('Range:'), name='staticText1', parent=self.Editor,
pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
@@ -118,6 +127,15 @@
size=wx.Size(100, 28), style=wx.CB_READONLY)
self.Bind(wx.EVT_COMBOBOX, self.OnRangeChanged, id=ID_GRAPHICVIEWERCANVASRANGE)
+ self.staticbox3 = wx.StaticText(id=ID_GRAPHICVIEWERSTATICTEXT3,
+ label=_('Zoom:'), name='staticText3', parent=self.Editor,
+ pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
+
+ self.CanvasZoom = wx.ComboBox(id=ID_GRAPHICVIEWERCANVASZOOM,
+ name='CanvasZoom', parent=self.Editor, pos=wx.Point(0, 0),
+ size=wx.Size(70, 28), style=wx.CB_READONLY)
+ self.Bind(wx.EVT_COMBOBOX, self.OnZoomChanged, id=ID_GRAPHICVIEWERCANVASZOOM)
+
self.staticText2 = wx.StaticText(id=ID_GRAPHICVIEWERSTATICTEXT2,
label=_('Position:'), name='staticText2', parent=self.Editor,
pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
@@ -155,14 +173,32 @@
self.InstancePath = instancepath
self.RangeValues = None
+ self.CursorIdx = None
+ self.LastCursor = None
+ self.CurrentMousePos = None
+ self.CurrentMotionValue = None
+ self.Dragging = False
+
+ # Initialize Viewer mode to Selection mode
+ self.Mode = MODE_SELECTION
self.Datas = []
- self.StartValue = 0
- self.EndValue = 0
+ self.StartTick = 0
+ self.EndTick = 0
+ self.StartIdx = 0
+ self.EndIdx = 0
+ self.MinValue = None
+ self.MaxValue = None
+ self.YCenter = 0
+ self.CurrentZoom = 1
self.Fixed = False
self.Ticktime = self.DataProducer.GetTicktime()
self.RefreshCanvasRange()
+ for zoom_txt, zoom in ZOOM_VALUES:
+ self.CanvasZoom.Append(zoom_txt)
+ self.CanvasZoom.SetSelection(0)
+
self.AddDataConsumer(self.InstancePath.upper(), self)
def __del__(self):
@@ -174,12 +210,25 @@
return "..." + self.InstancePath[-12:]
return self.InstancePath
- def ResetView(self):
+ # Changes Viewer mode
+ def SetMode(self, mode):
+ if self.Mode != mode or mode == MODE_SELECTION:
+ if self.Mode == MODE_MOTION:
+ wx.CallAfter(self.Canvas.canvas.SetCursor, wx.NullCursor)
+ self.Mode = mode
+ if self.Mode == MODE_MOTION:
+ wx.CallAfter(self.Canvas.canvas.SetCursor, wx.StockCursor(wx.CURSOR_HAND))
+
+ def ResetView(self, register=False):
self.Datas = []
- self.StartValue = 0
- self.EndValue = 0
+ self.StartTick = 0
+ self.EndTick = 0
+ self.StartIdx = 0
+ self.EndIdx = 0
self.Fixed = False
self.Ticktime = self.DataProducer.GetTicktime()
+ if register:
+ self.AddDataConsumer(self.InstancePath.upper(), self)
self.RefreshCanvasRange()
self.RefreshView()
@@ -187,47 +236,6 @@
self.RefreshView(*args, **kwargs)
DebugViewer.RefreshNewData(self)
- def RefreshCanvasRange(self):
- if self.Ticktime == 0 and self.RangeValues != RANGE_VALUES:
- self.RangeValues = RANGE_VALUES
- self.RangeValues_dict = dict(RANGE_VALUES)
- self.CanvasRange.Clear()
- for text, value in RANGE_VALUES:
- self.CanvasRange.Append(text)
- self.CanvasRange.SetStringSelection(RANGE_VALUES[0][0])
- self.CurrentRange = RANGE_VALUES[0][1]
- elif self.RangeValues != TIME_RANGE_VALUES:
- self.RangeValues = TIME_RANGE_VALUES
- self.RangeValues_dict = dict(TIME_RANGE_VALUES)
- self.CanvasRange.Clear()
- for text, value in TIME_RANGE_VALUES:
- self.CanvasRange.Append(text)
- self.CanvasRange.SetStringSelection(TIME_RANGE_VALUES[0][0])
- self.CurrentRange = TIME_RANGE_VALUES[0][1] / self.Ticktime
-
- def RefreshView(self, force=True):
- self.Freeze()
- if force or not self.Fixed:
- var_name = self.InstancePath.split(".")[-1]
-
- self.VariableGraphic = plot.PolyLine(self.Datas[self.StartValue:self.EndValue + 1],
- legend=var_name, colour=colours[0])
- self.GraphicsObject = plot.PlotGraphics([self.VariableGraphic], _("%s Graphics") % var_name, _("Tick"), _("Values"))
- datas_length = len(self.Datas)
- if datas_length > 1:
- start = self.Datas[self.StartValue][0]
- else:
- start = 0.
- self.Canvas.Draw(self.GraphicsObject, xAxis=(start, start + self.CurrentRange))
- self.RefreshScrollBar()
- self.Thaw()
-
- def GetInstancePath(self):
- return self.InstancePath
-
- def IsViewing(self, tagname):
- return self.InstancePath == tagname
-
def GetNearestData(self, tick, adjust):
ticks = numpy.array(zip(*self.Datas)[0])
new_cursor = numpy.argmin(abs(ticks - tick))
@@ -237,60 +245,269 @@
new_cursor += 1
return new_cursor
+ def GetBounds(self):
+ if self.StartIdx is None or self.EndIdx is None:
+ self.StartIdx = self.GetNearestData(self.StartTick, -1)
+ self.EndIdx = self.GetNearestData(self.EndTick, 1)
+
+ def ResetBounds(self):
+ self.StartIdx = None
+ self.EndIdx = None
+
+ def RefreshCanvasRange(self):
+ if self.Ticktime == 0 and self.RangeValues != RANGE_VALUES:
+ self.RangeValues = RANGE_VALUES
+ self.CanvasRange.Clear()
+ for text, value in RANGE_VALUES:
+ self.CanvasRange.Append(text)
+ self.CanvasRange.SetStringSelection(RANGE_VALUES[0][0])
+ self.CurrentRange = RANGE_VALUES[0][1]
+ elif self.RangeValues != TIME_RANGE_VALUES:
+ self.RangeValues = TIME_RANGE_VALUES
+ self.CanvasRange.Clear()
+ for text, value in TIME_RANGE_VALUES:
+ self.CanvasRange.Append(text)
+ self.CanvasRange.SetStringSelection(TIME_RANGE_VALUES[0][0])
+ self.CurrentRange = TIME_RANGE_VALUES[0][1] / self.Ticktime
+
+ def RefreshView(self, force=True):
+ self.Freeze()
+ if force or not self.Fixed:
+ if (self.MinValue is not None and
+ self.MaxValue is not None and
+ self.MinValue != self.MaxValue):
+ Yrange = float(self.MaxValue - self.MinValue) / self.CurrentZoom
+ else:
+ Yrange = 2. / self.CurrentZoom
+
+ if not self.Fixed and len(self.Datas) > 0:
+ self.YCenter = max(self.Datas[-1][1] - Yrange / 2,
+ min(self.YCenter,
+ self.Datas[-1][1] + Yrange / 2))
+
+ var_name = self.InstancePath.split(".")[-1]
+
+ self.GetBounds()
+ self.VariableGraphic = plot.PolyLine(self.Datas[self.StartIdx:self.EndIdx + 1],
+ legend=var_name, colour=colours[0])
+ self.GraphicsObject = plot.PlotGraphics([self.VariableGraphic], _("%s Graphics") % var_name, _("Tick"), _("Values"))
+ datas_length = len(self.Datas)
+ if datas_length > 1:
+ start = self.Datas[self.StartIdx][0]
+ else:
+ start = 0.
+ self.Canvas.Draw(self.GraphicsObject,
+ xAxis=(start, start + self.CurrentRange),
+ yAxis=(self.YCenter - Yrange * 1.1 / 2, self.YCenter + Yrange * 1.1 / 2))
+ self.RefreshScrollBar()
+
+ # Reset and draw cursor
+ self.ResetLastCursor()
+ self.RefreshCursor()
+
+ self.Thaw()
+
+ def GetInstancePath(self):
+ return self.InstancePath
+
+ def IsViewing(self, tagname):
+ return self.InstancePath == tagname
+
def NewValue(self, tick, value, forced=False):
self.Datas.append((float(tick), {True:1., False:0.}.get(value, float(value))))
+ if self.MinValue is None:
+ self.MinValue = value
+ else:
+ self.MinValue = min(self.MinValue, value)
+ if self.MaxValue is None:
+ self.MaxValue = value
+ else:
+ self.MaxValue = max(self.MaxValue, value)
if not self.Fixed:
- while int(self.Datas[self.StartValue][0]) < tick - self.CurrentRange:
- self.StartValue += 1
- self.EndValue += 1
+ self.GetBounds()
+ while int(self.Datas[self.StartIdx][0]) < tick - self.CurrentRange:
+ self.StartIdx += 1
+ self.EndIdx += 1
+ self.StartTick = self.Datas[self.StartIdx][0]
+ self.EndTick = self.StartTick + self.CurrentRange
self.NewDataAvailable()
def RefreshScrollBar(self):
if len(self.Datas) > 0:
- pos = int(self.Datas[self.StartValue][0] - self.Datas[0][0])
+ self.GetBounds()
+ pos = int(self.Datas[self.StartIdx][0] - self.Datas[0][0])
range = int(self.Datas[-1][0] - self.Datas[0][0])
else:
pos = 0
range = 0
self.CanvasPosition.SetScrollbar(pos, self.CurrentRange, range, self.CurrentRange)
- def OnRangeChanged(self, event):
- old_range = self.CurrentRange
- try:
- if self.Ticktime == 0:
- self.CurrentRange = self.RangeValues_dict[self.CanvasRange.GetValue()]
- else:
- self.CurrentRange = self.RangeValues_dict[self.CanvasRange.GetValue()] / self.Ticktime
- except ValueError, e:
- self.CanvasRange.SetValue(str(self.CurrentRange))
+ def RefreshRange(self):
if len(self.Datas) > 0:
if self.Fixed and self.Datas[-1][0] - self.Datas[0][0] < self.CurrentRange:
self.Fixed = False
+ self.ResetBounds()
if self.Fixed:
- self.StartValue = min(self.StartValue, self.GetNearestData(self.Datas[-1][0] - self.CurrentRange, -1))
- self.EndValue = self.GetNearestData(self.StartValue + self.CurrentRange, 1)
+ self.StartTick = min(self.StartTick, self.Datas[-1][0] - self.CurrentRange)
else:
- self.StartValue = self.GetNearestData(self.Datas[-1][0] - self.CurrentRange - 1, -1)
- self.EndValue = len(self.Datas) - 1
+ self.StartTick = max(self.Datas[0][0], self.EndTick - self.CurrentRange - 1)
+ self.EndTick = self.StartTick + self.CurrentRange
self.NewDataAvailable(True)
+
+ def OnRangeChanged(self, event):
+ try:
+ if self.Ticktime == 0:
+ self.CurrentRange = self.RangeValues[self.CanvasRange.GetSelection()][1]
+ else:
+ self.CurrentRange = self.RangeValues[self.CanvasRange.GetSelection()][1] / self.Ticktime
+ except ValueError, e:
+ self.CanvasRange.SetValue(str(self.CurrentRange))
+ wx.CallAfter(self.RefreshRange)
+ event.Skip()
+
+ def OnZoomChanged(self, event):
+ self.CurrentZoom = ZOOM_VALUES[self.CanvasZoom.GetSelection()][1]
+ wx.CallAfter(self.NewDataAvailable, True)
event.Skip()
def OnPositionChanging(self, event):
- self.StartValue = self.GetNearestData(self.Datas[0][0] + event.GetPosition(), -1)
- self.EndValue = self.GetNearestData(self.Datas[self.StartValue][0] + self.CurrentRange, 1)
+ self.ResetBounds()
+ self.StartTick = self.Datas[0][0] + event.GetPosition()
+ self.EndTick = self.StartTick + self.CurrentRange
self.Fixed = True
self.NewDataAvailable(True)
event.Skip()
def OnResetButton(self, event):
self.Fixed = False
- self.ResteView()
+ self.ResetView()
event.Skip()
def OnCurrentButton(self, event):
- self.StartValue = self.GetNearestData(self.Datas[-1][0] - self.CurrentRange, -1)
- self.EndValue = self.GetNearestData(self.Datas[self.StartValue][0] + self.CurrentRange, 1)
+ self.ResetBounds()
+ self.StartTick = max(self.Datas[0][0], self.Datas[-1][0] - self.CurrentRange)
+ self.EndTick = self.StartTick + self.CurrentRange
self.Fixed = False
self.NewDataAvailable(True)
event.Skip()
+ def OnCanvasLeftDown(self, event):
+ self.Fixed = True
+ self.Canvas.canvas.CaptureMouse()
+ if self.Mode == MODE_SELECTION:
+ self.Dragging = True
+ pos = self.Canvas.PositionScreenToUser(event.GetPosition())
+ self.CursorIdx = self.GetNearestData(pos[0], -1)
+ self.RefreshCursor()
+ elif self.Mode == MODE_MOTION:
+ self.GetBounds()
+ self.CurrentMousePos = event.GetPosition()
+ self.CurrentMotionValue = self.Datas[self.StartIdx][0]
+ event.Skip()
+
+ def OnCanvasLeftUp(self, event):
+ self.Dragging = False
+ if self.Mode == MODE_MOTION:
+ self.CurrentMousePos = None
+ self.CurrentMotionValue = None
+ if self.Canvas.canvas.HasCapture():
+ self.Canvas.canvas.ReleaseMouse()
+ event.Skip()
+
+ def OnCanvasMotion(self, event):
+ if self.Mode == MODE_SELECTION and self.Dragging:
+ pos = self.Canvas.PositionScreenToUser(event.GetPosition())
+ graphics, xAxis, yAxis = self.Canvas.last_draw
+ self.CursorIdx = self.GetNearestData(max(xAxis[0], min(pos[0], xAxis[1])), -1)
+ self.RefreshCursor()
+ elif self.CurrentMousePos is not None:
+ oldpos = self.Canvas.PositionScreenToUser(self.CurrentMousePos)
+ newpos = self.Canvas.PositionScreenToUser(event.GetPosition())
+ self.CurrentMotionValue += oldpos[0] - newpos[0]
+ self.YCenter += oldpos[1] - newpos[1]
+ self.ResetBounds()
+ self.StartTick = self.CurrentMotionValue
+ self.EndTick = self.StartTick + self.CurrentRange
+ self.CurrentMousePos = event.GetPosition()
+ self.NewDataAvailable(True)
+ event.Skip()
+
+ def OnCanvasMouseWheel(self, event):
+ if self.CurrentMousePos is None:
+ rotation = event.GetWheelRotation() / event.GetWheelDelta()
+ if event.ShiftDown():
+ current = self.CanvasRange.GetSelection()
+ new = max(0, min(current - rotation, len(self.RangeValues) - 1))
+ if new != current:
+ if self.Ticktime == 0:
+ self.CurrentRange = self.RangeValues[new][1]
+ else:
+ self.CurrentRange = self.RangeValues[new][1] / self.Ticktime
+ self.CanvasRange.SetStringSelection(self.RangeValues[new][0])
+ wx.CallAfter(self.RefreshRange)
+ else:
+ current = self.CanvasZoom.GetSelection()
+ new = max(0, min(current - rotation, len(ZOOM_VALUES) - 1))
+ if new != current:
+ self.CurrentZoom = ZOOM_VALUES[new][1]
+ self.CanvasZoom.SetStringSelection(ZOOM_VALUES[new][0])
+ wx.CallAfter(self.NewDataAvailable, True)
+ event.Skip()
+
+ ## Reset the last cursor
+ def ResetLastCursor(self):
+ self.LastCursor = None
+
+ ## Draw the cursor on graphic
+ # @param dc The draw canvas
+ # @param cursor The cursor parameters
+ def DrawCursor(self, dc, cursor, value):
+ if self.StartTick <= cursor <= self.EndTick:
+ # Prepare temporary dc for drawing
+ width = self.Canvas._Buffer.GetWidth()
+ height = self.Canvas._Buffer.GetHeight()
+ tmp_Buffer = wx.EmptyBitmap(width, height)
+ dcs = wx.MemoryDC()
+ dcs.SelectObject(tmp_Buffer)
+ dcs.Clear()
+ dcs.BeginDrawing()
+
+ dcs.SetPen(wx.Pen(wx.RED))
+ dcs.SetBrush(wx.Brush(wx.RED, wx.SOLID))
+ dcs.SetFont(self.Canvas._getFont(self.Canvas._fontSizeAxis))
+
+ # Calculate clipping region
+ graphics, xAxis, yAxis = self.Canvas.last_draw
+ p1 = numpy.array([xAxis[0], yAxis[0]])
+ p2 = numpy.array([xAxis[1], yAxis[1]])
+ cx, cy, cwidth, cheight = self.Canvas._point2ClientCoord(p1, p2)
+
+ px, py = self.Canvas.PositionUserToScreen((float(cursor), 0.))
+
+ # Draw line cross drawing for diaplaying time cursor
+ dcs.DrawLine(px, cy + 1, px, cy + cheight - 1)
+
+ text = "X:%d\nY:%f"%(cursor, value)
+ w, h = dcs.GetTextExtent(text)
+ # Draw time cursor date
+ dcs.DrawText(text, min(px + 3, cx + cwidth - w), cy + 3)
+
+ dcs.EndDrawing()
+
+ #this will erase if called twice
+ dc.Blit(0, 0, width, height, dcs, 0, 0, wx.EQUIV) #(NOT src) XOR dst
+
+ ## Refresh the variable cursor.
+ # @param dc The draw canvas
+ def RefreshCursor(self, dc=None):
+ if dc is None:
+ dc = wx.BufferedDC(wx.ClientDC(self.Canvas.canvas), self.Canvas._Buffer)
+
+ # Erase previous time cursor if drawn
+ if self.LastCursor is not None:
+ self.DrawCursor(dc, *self.LastCursor)
+
+ # Draw new time cursor
+ if self.CursorIdx is not None:
+ self.LastCursor = self.Datas[self.CursorIdx]
+ self.DrawCursor(dc, *self.LastCursor)