From 4d0ce55f6e269a050563ea0eb795bcbeeda03ce7 Mon Sep 17 00:00:00 2001
From: Walther Neuper <neuper@neuper.(none)>
Date: Tue, 15 Dec 2009 09:17:30 +0000
Subject: collect_table --> calc; new set_select_exerc_semaphore

---
diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index 63b08f2..3c2120b 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -86,6 +86,7 @@ class Collection:
         if(self._active_exerc == None):
             # at startup
             self._active_exerc = coll_key
+            self._display.set_select_exerc_semaphore(coll_key)
             self._coach.notify(('exerc-selected', coll_key))
         elif(self._active_exerc == coll_key):
             # hit the same button once more
@@ -93,6 +94,7 @@ class Collection:
         elif(self._active_exerc != coll_key):
             # switched to another exercise
             self._active_exerc = coll_key
-            self._display.switch_exercise()
+            self._display.switch_exercise() # TODO rename
+            self._display.set_select_exerc_semaphore(coll_key)
             self._coach.notify(('exerc-selected', coll_key))
             
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index ac0381e..fca2c58 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -22,9 +22,10 @@ class Display:
         self._permanent_gui_elements(window)
         self.errors = 0
         self._ex = None        # WN091214 ???
-        self._ex_key = None    # 
         self._sett = None      # setting updated by callbacks during input
-        self.running = False   # first round of calculations WN091214 ???
+        self.running = False   # switch settings_/feedback_table TODO rename
+        self._coll_key = None  # semaphore for self.finish_collect_callback
+                               # and Collection.select_exerc_callback
 
     def register(self, sess, co, learner):
         """register _after_ Session and Coach have been instantiated"""
@@ -378,3 +379,6 @@ class Display:
         self.table.attach(self.feedback_table, 1, 2, 0, 5)
         self.feedback_table.show()
             
+    def set_select_exerc_semaphore(self, coll_key):
+        """ Sets a semaphore for finish_collect_callback. """
+        self._coll_key = coll_key
--
cgit v0.9.1