Second integration test

eye_keyboard/components/phrase.py

@@ -1,3 +1,5 @@
+# encoding: utf8
+
 import pygame as pg
 
 from hashlib import md5
@@ -32,6 +34,7 @@ def read(self):
         file_path = join('/', 'tmp', file_name)
         with open(file_path, 'w') as f:
             params = st.VOCALWARE_PARAMS
+            self.text = 'espaço'
             params[st.VOCALWARE_TXT] = self.text
             checksum = md5(st.VOCALWARE_MD5_KEY.format(**params)).hexdigest()
             params[st.VOCALWARE_CHECKSUM] = checksum

eye_keyboard/components/table.py

@@ -1,3 +1,5 @@
+# encoding: utf8
+
 import pygame as pg
 
 from collections import defaultdict
@@ -62,11 +64,11 @@ class Table(object):
     SPACE = 'ESPACO'
 
     LABELS = [
-        ['A', 'B', 'C', 'D', 'E', 'F', ''],
+        ['A', 'B', 'C', 'D', 'E', 'F', SPACE],
         ['G', 'H', 'I', 'J', 'K', 'L', 'M'],
         ['N', 'O', 'P', 'Q', 'R', 'S', ''],
         ['T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
-        [SPACE, ERASE, CLEAN, READ, ALERT, QUIT, '']
+        [ERASE, CLEAN, READ, ALERT, QUIT, '', '']
     ]
 
     def __init__(self):

eye_keyboard/control.py

@@ -15,8 +15,7 @@
 
 class Control(object):
 
-    THINK_TIME = 3.0
-    CAPTURE_TIME = 2.5
+    THINK_TIME = 2.5
 
     def __init__(self, tracker):
         self.row_num = 0
@@ -26,7 +25,7 @@ def __init__(self, tracker):
         self.num_frames = 0
         self.press_enter = False
         self.done = False
-        self.wait_time = self.CAPTURE_TIME
+        self.wait_time = self.THINK_TIME
         self.tracker = tracker
         self.eye_threshold = tracker.settings[st.PUPIL_POSITION][1]
         self.screen = self._init_screen()
@@ -45,6 +44,7 @@ def start(self):
             self._wait_loop()
             if self.press_enter or self._move_eyes_upwards():
                 self._execute_choice()
+                self._wait_loop(capture=False)
             else:
                 self._move_table_forward()
 
@@ -54,19 +54,40 @@ def _play_step_sound(self):
             file_name = '{}.wav'.format(self.row_num + 1)
             file_path = join(sound_dir, 'numbers', file_name)
         else:
-            letter = self.table.cells[self.row_num][self.col_num].label.lower()
-            if not letter or letter not in lowercase:
+            label = self.table.cells[self.row_num][self.col_num].label.lower()
+            if not label:
+                return
+            if label == 'voltar':
+                file_name = 'voltar.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label == 'som':
+                file_name = 'som.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label == 'sair':
+                file_name = 'sair.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label == 'limpar':
+                file_name = 'limpar.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label == 'ler':
+                file_name = 'ler.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label == 'espaco':
+                file_name = 'espaco.mp3'
+                file_path = join(sound_dir, file_name)
+            elif label in lowercase:
+                file_name = '{}.mp3'.format(label)
+                file_path = join(sound_dir, 'letters', file_name)
+            else:
                 return
-            file_name = '{}.wav'.format(letter)
-            file_path = join(sound_dir, 'letters', file_name)
         pg.mixer.music.load(file_path)
         pg.mixer.music.play()
 
-    def _wait_loop(self):
+    def _wait_loop(self, capture=True):
         last_time = time()
         while (time() - last_time) < self.wait_time:
             self._update_table()
-            self._update_eye_preview()
+            self._update_eye_preview(capture)
             self._redraw_screen()
             self._event_loop()
 
@@ -78,10 +99,11 @@ def _update_table(self):
                     if self.col_num == -1 or col_num == self.col_num:
                         item.active = True
 
-    def _update_eye_preview(self):
+    def _update_eye_preview(self, capture):
         result = self.tracker.give_me_all(pupilrect=True)
-        self.sum_pupil_y += self.tracker.settings[st.PUPIL_POSITION][1]
-        self.num_frames += 1
+        if capture:
+            self.sum_pupil_y += self.tracker.settings[st.PUPIL_POSITION][1]
+            self.num_frames += 1
         self.eye_preview.update(
             snapshot=result[0],
             pupil_pos=self.tracker.settings[st.PUPIL_POSITION],
@@ -100,13 +122,15 @@ def _event_loop(self):
             if event.type == pg.KEYDOWN:
                 if pg.key.name(event.key) == 'return':
                     self.press_enter = True
+                    print 'ENTER'
                 if pg.key.name(event.key) == 'escape':
                     self.done = True
 
     def _move_eyes_upwards(self):
         avg_pupil_y = self.sum_pupil_y / self.num_frames
         self.sum_pupil_y = 0.0
         self.num_frames = 0
+        print avg_pupil_y, self.eye_threshold
         return avg_pupil_y <= self.eye_threshold
 
     def _move_table_forward(self):
@@ -117,7 +141,6 @@ def _move_table_forward(self):
             if self.col_num == self.table.num_cols:
                 self.row_num = 0
                 self.col_num = -1
-        print self.row_num, self.col_num
 
     def _execute_choice(self):
         if self.col_num == -1: