beremiz

Fixed bugs in DebugVariablePanel when matplotlib not installed

2013-03-27, Laurent Bessard
1e5d285864f6
Parents 025ac12cd0d2
Children 741fbce41ec2
Fixed bugs in DebugVariablePanel when matplotlib not installed
1 files changed, 12 insertions(+), 9 deletions(-)
  • +12 -9
    controls/DebugVariablePanel.py
    • --- a/controls/DebugVariablePanel.py Wed Mar 27 09:36:26 2013 +0100
    +++ b/controls/DebugVariablePanel.py Wed Mar 27 23:56:53 2013 +0100
    @@ -305,10 +305,11 @@
    self.ParentControl = None
    def OnDragOver(self, x, y, d):
    - if self.ParentControl is not None:
    - self.ParentControl.OnMouseDragging(x, y)
    - else:
    - self.ParentWindow.RefreshHighlight(x, y)
    + if not isinstance(self.ParentControl, CustomGrid):
    + if self.ParentControl is not None:
    + self.ParentControl.OnMouseDragging(x, y)
    + else:
    + self.ParentWindow.RefreshHighlight(x, y)
    return wx.TextDropTarget.OnDragOver(self, x, y, d)
    def OnDropText(self, x, y, data):
    @@ -372,7 +373,8 @@
    self.ParentWindow.InsertValue(values[0], force=True)
    def OnLeave(self):
    - self.ParentWindow.ResetHighlight()
    + if not isinstance(self.ParentControl, CustomGrid):
    + self.ParentWindow.ResetHighlight()
    return wx.TextDropTarget.OnLeave(self)
    def ShowMessage(self, message):
    @@ -1432,22 +1434,23 @@
    def __init__(self, parent, producer, window):
    wx.Panel.__init__(self, parent, style=wx.SP_3D|wx.TAB_TRAVERSAL)
    - self.SetBackgroundColour(wx.WHITE)
    self.ParentWindow = window
    DebugViewer.__init__(self, producer, True)
    self.HasNewData = False
    + self.Force = False
    if USE_MPL:
    + self.SetBackgroundColour(wx.WHITE)
    +
    main_sizer = wx.BoxSizer(wx.VERTICAL)
    self.Ticks = numpy.array([])
    self.RangeValues = None
    self.StartTick = 0
    self.Fixed = False
    - self.Force = False
    self.CursorTick = None
    self.DraggingAxesPanel = None
    self.DraggingAxesBoundingBox = None
    @@ -2110,10 +2113,10 @@
    self.GraphicPanels.append(panel)
    self.ResetVariableNameMask()
    self.RefreshGraphicsSizer()
    + self.ForceRefresh()
    else:
    self.Table.InsertItem(idx, item)
    -
    - self.ForceRefresh()
    + self.RefreshView()
    def MoveValue(self, iec_path, idx = None):
    if idx is None: