Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-07-21 04:31:09 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle deprecated NumPy type aliases in samples

Browse Source 
These aliases were deprecated in numpy 1.20.0 (January 2021), and removed in 1.24.0 (December 2022)
This helps with NumPy 2 support (June 2024).

Fixes: numpy-deprecated-type-alias (NPY001)
Ruff rule to help transition: https://docs.astral.sh/ruff/rules/numpy-deprecated-type-alias/
This commit is contained in:
Edouard Choinière
2025-02-08 17:11:21 +00:00
parent 6ab1b5ced4
commit a2743ad554
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/floatcanvas/BNAEditor.py
View File

@@ -75,7 +75,7 @@ class BNAData:
num_points = int(line) num_points = int(line)
self.Types.append(Type) self.Types.append(Type)
self.Names.append(Name) self.Names.append(Name)
polygon = np.zeros((num_points,2),np.float) polygon = np.zeros((num_points,2),float)
for i in range(num_points): for i in range(num_points):
polygon[i,:] = map(float, file_.readline().split(',')) polygon[i,:] = map(float, file_.readline().split(','))
self.PointsData.append(polygon) self.PointsData.append(polygon)
@@ -208,7 +208,7 @@ class DrawFrame(wx.Frame):
dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH)) dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
dc.SetLogicalFunction(wx.XOR) dc.SetLogicalFunction(wx.XOR)
if self.SelectedPointNeighbors is None: if self.SelectedPointNeighbors is None:
self.SelectedPointNeighbors = np.zeros((3,2), np.float) self.SelectedPointNeighbors = np.zeros((3,2), float)
#fixme: This feels very inelegant! #fixme: This feels very inelegant!
if Index == 0: if Index == 0:
self.SelectedPointNeighbors[0] = self.SelectedPoly.Points[-1] self.SelectedPointNeighbors[0] = self.SelectedPoly.Points[-1]

4
samples/floatcanvas/BarPlot.py
View File

@@ -27,7 +27,7 @@ def YScaleFun(center):
""" """
# center gets ignored in this case # center gets ignored in this case
return np.array((1, float(NumChannels)/MaxValue), np.float) return np.array((1, float(NumChannels)/MaxValue), float)
def ScaleWorldToPixel(self, Lengths): def ScaleWorldToPixel(self, Lengths):
""" """
@@ -41,7 +41,7 @@ def ScaleWorldToPixel(self, Lengths):
Lengths should be a NX2 array of (x,y) coordinates, or Lengths should be a NX2 array of (x,y) coordinates, or
a 2-tuple, or sequence of 2-tuples. a 2-tuple, or sequence of 2-tuples.
""" """
return np.ceil(( (np.asarray(Lengths, np.float)*self.TransformVector) )).astype('i') return np.ceil(( (np.asarray(Lengths, float)*self.TransformVector) )).astype('i')
class DrawFrame(wx.Frame): class DrawFrame(wx.Frame):

2
samples/floatcanvas/MovingElements.py
View File

@@ -192,7 +192,7 @@ class DrawFrame(wx.Frame):
Points = np.array(((0,0), Points = np.array(((0,0),
(1,0), (1,0),
(0.5, 1)), (0.5, 1)),
np.float) float)
data = (( (0,0), 1), data = (( (0,0), 1),
( (3,3), 2), ( (3,3), 2),

4
samples/floatcanvas/ProcessDiagram.py
View File

@@ -100,8 +100,8 @@ class NodeObject(FC.Group, MovingObjectMixin, ConnectorObjectMixin):
TextColor = "Black", TextColor = "Black",
InForeground = False, InForeground = False,
IsVisible = True): IsVisible = True):
XY = np.asarray(XY, np.float).reshape(2,) XY = np.asarray(XY, float).reshape(2,)
WH = np.asarray(WH, np.float).reshape(2,) WH = np.asarray(WH, float).reshape(2,)
Label = FC.ScaledText(Label, Label = FC.ScaledText(Label,
XY, XY,
Size = WH[1] / 2.0, Size = WH[1] / 2.0,

2
samples/floatcanvas/ScaleDemo.py
View File

@@ -30,7 +30,7 @@ def YScaleFun(center):
""" """
# center gets ignored in this case # center gets ignored in this case
return np.array((5e7, 1), np.float) return np.array((5e7, 1), float)
class DrawFrame(wx.Frame): class DrawFrame(wx.Frame):

2
samples/floatcanvas/TextBox2.py
View File

@@ -62,7 +62,7 @@ class DrawFrame(wx.Frame):
self.Canvas.Bind(FloatCanvas.EVT_LEFT_UP, self.OnLeftUp ) self.Canvas.Bind(FloatCanvas.EVT_LEFT_UP, self.OnLeftUp )
self.Canvas.Bind(FloatCanvas.EVT_LEFT_DOWN, self.OnLeftDown) self.Canvas.Bind(FloatCanvas.EVT_LEFT_DOWN, self.OnLeftDown)
Point = np.array((0,0), np.float) Point = np.array((0,0), float)

4
samples/floatcanvas/Tree.py
View File

@@ -100,8 +100,8 @@ class NodeObject(FC.Group, MovingObjectMixin, ConnectorObjectMixin):
TextColor = "Black", TextColor = "Black",
InForeground = False, InForeground = False,
IsVisible = True): IsVisible = True):
XY = np.asarray(XY, np.float).reshape(2,) XY = np.asarray(XY, float).reshape(2,)
WH = np.asarray(WH, np.float).reshape(2,) WH = np.asarray(WH, float).reshape(2,)
Label = FC.ScaledText(Label, Label = FC.ScaledText(Label,
XY, XY,
Size = WH[1] / 2.0, Size = WH[1] / 2.0,