Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2357 from timrid/numpy-v1.20-deprecations

Browse Source 
Since numpy 1.20 the aliases `np.int` and `np.float` are deprecated (…
This commit is contained in:
Scott Talbert
2023-02-28 10:21:30 -05:00
committed by GitHub
parent 71ed075c78 516539a7a0
commit f370f70b1c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/floatcanvas/BouncingBall.py
View File

@@ -21,7 +21,7 @@ if ver == 'installed': ## import the installed version
from wx.lib.floatcanvas import FloatCanvas
print("using installed version:", wx.lib.floatcanvas.__version__)
elif ver == 'local':
## import a local version
## import a local version
import sys
sys.path.append("..")
from floatcanvas import NavCanvas
@@ -49,7 +49,7 @@ class MovingObjectMixin: # Borrowed from MovingElements.py
class Ball(MovingObjectMixin, FloatCanvas.Circle):
def __init__(self, XY, Velocity, Radius=2.0, **kwargs):
self.Velocity = np.asarray(Velocity, np.float).reshape((2,))
self.Velocity = np.asarray(Velocity, float).reshape((2,))
self.Radius = Radius
self.Moving = False
FloatCanvas.Circle.__init__(self, XY, Diameter=Radius*2, FillColor="red", **kwargs)

2
samples/floatcanvas/PixelBitmap.py
View File

@@ -49,7 +49,7 @@ class PixelBitmap:
else:
raise FC.FloatCanvasError("PixelBitmap takes only a wx.Bitmap or a wx.Image as input")
self.XY = np.asarray(XY, dtype=np.int).reshape((2,))
self.XY = np.asarray(XY, dtype=int).reshape((2,))
self.Position = Position
(self.Width, self.Height) = self.Bitmap.GetWidth(), self.Bitmap.GetHeight()

6
wx/lib/plot/polyobjects.py
View File

@@ -616,7 +616,7 @@ class PolyMarker(PolyPoints):
def _circle(self, dc, coords, size=1):
fact = 2.5 * size
wh = 5.0 * size
rect = np.zeros((len(coords), 4), np.float) + [0.0, 0.0, wh, wh]
rect = np.zeros((len(coords), 4), float) + [0.0, 0.0, wh, wh]
rect[:, 0:2] = coords - [fact, fact]
dc.DrawEllipseList(rect.astype(np.int32))
@@ -627,7 +627,7 @@ class PolyMarker(PolyPoints):
def _square(self, dc, coords, size=1):
fact = 2.5 * size
wh = 5.0 * size
rect = np.zeros((len(coords), 4), np.float) + [0.0, 0.0, wh, wh]
rect = np.zeros((len(coords), 4), float) + [0.0, 0.0, wh, wh]
rect[:, 0:2] = coords - [fact, fact]
dc.DrawRectangleList(rect.astype(np.int32))
@@ -1199,7 +1199,7 @@ class PolyBoxPlot(PolyPoints):
size = 0.5
fact = 2.5 * size
wh = 5.0 * size
rect = np.zeros((len(pt_data), 4), np.float) + [0.0, 0.0, wh, wh]
rect = np.zeros((len(pt_data), 4), float) + [0.0, 0.0, wh, wh]
rect[:, 0:2] = pt_data - [fact, fact]
dc.DrawRectangleList(rect.astype(np.int32))