Kivy/Android

- some refactorings an clean ups

pysollib/kivy/LApp.py

@@ -135,19 +135,59 @@ class LPopCommander(LBase):
 
 
 class LAnimationTask(LTask, LBase):
-    def __init__(self, anim, spos, widget, delay):
+    def __init__(self, spos, widget, **kw):
         super(LAnimationTask, self).__init__(widget.card)
-        self.anim = anim
         self.spos = spos
         self.widget = widget
+
+        x = 0.0
+        y = 0.0
+        duration = 0.2
+        transition = 'in_out_quad'
+        bindE = None
+        bindS = None
+        if 'x' in kw:
+            x = kw['x']
+        if 'y' in kw:
+            y = kw['y']
+        if 'duration' in kw:
+            duration = kw['duration']
+        if 'transition' in kw:
+            transition = kw['transition']
+        if 'bindE' in kw:
+            bindE = kw['bindE']
+        if 'bindS' in kw:
+            bindS = kw['bindS']
+
+        self.delay = duration / 3.0
+
+        self.xdest = x
+        self.ydest = y
+        self.duration = duration
+        self.transition = transition
+        self.bindE = bindE
+        self.bindS = bindS
         print(self.widget.card)
-        self.delay = delay
 
     def start(self):
         super(LAnimationTask, self).start()
+
+        anim = Animation(
+            x=self.xdest, y=self.ydest, duration=self.duration,
+            transition=self.transition)
+
+        if self.bindE is not None:
+            anim.bind(on_complete=self.bindE)
+        if self.bindS is not None:
+            anim.bind(on_start=self.bindS)
+
         self.widget.pos = self.spos
-        self.anim.bind(on_complete=self.stop)
+        anim.bind(on_complete=self.stop)
-        self.anim.start(self.widget)
+        anim.start(self.widget)
+
+    def updateDestPos(self, pos):
+        self.xdest = pos[0]
+        self.ydest = pos[1]
 
 # =============================================================================
 
@@ -178,31 +218,9 @@ class LAnimationMgr(object):
 
             # print('Clock.get_fps() ->', Clock.get_fps())
 
-    def create(self, spos, widget, **kw):
+    def taskInsert(self, task):
-        x = 0.0
-        y = 0.0
-        duration = 0.2
-        transition = 'in_out_quad'
-        if 'x' in kw:
-            x = kw['x']
-        if 'y' in kw:
-            y = kw['y']
-        if 'duration' in kw:
-            duration = kw['duration']
-        if 'transition' in kw:
-            transition = kw['transition']
-
-        anim = Animation(x=x, y=y, duration=duration, transition=transition)
-        if 'bindE' in kw:
-            anim.bind(on_complete=kw['bindE'])
-        if 'bindS' in kw:
-            anim.bind(on_start=kw['bindS'])
-
-        offset = duration / 3.0
-        task = LAnimationTask(anim, spos, widget, offset)
         self.tasks.append(task)
         task.bind(done=self.taskEnd)
-
         Clock.schedule_once(lambda dt: self.taskQ.taskInsert(task), 0.016)
 
 

pysollib/kivy/tkcanvas.py

@@ -282,7 +282,7 @@ class MfxCanvasImage(object):
         self.animation = 0
         self.duration = 0.2
         self.deferred_raises = []
-        self.deferred_pos = []
+        self.animations = []
 
         ed = kwargs['image']
         size = ed.size
@@ -386,12 +386,8 @@ class MfxCanvasImage(object):
         if self.animation == 0:
             image.pos, image.size = self.canvas.CoreToKivy(dpos, dsize)
         else:
-            # Defer to animation. The last position update wins
+            pos, size = self.canvas.CoreToKivy(dpos, dsize)
-            if len(self.deferred_pos) == self.animation:
+            self.animations[self.animation-1].updateDestPos(pos)
-                self.deferred_pos = self.deferred_pos[:-1]
-            if len(self.deferred_pos) < self.animation:
-                pos, size = self.canvas.CoreToKivy(dpos, dsize)
-                self.deferred_pos.append(pos)
 
     def makeAnimStart(self):
         def animStart(anim, widget):
