Add indicator of whether all keys are ready

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / mapping.py

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 66d860d9bcf58b7ca747e4102a4b37f1838abebc..e800778f9ad0f5d9fee7b3a5a0fe85cdd992808f 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -1,6 +1,7 @@
 from kivy.uix.relativelayout import RelativeLayout
-from kivy.properties import NumericProperty
+from kivy.properties import NumericProperty, ListProperty
 from kivy.core.window import Window
+from kivy.clock import Clock
 
 import threading
 import pygame
@@ -12,6 +13,7 @@ from .music_file import *
 
 class Mapping(RelativeLayout):
     expected_keys = NumericProperty(0)
+    ready_color = ListProperty([1, 165/255, 0, 1])
 
     def __init__(self, **kwargs):
         self.key_config, self.channel_number, self.open_files = self.parse_config()
@@ -19,6 +21,7 @@ class Mapping(RelativeLayout):
         self._keyboard = Window.request_keyboard(self._keyboard_closed, self)
         self._keyboard.bind(on_key_down=self._on_keyboard_down)
         self.running = []
+        Clock.schedule_interval(self.not_all_keys_ready, 1)
 
 
         pygame.mixer.init(frequency = 44100)
@@ -57,6 +60,15 @@ class Mapping(RelativeLayout):
                 return key
         return None
 
+    def not_all_keys_ready(self, dt):
+        for key in self.children:
+            if not type(key).__name__ == "Key":
+                continue
+            if not key.is_key_ready:
+                return True
+        self.ready_color = [0, 1, 0, 1]
+        return False
+
     def stop_all_running(self):
         self.running = []
 
@@ -86,9 +98,20 @@ class Mapping(RelativeLayout):
 
         for key in config['key_properties']:
             if key not in key_properties:
+                key_prop = config['key_properties'][key]
+                if 'include' in key_prop:
+                    included = key_prop['include']
+                    del(key_prop['include'])
+
+                    if isinstance(included, str):
+                        key_prop.update(aliases[included], **key_prop)
+                    else:
+                        for included_ in included:
+                            key_prop.update(aliases[included_], **key_prop)
+
                 key_properties[key] = {
                     "actions":    [],
-                    "properties": config['key_properties'][key],
+                    "properties": key_prop,
                     "files":      []
                 }