Ex*(dis)-->Ex*(dis,sett)

8 files changed, 39 insertions, 12 deletions

diff --git a/ReckonPrimer.activity/coach.py b/ReckonPrimer.activity/coach.py
index 19ee1f7..6503857 100755
--- a/ReckonPrimer.activity/coach.py
+++ b/ReckonPrimer.activity/coach.py
@@ -5,6 +5,7 @@ import pprint
 import pickle
 from settings import Settings
 from display import Display
+#WN.LV remove these after new collection
 from exercise import Exercise
 from exaddsimp import ExAddSimp
 from expassten import ExPassTen
@@ -40,9 +41,9 @@ class Coach:
         """TODO version preliminary until exs are stored on disk"""
 
         ['addsub_simp', 'passten', 'times_div']
-        _ex1 = ExAddSimp(self._dis)
-        _ex2 = ExPassTen(self._dis)
-        _ex3 = ExTimesDiv(self._dis)
+        _ex1 = ExAddSimp(self._dis, None)
+        _ex2 = ExPassTen(self._dis, None)
+        _ex3 = ExTimesDiv(self._dis, None)
         return[_ex1, _ex2, _ex3]
 
     def _update_exs(self, ex):
@@ -82,8 +83,7 @@ class Coach:
             self._dis.offer_setting(self._ex)
 
     def get_ex(self, tpc):
-        """Get an Exercise by topic. TODO get by ID if exs are stored on disk.
-        """
+        """ Get an Exercise by topic. """
         for _t in self._exs:
             if _t.get_topic() == tpc:
                 return _t
diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index ac57d1e..a1293a8 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -6,14 +6,22 @@ import pango
 import random
 import copy
 from sugar.graphics import style
+
 from settings import Settings
 from coach import Coach
 
+from exaddsimp import ExAddSimp
+from exaddsub import ExAddSub
+from expassten import ExPassTen
+from exmult import ExMult
+from extimesdiv import ExTimesDiv
+from extimesadd import ExTimesAdd
+
 class Collection:
 
     def __init__(self, display, coach):
         self._sett = Settings()
-        # these data should come from pickle (see code in Settings)
+        #WN.LV diese Daten via pickle.load(...) holen 
         self._data = [self._sett.get_setting('addsub_simp'),
                       self._sett.get_setting('passten'),
                       self._sett.get_setting('times_div')]
@@ -21,6 +29,25 @@ class Collection:
         self._coach = coach
         self._active_topic = None
 
+#    def select(self, key):
+#        """ Select an exercise by key. """
+#        #WN.LV Code ersetzen, key NICHT fuer Listen sondern fuer ...
+#        _sett = self._data[key]
+#        if _sett['topic'] == 'addsub_simp':
+#            return ExAddSimp(self._display, _sett)
+#        elif _sett['topic'] == 'exaddsub':
+#            return ExAddSub(self._display, _sett)
+#        elif _sett['topic'] == 'passten':
+#            return ExPassTen(self._display, _sett)
+#        elif _sett['topic'] == 'exmult':
+#            return ExMult(self._display, _sett)
+#        elif _sett['topic'] == 'times_div':
+#            return ExTimesDiv(self._display, _sett)
+#        elif _sett['topic'] == 'extimesadd':
+#            return ExTimesAdd(self._display, _sett)
+#        else:
+#            raise Exception()
+
     def define_coll_gui(self):
         """ Define gui-elements for presenting the collcetion. """
         #WN.LV diesen Code ersetzen !!!!!
diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index 6df7c87..95b94a1 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -13,7 +13,7 @@ from exercise import Exercise
 from functions import *
 
 class ExAddSimp(Exercise):
-    def __init__(self, dis):
+    def __init__(self, dis, sett):
         self._display = dis
         self._sett = {'topic'  : 'addsub_simp',
          'title' : 'template exaddsimp',
diff --git a/ReckonPrimer.activity/exaddsub.py b/ReckonPrimer.activity/exaddsub.py
index 36db2f0..710bd80 100644
--- a/ReckonPrimer.activity/exaddsub.py
+++ b/ReckonPrimer.activity/exaddsub.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExAddSub(Exercise):
-    def __init__(self, display):
+    def __init__(self, display, sett):
         pass
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/exmult.py b/ReckonPrimer.activity/exmult.py
index 4d6259b..72f0f98 100644
--- a/ReckonPrimer.activity/exmult.py
+++ b/ReckonPrimer.activity/exmult.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExMult(Exercise):
-    def __init__(self, display):
+    def __init__(self, display, sett):
         pass
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/expassten.py b/ReckonPrimer.activity/expassten.py
index a3b0ce9..d2eb483 100755
--- a/ReckonPrimer.activity/expassten.py
+++ b/ReckonPrimer.activity/expassten.py
@@ -12,7 +12,7 @@ import pango
 from sugar.graphics import style
 
 class ExPassTen(Exercise):
-    def __init__(self, dis):
+    def __init__(self, dis, sett):
         self._display = dis
         self._sett = {'topic'        : 'passten',
          'title' : 'template expassten',
diff --git a/ReckonPrimer.activity/extimesadd.py b/ReckonPrimer.activity/extimesadd.py
index 7d975b1..a819930 100644
--- a/ReckonPrimer.activity/extimesadd.py
+++ b/ReckonPrimer.activity/extimesadd.py
@@ -5,7 +5,7 @@
 from exercise import Exercise
 
 class ExTimesAdd(Exercise):
-    def __init__(self, display):
+    def __init__(self, display, sett):
         pass
 
     def _generate_calcs(self):
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index 6dbad17..85d238d 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -12,7 +12,7 @@ from exercise import Exercise
 from functions import *
 
 class ExTimesDiv(Exercise):
-    def __init__(self, dis):
+    def __init__(self, dis, sett):
         self._display = dis
         self._sett = {'topic'        : 'times_div',
          'title' : 'template extimesdiv',