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

Fix floatcanvas Arrow, Point, Bitmap drawings

Browse Source 
Convert float to int for dc.DrawXXX methods
This commit is contained in:
Kazuya O'moto
2025-05-08 00:04:00 +09:00
parent 4320e9da00
commit 46a7fbdda8
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,7 @@ class Polygon(PointsObjectMixin, LineAndFillMixin, DrawObject):
self.SetBrush(FillColor,FillStyle) self.SetBrush(FillColor,FillStyle)
def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel = None, HTdc=None): def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel = None, HTdc=None):
Points = WorldToPixel(self.Points)#.tolist() Points = WorldToPixel(self.Points)
dc.SetPen(self.Pen) dc.SetPen(self.Pen)
dc.SetBrush(self.Brush) dc.SetBrush(self.Brush)
dc.DrawPolygon(Points) dc.DrawPolygon(Points)
@@ -886,7 +886,7 @@ class Arrow(XYObjectMixin, LineOnlyMixin, DrawObject):
def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None): def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
dc.SetPen(self.Pen) dc.SetPen(self.Pen)
xy = WorldToPixel(self.XY) xy = WorldToPixel(self.XY)
ArrowPoints = xy + self.ArrowPoints ArrowPoints = (xy + self.ArrowPoints).astype(int)
dc.DrawLines(ArrowPoints) dc.DrawLines(ArrowPoints)
if HTdc and self.HitAble: if HTdc and self.HitAble:
HTdc.SetPen(self.HitPen) HTdc.SetPen(self.HitPen)
@@ -964,11 +964,11 @@ class ArrowLine(PointsObjectMixin, LineOnlyMixin, DrawObject):
def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None): def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
Points = WorldToPixel(self.Points) Points = WorldToPixel(self.Points)
ArrowPoints = Points[1:,np.newaxis,:] + self.ArrowPoints ArrowPoints = (Points[1:,np.newaxis,:] + self.ArrowPoints).astype(int)
dc.SetPen(self.Pen) dc.SetPen(self.Pen)
dc.DrawLines(Points) dc.DrawLines(Points)
for arrow in ArrowPoints: for arrow in ArrowPoints:
dc.DrawLines(arrow) dc.DrawLines(arrow)
if HTdc and self.HitAble: if HTdc and self.HitAble:
HTdc.SetPen(self.HitPen) HTdc.SetPen(self.HitPen)
HTdc.DrawLines(Points) HTdc.DrawLines(Points)
@@ -1065,7 +1065,7 @@ class PointSet(PointsObjectMixin, ColorOnlyMixin, DrawObject):
if len(Points) > 100: if len(Points) > 100:
xy = Points xy = Points
xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Diameter ), 1 ) xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Diameter ), 1 )
dc.DrawEllipseList(xywh) dc.DrawEllipseList(xywh.astype(int))
else: else:
for xy in Points: for xy in Points:
dc.DrawCircle(xy[0],xy[1], radius) dc.DrawCircle(xy[0],xy[1], radius)
@@ -1080,7 +1080,7 @@ class PointSet(PointsObjectMixin, ColorOnlyMixin, DrawObject):
if len(Points) > 100: if len(Points) > 100:
xy = Points xy = Points
xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Diameter ), 1 ) xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Diameter ), 1 )
HTdc.DrawEllipseList(xywh) HTdc.DrawEllipseList(xywh.astype(int))
else: else:
for xy in Points: for xy in Points:
HTdc.DrawCircle(xy[0],xy[1], radius) HTdc.DrawCircle(xy[0],xy[1], radius)
@@ -2151,10 +2151,10 @@ class ScaledBitmap(TextObjectMixin, DrawObject):
def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None): def _Draw(self, dc , WorldToPixel, ScaleWorldToPixel, HTdc=None):
XY = WorldToPixel(self.XY) XY = WorldToPixel(self.XY)
H = ScaleWorldToPixel(self.Height)[0] H = ScaleWorldToPixel(self.Height)[0]
W = H * (self.bmpWidth / self.bmpHeight) W = int(H * (self.bmpWidth / self.bmpHeight))
if (self.ScaledBitmap is None) or (H != self.ScaledHeight) : if (self.ScaledBitmap is None) or (H != self.ScaledHeight) :
self.ScaledHeight = H self.ScaledHeight = H
Img = self.Image.Scale(int(W), int(H)) Img = self.Image.Scale(W, H)
self.ScaledBitmap = wx.Bitmap(Img) self.ScaledBitmap = wx.Bitmap(Img)
XY = self.ShiftFun(XY[0], XY[1], W, H) XY = self.ShiftFun(XY[0], XY[1], W, H)
@@ -2439,7 +2439,7 @@ class DotGrid:
if len(Points) > 100: if len(Points) > 100:
xy = Points xy = Points
xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Size ), 1 ) xywh = np.concatenate((xy-radius, np.ones(xy.shape) * self.Size ), 1 )
dc.DrawEllipseList(xywh) dc.DrawEllipseList(xywh.astype(int))
else: else:
for xy in Points: for xy in Points:
dc.DrawCircle(xy[0],xy[1], radius) dc.DrawCircle(xy[0],xy[1], radius)