Skip to content

Fix floatcanvas Text.ShiftFunDict: convert float to int #2749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

Fix floatcanvas Text.ShiftFunDict: convert float to int #2749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions wx/lib/floatcanvas/FCObjects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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
Expand Down Expand Up @@ -1434,13 +1434,13 @@ def LayoutText(self):
## pad is the extra space around the text
## 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),
'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),
'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),
'cr': lambda x, y, w, h, world=0, pad=0: (x - w - 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),
'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) ,
'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)}

class Text(TextObjectMixin, DrawObject):
Expand Down Expand Up @@ -2582,7 +2582,7 @@ def __init__(self,
Default class constructor.

: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.
:param `Values`: sequence of values you want to make the chart of.
:param `FillColors`: sequence of colors you want the slices. If
Expand Down Expand Up @@ -2627,7 +2627,7 @@ def SetFillColors(self, FillColors):

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)
"""
Expand Down Expand Up @@ -2715,7 +2715,7 @@ def __init__(self, ObjectList=[], InForeground=False, IsVisible=True):
self.ObjectList = []
DrawObject.__init__(self, InForeground, IsVisible)

# this one uses a proprty for _Canvas...
# this one uses a property for _Canvas...
self._Actual_Canvas = None

self.CalcBoundingBox()
Expand Down
Loading