diff options
| author | Walther Neuper <wneuper@localhost.(none)> | 2010-06-09 06:22:56 (GMT) |
|---|---|---|
| committer | Walther Neuper <wneuper@localhost.(none)> | 2010-06-09 06:22:56 (GMT) |
| commit | 1e70a008079588fe36e70c2137ac8049d19da1ab (patch) | |
| tree | 27b8c16971a6f9c9dbfe0ed436df1a95e3eeaacf /ReckonPrimer.activity | |
| parent | a13c0d19748a52ebadb7d40c613be35d2a518bc9 (diff) | |
exaddsub.py butts WORK
Diffstat (limited to 'ReckonPrimer.activity')
| -rw-r--r-- | ReckonPrimer.activity/exercises/exaddsub.py | 40 | ||||
| -rw-r--r-- | ReckonPrimer.activity/learner.py | 5 |
2 files changed, 8 insertions, 37 deletions
diff --git a/ReckonPrimer.activity/exercises/exaddsub.py b/ReckonPrimer.activity/exercises/exaddsub.py index 5487556..4d62e0a 100644 --- a/ReckonPrimer.activity/exercises/exaddsub.py +++ b/ReckonPrimer.activity/exercises/exaddsub.py @@ -342,21 +342,6 @@ class ExAddSub(Exercise): widget.set_active(True)
self.set_buttons(self._sett)
# #print("###toggle_arrow_callback :self._sett=",self._sett)
-# if widget.get_active():
-# if(i > self._sett['max_pos']):
-# self._sett['max_pos'] = i
-# self.set_buttons(self._sett)
-#
-# else:
-# if(i == self._sett['max_pos']):
-# if(self._sett['min_pos'] == self._sett['max_pos']):
-# widget.set_active(True)
-# else:
-# self._sett['max_pos'] = i-1
-# self.set_buttons(self._sett)
-#
-# else:
-# widget.set_active(True)
def toggle_dice_callback(self, widget, i):
self.dice_butts[i].set_active(False)
@@ -371,8 +356,8 @@ class ExAddSub(Exercise): self._sett['carry'] = False
def toggle_plus_callback(self, widget):
- print('exaddsub.toggle_plus_callback, ops=',
- self._sett['ops'])
+ #print('exaddsub.toggle_plus_callback, ops=',
+ # self._sett['ops'])
if widget.get_active():
if('+' in self._sett['ops']):
pass
@@ -380,21 +365,15 @@ class ExAddSub(Exercise): ins_ord(self._sett['ops'], '+')
else:
if(len(self._sett['ops']) > 1):
- self._sett['factors'].remove('+')
+ self._sett['ops'].remove('+')
else:
pass
self.set_buttons(self._sett)
# if widget.get_active():
-# self._sett['+'] = True
-# else:
-# if(self.toggle_minus.get_active()):
-# self._sett['+'] = False
-# else:
-# widget.set_active(True)
def toggle_minus_callback(self, widget):
- print('exaddsub.toggle_minus_callback, ops=',
- self._sett['ops'])
+ #print('exaddsub.toggle_minus_callback, ops=',
+ # self._sett['ops'])
if widget.get_active():
if('-' in self._sett['ops']):
pass
@@ -402,18 +381,11 @@ class ExAddSub(Exercise): ins_ord(self._sett['ops'], '-')
else:
if(len(self._sett['ops']) > 1):
- self._sett['factors'].remove('-')
+ self._sett['ops'].remove('-')
else:
pass
self.set_buttons(self._sett)
# if widget.get_active():
-# self._sett['-'] = True
-# else:
-# if(self.toggle_plus.get_active()):
-# self._sett['-'] = False
-# else:
-# widget.set_active(True)
-
##### end of public methods #################################
def _alladd(self, min_pos, max_pos, max_calcs):
diff --git a/ReckonPrimer.activity/learner.py b/ReckonPrimer.activity/learner.py index 998e255..c944aad 100644 --- a/ReckonPrimer.activity/learner.py +++ b/ReckonPrimer.activity/learner.py @@ -15,10 +15,9 @@ class Learner: def start_calcs(self, exercise): self._ex = exercise - #print('start calcs: ') #+str(self._ex.get_setting()[min])) _calc = self._ex.get_next_calc() - print('learner.start calcs: _calc = ', _calc) - print('learner.start calcs: carry = ', self._ex._sett['carry']) + #print('learner.start calcs: _calc = ', _calc) + #print('learner.start calcs: carry = ', self._ex._sett['carry']) _lines, self._input = exercise.format(_calc) #print('start calcs: _lines = ', _lines) #print('start calcs: --------------------------------') |