beremiz: comparison controls/DebugVariablePanel/DebugVariableGraphicViewer.py

equal deleted inserted replaced

-:2a70d5240300
+:21164625b393
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 from __future__ import absolute_import
-from types import TupleType
+from __future__ import division
 from time import time as gettime
 from cycler import cycler
 import numpy
 import wx
 import matplotlib.pyplot
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wxagg import _convert_agg_to_wx_bitmap
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 from mpl_toolkits.mplot3d import Axes3D
+from six.moves import xrange
 from editors.DebugViewer import REFRESH_PERIOD
 from controls.DebugVariablePanel.DebugVariableViewer import *
 from controls.DebugVariablePanel.GraphButton import GraphButton
 message = None
 # Check that data is valid regarding DebugVariablePanel
 try:
 values = eval(data)
-if not isinstance(values, TupleType):
+if not isinstance(values, tuple):
 raise ValueError
 except Exception:
 message = _("Invalid value \"%s\" for debug variable") % data
 values = None
 else:
 _width, height = self.ParentControl.GetSize()
 # Get Before which Viewer the variable has to be moved or added
 # according to the position of mouse in Viewer.
-if y > height / 2:
+if y > height // 2:
 target_idx += 1
 # Drag'n Drop is an internal is an internal move inside Debug
 # Variable Panel
 if len(values) > 2 and values[2] == "move":
 w, h = button.GetSize()
 if direction in [wx.LEFT, wx.RIGHT]:
 x = rect.x + (- w - offset
 if direction == wx.LEFT
 else rect.width + offset)
-y = rect.y + (rect.height - h) / 2
+y = rect.y + (rect.height - h) // 2
 offset += w
 else:
-x = rect.x + (rect.width - w) / 2
+x = rect.x + (rect.width - w) // 2
 y = rect.y + (- h - offset
 if direction == wx.TOP
 else rect.height + offset)
 offset += h
 button.SetPosition(x, y)
 # Move graph along X coordinate
 self.ParentWindow.SetCanvasPosition(
 self.StartCursorTick +
 (self.MouseStartPos.x - event.x) *
-(end_tick - start_tick) / rect.width)
+(end_tick - start_tick) // rect.width)
 def OnCanvasScroll(self, event):
 """
 Function called when a wheel mouse is use in Viewer
 @param event: Mouse event
 if self.GraphType == GRAPH_ORTHOGONAL:
 start_tick, end_tick = self.ParentWindow.GetRange()
 tick = (start_tick + end_tick) / 2.
 else:
 tick = event.xdata
-self.ParentWindow.ChangeRange(int(-event.step) / 3, tick)
+self.ParentWindow.ChangeRange(int(-event.step) // 3, tick)
 # Vetoing event to prevent parent panel to be scrolled
 self.ParentWindow.VetoScrollEvent = True
 def OnLeftDClick(self, event):
 _width, height = self.GetSize()
 # Mouse is over Viewer figure and graph is not 3D
 bbox = self.GetAxesBoundingBox()
 if bbox.InsideXY(x, y) and not self.Is3DCanvas():
-rect = wx.Rect(bbox.x, bbox.y, bbox.width / 2, bbox.height)
+rect = wx.Rect(bbox.x, bbox.y, bbox.width // 2, bbox.height)
 # Mouse is over Viewer left part of figure
 if rect.InsideXY(x, y):
 self.SetHighlight(HIGHLIGHT_LEFT)
 # Mouse is over Viewer right part of figure
 else:
 self.SetHighlight(HIGHLIGHT_RIGHT)
 # Mouse is over upper part of Viewer
-elif y < height / 2:
+elif y < height // 2:
 # Viewer is upper one in Debug Variable Panel, show highlight
 if self.ParentWindow.IsViewerFirst(self):
 self.SetHighlight(HIGHLIGHT_BEFORE)
 # Viewer is not the upper one, show highlight in previous one
 self.Axes.set_ylim(y_min, y_max)
 # Get value and forced flag for each variable displayed in graph
 # If cursor tick is not defined get value and flag of last received
 # or get value and flag of variable at cursor tick
-values, forced = apply(zip, [(
+args = [(
 item.GetValue(self.CursorTick)
 if self.CursorTick is not None
-else (item.GetValue(), item.IsForced())
+else (item.GetValue(), item.IsForced())) for item in self.Items]
-) for item in self.Items])
+values, forced = zip(*args)
 # Get path of each variable displayed simplified using panel variable
 # name mask
 labels = [item.GetVariable(self.ParentWindow.GetVariableNameMask())
 for item in self.Items]
 # rectangle on left or right part of figure depending on highlight type
 elif self.Highlight in [HIGHLIGHT_LEFT, HIGHLIGHT_RIGHT]:
 destGC.SetPen(HIGHLIGHT['DROP_PEN'])
 destGC.SetBrush(HIGHLIGHT['DROP_BRUSH'])
-x_offset = (bbox.width / 2
+x_offset = (bbox.width // 2
 if self.Highlight == HIGHLIGHT_RIGHT
 else 0)
 destGC.DrawRectangle(bbox.x + x_offset, bbox.y,
-bbox.width / 2, bbox.height)
+bbox.width // 2, bbox.height)
 # Draw other Viewer common elements
 self.DrawCommonElements(destGC, self.GetButtons())
 destGC.EndDrawing()

changeset 2459	21164625b393
parent 2450	5024c19ca8f0
child 3303	0ffb41625592