# HG changeset patch # User Edouard Tisserant # Date 1683730804 -7200 # Node ID e0117f4b0ff14bf5b7b52ec9d724f3bfbb0cb2dc # Parent 836eb9aa4c49f46e54399393751229a7ab8a700d Fix private n matplotib function import diff -r 836eb9aa4c49 -r e0117f4b0ff1 controls/DebugVariablePanel/DebugVariableGraphicViewer.py --- a/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Wed May 10 16:58:15 2023 +0200 +++ b/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Wed May 10 17:00:04 2023 +0200 @@ -31,7 +31,6 @@ import matplotlib 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 @@ -1360,7 +1359,9 @@ FigureCanvasAgg.draw(self) # Get bitmap of figure rendered - self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None) + agg_bitmap = self.get_renderer() + self.bitmap = wx.Bitmap.FromBufferRGBA(int(agg_bitmap.width), int(agg_bitmap.height), + agg_bitmap.buffer_rgba()) # Create DC for rendering graphics in bitmap destDC = wx.MemoryDC() diff -r 836eb9aa4c49 -r e0117f4b0ff1 controls/DebugVariablePanel/DebugVariableViewer.py --- a/controls/DebugVariablePanel/DebugVariableViewer.py Wed May 10 16:58:15 2023 +0200 +++ b/controls/DebugVariablePanel/DebugVariableViewer.py Wed May 10 17:00:04 2023 +0200 @@ -29,7 +29,6 @@ from functools import reduce import wx -from matplotlib.backends.backend_wxagg import _convert_agg_to_wx_bitmap from dialogs.ForceVariableDialog import ForceVariableDialog @@ -303,8 +302,10 @@ srcX = srcBBox.x - (srcPos.x if destBBox.x == 0 else 0) srcY = srcBBox.y - (srcPos.y if destBBox.y == 0 else 0) - srcBmp = _convert_agg_to_wx_bitmap( - srcPanel.get_renderer(), None) + agg_bitmap = srcPanel.get_renderer() + srcBmp = wx.Bitmap.FromBufferRGBA(int(agg_bitmap.width), int(agg_bitmap.height), + agg_bitmap.buffer_rgba()) + srcDC = wx.MemoryDC() srcDC.SelectObject(srcBmp)