X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fkey.py;h=3c98ce74617ef15a7940afdbf4214ad29ce9f796;hb=343822904ee26955e622e325539c64aee1c2112e;hp=9099f00925b28e0764aa4eb6f6afa1743a595993;hpb=1094ab1ac48313b0c1caec15bc4fb6c584efa047;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/key.py b/helpers/key.py
index 9099f00..3c98ce7 100644
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -6,6 +6,7 @@ from kivy.uix.behaviors import ButtonBehavior
 from .action import Action
 from . import debug_print
 import time
+import threading
 from transitions.extensions import HierarchicalMachine as Machine
 
 class Key(ButtonBehavior, Widget):
@@ -17,7 +18,12 @@ class Key(ButtonBehavior, Widget):
         'failed',
         {
             'name': 'loaded',
-            'children': ['no_config', 'no_actions', 'running']
+            'children': [
+                'no_config',
+                'no_actions',
+                'running',
+                'protecting_repeat'
+            ]
         }
     ]
 
@@ -78,7 +84,7 @@ class Key(ButtonBehavior, Widget):
             'trigger': 'run',
             'source': 'loaded',
             'dest': 'loaded_running',
-            'after': 'finish',
+            'after': ['run_actions', 'finish'],
             # if a child, like loaded_no_actions, has no transitions, then it is
             # bubbled to the parent, and we don't want that.
             'conditions': ['is_loaded']
@@ -86,8 +92,13 @@ class Key(ButtonBehavior, Widget):
         {
             'trigger': 'finish',
             'source': 'loaded_running',
+            'dest': 'loaded_protecting_repeat'
+        },
+        {
+            'trigger': 'repeat_protection_finished',
+            'source': 'loaded_protecting_repeat',
             'dest': 'loaded'
-        }
+        },
     ]
 
     key_sym = StringProperty(None)
@@ -111,6 +122,8 @@ class Key(ButtonBehavior, Widget):
     def get_alias_color(self):
         if self.is_loaded_inactive():
             return [1, 1, 1, 1]
+        elif self.is_loaded_protecting_repeat():
+            return [*self.custom_color, 100/255]
         elif self.is_loaded(allow_substates=True):
             return [*self.custom_color, 1]
         elif self.is_failed():
@@ -125,6 +138,8 @@ class Key(ButtonBehavior, Widget):
 
     def __init__(self, **kwargs):
         self.actions = []
+        self.current_action = None
+
         Machine(model=self, states=self.STATES,
                 transitions=self.TRANSITIONS, initial='initial',
                 ignore_invalid_triggers=True, queued=True)
@@ -168,21 +183,28 @@ class Key(ButtonBehavior, Widget):
         else:
             self.no_actions()
 
-    def on_enter_loaded_running(self, modifiers):
+    def run_actions(self, modifiers):
         self.parent.parent.ids['KeyList'].append(self.key_sym)
         debug_print("running actions for {}".format(self.key_sym))
         start_time = time.time()
         self.parent.start_running(self, start_time)
-        action_number = 0
         for self.current_action in self.actions:
             if self.parent.keep_running(self, start_time):
-                self.list_actions(action_number=action_number + 0.5)
+                self.list_actions()
                 self.current_action.run()
-                action_number += 1
-                self.list_actions(action_number=action_number)
+        self.list_actions(last_action_finished=True)
 
         self.parent.finished_running(self, start_time)
 
+    def on_enter_loaded_protecting_repeat(self, modifiers):
+        if 'repeat_delay' in self.config['properties']:
+            self.protecting_repeat_timer = threading.Timer(
+                    self.config['properties']['repeat_delay'],
+                    self.repeat_protection_finished)
+            self.protecting_repeat_timer.start()
+        else:
+            self.repeat_protection_finished()
+
     # This one cannot be in the Machine state since it would be queued to run
     # *after* the loop is ended...
     def interrupt(self):
@@ -217,6 +239,23 @@ class Key(ButtonBehavior, Widget):
     def add_action(self, action_name, **arguments):
         self.actions.append(Action(action_name, self, **arguments))
 
-    def list_actions(self, action_number=0):
-        self.parent.parent.ids['ActionList'].update_list(self, action_number)
-
+    def list_actions(self, last_action_finished=False):
+        not_running = (not self.is_loaded_running())
+        current_action_seen = False
+        action_descriptions = []
+        for action in self.actions:
+            if not_running:
+                state = "inactive"
+            elif last_action_finished:
+                state = "done"
+            elif current_action_seen:
+                state = "pending"
+            elif action == self.current_action:
+                current_action_seen = True
+                state = "current"
+            else:
+                state = "done"
+            action_descriptions.append([action.description(), state])
+        self.parent.parent.ids['ActionList'].update_list(
+                self,
+                action_descriptions)