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

Merge pull request #2243 from pchemguy/master

Browse Source 
Missing NumPy package reference in FloatCanvas.py
This commit is contained in:
Robin Dunn
2022-08-30 18:46:06 -07:00
committed by GitHub
parent d1802fff0c af3721f167
commit 6afee6af52
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/floatcanvas/DrawBot.py
View File

@@ -14,6 +14,7 @@ I think it's easier with FloatCavnas, and you get zoomign and scrolling to boot!
"""
import wx
from six import moves
from math import *
try: # see if there is a local FloatCanvas to use
@@ -53,7 +54,7 @@ class DrawFrame(wx.Frame):
Canvas = self.Canvas
phi = (sqrt(5) + 1)/2 - 1
oradius = 10.0
for i in xrange(720):
for i in moves.xrange(720):
radius = 1.5 * oradius * sin(i * pi/720)
Color = (255*(i / 720.), 255*( i / 720.), 255 * 0.25)
x = oradius + 0.25*i*cos(phi*i*2*pi)

2
samples/ribbon/ribbonbar_demo.py
View File

@@ -572,7 +572,7 @@ class RibbonFrame(wx.Frame):
(c.Blue() + 192) % 256)
dc.SetTextForeground(foreground)
dc.DrawText(colour, (iWidth - size.GetWidth() + 1) / 2, (iHeight - size.GetHeight()) / 2)
dc.DrawText(colour, int((iWidth - size.GetWidth() + 1) / 2), int((iHeight - size.GetHeight()) / 2))
dc.SelectObjectAsSource(wx.NullBitmap)
item = gallery.Append(bitmap, wx.ID_ANY)

6
wx/lib/floatcanvas/FCObjects.py
View File

@@ -2269,7 +2269,7 @@ class ScaledBitmap2(TextObjectMixin, DrawObject, ):
"""
XY = WorldToPixel(self.XY)
H = ScaleWorldToPixel(self.Height)[0]
W = H * (self.bmpWidth / self.bmpHeight)
W = int(H * (self.bmpWidth / self.bmpHeight))
if (self.ScaledBitmap is None) or (self.ScaledBitmap[0] != (0, 0, self.bmpWidth, self.bmpHeight, W, H) ):
#if True: #fixme: (self.ScaledBitmap is None) or (H != self.ScaledHeight) :
self.ScaledHeight = H
@@ -2689,7 +2689,7 @@ class PieChart(XYObjectMixin, LineOnlyMixin, DrawObject):
dc.SetPen(self.Pen)
for i, brush in enumerate(self.Brushes):
dc.SetBrush( brush )
dc.DrawEllipticArc(Corner[0], Corner[1], WH[0], WH[1], self.Angles[i], self.Angles[i+1])
dc.DrawEllipticArc(int(Corner[0]), int(Corner[1]), int(WH[0]), int(WH[1]), self.Angles[i], self.Angles[i+1])
if HTdc and self.HitAble:
if self.Scaled:
radius = (ScaleWorldToPixel(self.Diameter)/2)[0]# just the x-coord
@@ -2697,7 +2697,7 @@ class PieChart(XYObjectMixin, LineOnlyMixin, DrawObject):
radius = self.Diameter/2
HTdc.SetPen(self.HitPen)
HTdc.SetBrush(self.HitBrush)
HTdc.DrawCircle(CenterXY, radius)
HTdc.DrawCircle(CenterXY.tolist(), int(radius))
class Group(DrawObject):

2
wx/lib/floatcanvas/FloatCanvas.py
View File

@@ -779,7 +779,7 @@ class FloatCanvas(wx.Panel):
BoundingBox = self.BoundingBox
if (BoundingBox is not None) and (not BoundingBox.IsNull()):
self.ViewPortCenter = N.array(((BoundingBox[0,0]+BoundingBox[1,0])/2,
(BoundingBox[0,1]+BoundingBox[1,1])/2 ),float_)
(BoundingBox[0,1]+BoundingBox[1,1])/2 ),N.float_)
self.MapProjectionVector = self.ProjectionFun(self.ViewPortCenter)
# Compute the new Scale
BoundingBox = BoundingBox*self.MapProjectionVector # this does need to make a copy!