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

Fix floatcanvas Text.ShiftFunDict: convert float to int

Browse Source 
Fix typo
This commit is contained in:
Kazuya O'moto
2025-05-07 02:52:11 +09:00
parent 85fcadca81
commit 25b325c224
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

@@ -11,7 +11,7 @@
# Tags: phoenix-port, unittest, documented, py3-port # Tags: phoenix-port, unittest, documented, py3-port
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
""" """
This is where FloatCanvas defines its drawings objects. This is where FloatCanvas defines its drawing objects.
""" """
import sys import sys
@@ -1434,13 +1434,13 @@ class TextObjectMixin(XYObjectMixin):
## pad is the extra space around the text ## pad is the extra space around the text
## if world = 1, the vertical shift is done in y-up coordinates ## if world = 1, the vertical shift is done in y-up coordinates
ShiftFunDict = {'tl': lambda x, y, w, h, world=0, pad=0: (x + pad, y + pad - 2*world*pad), ShiftFunDict = {'tl': lambda x, y, w, h, world=0, pad=0: (x + pad, y + pad - 2*world*pad),
'tc': lambda x, y, w, h, world=0, pad=0: (x - w/2, y + pad - 2*world*pad), 'tc': lambda x, y, w, h, world=0, pad=0: (x - w//2, y + pad - 2*world*pad),
'tr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y + pad - 2*world*pad), 'tr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y + pad - 2*world*pad),
'cl': lambda x, y, w, h, world=0, pad=0: (x + pad, y - h/2 + world*h), 'cl': lambda x, y, w, h, world=0, pad=0: (x + pad, y - h//2 + world*h),
'cc': lambda x, y, w, h, world=0, pad=0: (x - w/2, y - h/2 + world*h), 'cc': lambda x, y, w, h, world=0, pad=0: (x - w//2, y - h//2 + world*h),
'cr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h/2 + world*h), 'cr': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h//2 + world*h),
'bl': lambda x, y, w, h, world=0, pad=0: (x + pad, y - h + 2*world*h - pad + world*2*pad) , 'bl': lambda x, y, w, h, world=0, pad=0: (x + pad, y - h + 2*world*h - pad + world*2*pad) ,
'bc': lambda x, y, w, h, world=0, pad=0: (x - w/2, y - h + 2*world*h - pad + world*2*pad) , 'bc': lambda x, y, w, h, world=0, pad=0: (x - w//2, y - h + 2*world*h - pad + world*2*pad) ,
'br': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h + 2*world*h - pad + world*2*pad)} 'br': lambda x, y, w, h, world=0, pad=0: (x - w - pad, y - h + 2*world*h - pad + world*2*pad)}
class Text(TextObjectMixin, DrawObject): class Text(TextObjectMixin, DrawObject):
@@ -2582,7 +2582,7 @@ class PieChart(XYObjectMixin, LineOnlyMixin, DrawObject):
Default class constructor. Default class constructor.
:param `XY`: The (x,y) coords of the center of the chart :param `XY`: The (x,y) coords of the center of the chart
:param `Diameter`: The diamter of the chart in world coords, unless you :param `Diameter`: The diameter of the chart in world coords, unless you
set "Scaled" to False, in which case it's in pixel coords. set "Scaled" to False, in which case it's in pixel coords.
:param `Values`: sequence of values you want to make the chart of. :param `Values`: sequence of values you want to make the chart of.
:param `FillColors`: sequence of colors you want the slices. If :param `FillColors`: sequence of colors you want the slices. If
@@ -2627,7 +2627,7 @@ class PieChart(XYObjectMixin, LineOnlyMixin, DrawObject):
def SetFillStyles(self, FillStyles): def SetFillStyles(self, FillStyles):
""" """
Set te FillStyles and update the Brushes. Set the FillStyles and update the Brushes.
:param `FillStyles`: Fill style you want ("Solid", "Hash", etc) :param `FillStyles`: Fill style you want ("Solid", "Hash", etc)
""" """
@@ -2715,7 +2715,7 @@ class Group(DrawObject):
self.ObjectList = [] self.ObjectList = []
DrawObject.__init__(self, InForeground, IsVisible) DrawObject.__init__(self, InForeground, IsVisible)
# this one uses a proprty for _Canvas... # this one uses a property for _Canvas...
self._Actual_Canvas = None self._Actual_Canvas = None
self.CalcBoundingBox() self.CalcBoundingBox()