anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Convert Canvas.py to Canvas2 under pysollib.

Browse source
This commit is contained in:
Shlomi Fish 2017-06-03 20:48:12 +03:00
parent 748a287f93
commit 779c703709
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Canvas.py → pysollib/ui/tktile/Canvas2.py
View file

25
pysollib/ui/tktile/tkcanvas.py
View file

@ -30,7 +30,8 @@ __all__ = ['MfxCanvasGroup',
# imports # imports
from six.moves import tkinter from six.moves import tkinter
import Canvas from pysollib.ui.tktile.Canvas2 import CanvasText, Group, Line, Rectangle
from pysollib.ui.tktile.Canvas2 import ImageItem as ImageItem2
# PySol imports # PySol imports
from pysollib.mfxutil import Image, ImageTk from pysollib.mfxutil import Image, ImageTk
@ -43,9 +44,9 @@ from pysollib.ui.tktile.tkutil import unbind_destroy, loadImage
# * canvas items # * canvas items
# ************************************************************************ # ************************************************************************
class MfxCanvasGroup(Canvas.Group): class MfxCanvasGroup(Group):
def __init__(self, canvas, tag=None): def __init__(self, canvas, tag=None):
Canvas.Group.__init__(self, canvas=canvas, tag=tag) Group.__init__(self, canvas=canvas, tag=tag)
# register ourself so that we can unbind from the canvas # register ourself so that we can unbind from the canvas
assert self.id not in self.canvas.items assert self.id not in self.canvas.items
self.canvas.items[self.id] = self self.canvas.items[self.id] = self
@ -55,13 +56,13 @@ class MfxCanvasGroup(Canvas.Group):
def delete(self): def delete(self):
del self.canvas.items[self.id] del self.canvas.items[self.id]
Canvas.Group.delete(self) Group.delete(self)
def gettags(self): def gettags(self):
return self.canvas.tk.splitlist(self._do("gettags")) return self.canvas.tk.splitlist(self._do("gettags"))
class MfxCanvasImage(Canvas.ImageItem): class MfxCanvasImage(ImageItem2):
def __init__(self, canvas, x, y, **kwargs): def __init__(self, canvas, x, y, **kwargs):
self.init_coord = x, y self.init_coord = x, y
group = None group = None
@ -70,7 +71,7 @@ class MfxCanvasImage(Canvas.ImageItem):
del kwargs['group'] del kwargs['group']
if 'image' in kwargs: if 'image' in kwargs:
self._image = kwargs['image'] self._image = kwargs['image']
Canvas.ImageItem.__init__(self, canvas, x, y, **kwargs) ImageItem2.__init__(self, canvas, x, y, **kwargs)
if group: if group:
self.addtag(group) self.addtag(group)
@ -85,21 +86,21 @@ class MfxCanvasImage(Canvas.ImageItem):
self.config(state='hidden') self.config(state='hidden')
MfxCanvasLine = Canvas.Line MfxCanvasLine = Line
class MfxCanvasRectangle(Canvas.Rectangle): class MfxCanvasRectangle(Rectangle):
def __init__(self, canvas, *args, **kwargs): def __init__(self, canvas, *args, **kwargs):
group = None group = None
if 'group' in kwargs: if 'group' in kwargs:
group = kwargs['group'] group = kwargs['group']
del kwargs['group'] del kwargs['group']
Canvas.Rectangle.__init__(self, canvas, *args, **kwargs) Rectangle.__init__(self, canvas, *args, **kwargs)
if group: if group:
self.addtag(group) self.addtag(group)
class MfxCanvasText(Canvas.CanvasText): class MfxCanvasText(CanvasText):
def __init__(self, canvas, x, y, preview=-1, **kwargs): def __init__(self, canvas, x, y, preview=-1, **kwargs):
self.init_coord = x, y self.init_coord = x, y
self.x, self.y = x, y self.x, self.y = x, y
@ -113,7 +114,7 @@ class MfxCanvasText(Canvas.CanvasText):
if 'group' in kwargs: if 'group' in kwargs:
group = kwargs['group'] group = kwargs['group']
del kwargs['group'] del kwargs['group']
Canvas.CanvasText.__init__(self, canvas, x, y, **kwargs) CanvasText.__init__(self, canvas, x, y, **kwargs)
self.text_format = None self.text_format = None
canvas._text_items.append(self) canvas._text_items.append(self)
if group: if group:
@ -271,7 +272,7 @@ class MfxCanvas(tkinter.Canvas):
assert self.items == {} assert self.items == {}
def findCard(self, stack, event): def findCard(self, stack, event):
if isinstance(stack.cards[0].item, Canvas.Group): if isinstance(stack.cards[0].item, Group):
current = self.gettags("current") # get tags current = self.gettags("current") # get tags
for i in range(len(stack.cards)): for i in range(len(stack.cards)):
if stack.cards[i].item.tag in current: if stack.cards[i].item.tag in current:

4
tests/style/py-flake8.t
View file

@ -12,7 +12,6 @@ use String::ShellQuote qw/ shell_quote /;
my %skip = ( my %skip = (
map { $_ => 1 } map { $_ => 1 }
qw( qw(
./Canvas.py
pysollib/games/__init__.py pysollib/games/__init__.py
pysollib/games/mahjongg/__init__.py pysollib/games/mahjongg/__init__.py
pysollib/games/mahjongg/mahjongg1.py pysollib/games/mahjongg/mahjongg1.py
@ -21,8 +20,9 @@ my %skip = (
pysollib/games/special/__init__.py pysollib/games/special/__init__.py
pysollib/games/ultra/__init__.py pysollib/games/ultra/__init__.py
pysollib/pysoltk.py pysollib/pysoltk.py
scripts/all_games.py
pysollib/tile/ttk.py pysollib/tile/ttk.py
pysollib/ui/tktile/Canvas2.py
scripts/all_games.py
) )
); );