@@ -402,18 +398,6 @@ class MfxCanvasImage(object):
                 self.deferred_raises[0]()
                 self.deferred_raises = self.deferred_raises[1:]
 
-            # fix destination position (hack into animation class - not nice)
-            if self.deferred_pos:
-                widgets = anim._widgets
-                for uid in list(widgets.keys()):
-                    anim = widgets[uid]
-                    p = anim['properties']
-                    # print (p)
-                    p['x'] = (p['x'][0], self.deferred_pos[0][0])
-                    p['y'] = (p['y'][0], self.deferred_pos[0][1])
-                    # print (p)
-                self.deferred_pos = self.deferred_pos[1:]
-
             # update z-order (for some specials)
             while 1:
                 from pysollib.games.grandfathersclock import Clock_RowStack
@@ -449,11 +433,12 @@ class MfxCanvasImage(object):
 
             if self.animation > 0:
                 self.animation -= 1
+                self.animations = self.animations[1:]
 
             if self.animation == 0:
                 # just for the case, keep in sync:
                 self.deferred_raises = []
-                self.deferred_pos = []
+                self.animations = []
 
             # print('MfxCanvasImage: animEnd moved to %s, %s' % (dpos[0], dpos[1])) # noqa
         return animEnd
@@ -480,18 +465,22 @@ class MfxCanvasImage(object):
         if self.canvas.wmain.app.game.demo:
             transition = transition1
 
-        self.animation += 1
         self.duration = duration
         ssize = image.coreSize
         spos = (image.corePos[0], image.corePos[1])
         spos, ssize = self.canvas.CoreToKivy(spos, ssize)
-        LAnimationManager.create(
+
+        from pysollib.kivy.LApp import LAnimationTask
+        task = LAnimationTask(
             spos,
             image,
             x=pos[0], y=pos[1],
             duration=duration, transition=transition,
             bindS=self.makeAnimStart(),
             bindE=self.makeAnimEnd(dpos, dsize))
+        self.animations.append(task)
+        self.animation += 1
+        LAnimationManager.taskInsert(task)
 
     def show(self):
         self.config(state='normal')
@@ -824,7 +813,7 @@ class MfxCanvas(LImage):
     # top-image support
     #
     def tag_raise(self, itm, abitm=None):
-        # print('MfxCanvas: tag_raise, itm=%s, aboveThis=%s' % (itm, abitm))
+        # print('MfxCanvas: tag_raise(%s, %s)' % (itm, abitm))
 
         def findTop(itm):
             t = type(itm)
@@ -835,26 +824,22 @@ class MfxCanvas(LImage):
 
         if (itm is not None):
             if (abitm is None):
-                # print('MfxCanvas: tag_raise: to top')
                 self.remove_widget(itm)
                 self.add_widget(itm, index=findTop(itm))
             else:
-                # print('MfxCanvas: tag_raise: to specified position')
                 self.remove_widget(itm)
                 k = self.children.index(abitm)
                 self.add_widget(itm, index=k)
 
     def tag_lower(self, itm, belowThis=None):
-        print('MfxCanvas: tag_lower(%s, %s)' % (itm, belowThis))
+        # print('MfxCanvas: tag_lower(%s, %s)' % (itm, belowThis))
 
         if (itm is not None):
             if (belowThis is None):
-                # print('MfxCanvas: tag_lower: to bottom')
                 self.remove_widget(itm)
                 k = len(self.children)
                 self.add_widget(itm, index=k)
             else:
-                # print('MfxCanvas: tag_lower: to specified position')
                 self.remove_widget(itm)
                 k = self.children.index(belowThis)
                 k += 1

setup.cfg

@@ -7,7 +7,7 @@ use_bzip2 = 1
 [flake8]
 extend-ignore = H101,H104,H201,H237,H301,H306,H403,H404,H405,
                 # remove some most ugly flakes (proposal)
-                # E231,E302,E305,E741,W293
+                # E231,E302,E305,E701,E741,W293
 
 [sdist]
 force_manifest = 1