plcopeneditor_history: comparison GraphicViewer.py

equal deleted inserted replaced

-:02e8c6e882af
+:6a376615142e
 parent.AddWindow(self.ResetButton, 0, border=5, flag=wx.ALL)
 parent.AddWindow(self.CurrentButton, 0, border=5, flag=wx.ALL)
 def _init_coll_RangeSizer_Growables(self, parent):
 # generated method, don't edit
-parent.AddGrowableCol(3)
+parent.AddGrowableCol(5)
 parent.AddGrowableRow(0)
 def _init_sizers(self):
 # generated method, don't edit
 self.MainGridSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=0)
 # Initialize Viewer mode to Selection mode
 self.Mode = MODE_SELECTION
 self.Datas = []
 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.Ticktime = 0#self.DataProducer.GetTicktime()
 self.RefreshCanvasRange()
 for zoom_txt, zoom in ZOOM_VALUES:
 self.CanvasZoom.Append(zoom_txt)
 self.CanvasZoom.SetSelection(0)
 wx.CallAfter(self.Canvas.canvas.SetCursor, wx.StockCursor(wx.CURSOR_HAND))
 def ResetView(self, register=False):
 self.Datas = []
 self.StartTick = 0
-self.EndTick = 0
 self.StartIdx = 0
 self.EndIdx = 0
+self.CursorIdx = None
 self.Fixed = False
 self.Ticktime = self.DataProducer.GetTicktime()
 if register:
 self.AddDataConsumer(self.InstancePath.upper(), self)
+self.ResetLastCursor()
 self.RefreshCanvasRange()
 self.RefreshView()
 def RefreshNewData(self, *args, **kwargs):
 self.RefreshView(*args, **kwargs)
 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)
+self.EndIdx = self.GetNearestData(self.StartTick + self.CurrentRange, 1)
 def ResetBounds(self):
 self.StartIdx = None
 self.EndIdx = None
 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 force or not self.Fixed or (len(self.Datas) > 0 and self.StartTick + self.CurrentRange > self.Datas[-1][0]):
 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:
 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),
+xAxis=(self.StartTick, self.StartTick + self.CurrentRange),
 yAxis=(self.YCenter - Yrange * 1.1 / 2, self.YCenter + Yrange * 1.1 / 2))
+# Reset and draw cursor
+self.ResetLastCursor()
+self.RefreshCursor()
 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):
+print tick, value
 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:
+if not self.Fixed or tick < self.StartTick + self.CurrentRange:
 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:
 self.GetBounds()
 self.Fixed = False
 self.ResetBounds()
 if self.Fixed:
 self.StartTick = min(self.StartTick, self.Datas[-1][0] - self.CurrentRange)
 else:
-self.StartTick = max(self.Datas[0][0], self.EndTick - self.CurrentRange - 1)
+self.StartTick = max(self.Datas[0][0], self.Datas[-1][0] - self.CurrentRange)
-self.EndTick = self.StartTick + self.CurrentRange
 self.NewDataAvailable(True)
 def OnRangeChanged(self, event):
 try:
 if self.Ticktime == 0:
 event.Skip()
 def OnPositionChanging(self, event):
 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):
 event.Skip()
 def OnCurrentButton(self, event):
 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:
+if len(self.Datas) > 0:
-self.Dragging = True
+if self.Mode == MODE_SELECTION:
-pos = self.Canvas.PositionScreenToUser(event.GetPosition())
+self.Dragging = True
-self.CursorIdx = self.GetNearestData(pos[0], -1)
+pos = self.Canvas.PositionScreenToUser(event.GetPosition())
-self.RefreshCursor()
+self.CursorIdx = self.GetNearestData(pos[0], -1)
-elif self.Mode == MODE_MOTION:
+self.RefreshCursor()
-self.GetBounds()
+elif self.Mode == MODE_MOTION:
-self.CurrentMousePos = event.GetPosition()
+self.GetBounds()
-self.CurrentMotionValue = self.Datas[self.StartIdx][0]
+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:
 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:
+elif self.CurrentMousePos is not None and len(self.Datas) > 0:
 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.StartTick = max(self.Datas[0][0], min(self.CurrentMotionValue, self.Datas[-1][0] - self.CurrentRange))
-self.EndTick = self.StartTick + self.CurrentRange
 self.CurrentMousePos = event.GetPosition()
 self.NewDataAvailable(True)
 event.Skip()
 def OnCanvasMouseWheel(self, event):
 ## 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:
+if self.StartTick <= cursor <= self.StartTick + self.CurrentRange:
 # Prepare temporary dc for drawing
 width = self.Canvas._Buffer.GetWidth()
 height = self.Canvas._Buffer.GetHeight()
 tmp_Buffer = wx.EmptyBitmap(width, height)
 dcs = wx.MemoryDC()
 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)
+lines = ("X:%d\nY:%f" % (cursor, value)).splitlines()
-w, h = dcs.GetTextExtent(text)
-# Draw time cursor date
+wtext = 0
-dcs.DrawText(text, min(px + 3, cx + cwidth - w), cy + 3)
+for line in lines:
+w, h = dcs.GetTextExtent(line)
+wtext = max(wtext, w)
+offset = 0
+for line in lines:
+# Draw time cursor date
+dcs.DrawText(line, min(px + 3, cx + cwidth - wtext), cy + 3 + offset)
+w, h = dcs.GetTextExtent(line)
+offset += h
 dcs.EndDrawing()
 #this will erase if called twice
 dc.Blit(0, 0, width, height, dcs, 0, 0, wx.EQUIV)  #(NOT src) XOR dst

changeset 665	6a376615142e
parent 660	30c0371ac086
child 668	e858ff2f7862