Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalther Neuper <neuper@neuper.(none)>2010-01-10 13:27:17 (GMT)
committer Walther Neuper <neuper@neuper.(none)>2010-01-10 13:27:17 (GMT)
commitf9e162fa577a2a9d56b76938695ce86e823dbe50 (patch)
tree98876a2e665f47961283a747c278ee9f806f829b
parent85b7106d4b6db01c902a7be0f947d035efd1b62c (diff)
cleanups
-rwxr-xr-xReckonPrimer.activity/exaddsimp.py11
-rwxr-xr-xReckonPrimer.activity/exercise.py6
2 files changed, 11 insertions, 6 deletions
diff --git a/ReckonPrimer.activity/exaddsimp.py b/ReckonPrimer.activity/exaddsimp.py
index 9c8338d..aa1dd42 100755
--- a/ReckonPrimer.activity/exaddsimp.py
+++ b/ReckonPrimer.activity/exaddsimp.py
@@ -449,13 +449,16 @@ class ExAddSimp(Exercise):
self.toggle_pos3_lower.set_active(False)
if( self.toggle_pos3_lower.get_active() ):
- self._display._sett['=input'] = list(set(self._display._sett['=input']) | set([3]))
+ self._display._sett['=input'] = list(
+ set(self._display._sett['=input']) | set([3]))
else:
- if( self.toggle_equal_fixed_left.get_active() ):
- if( not self.toggle_pos1_lower.get_active() and not self.toggle_pos5_lower.get_active() ):
+ if(self.toggle_equal_fixed_left.get_active()):
+ if(not self.toggle_pos1_lower.get_active() and
+ not self.toggle_pos5_lower.get_active()):
self.toggle_pos3_lower.set_active(True)
else:
- self._display._sett['=input'] = list(set(self._display._sett['=input']) - set([3]))
+ self._display._sett['=input'] = list(
+ set(self._display._sett['=input']) - set([3]))
def toggle_pos5_lower_callback(self, widget):
if( self.toggle_equal_fixed_left.get_active() ):
diff --git a/ReckonPrimer.activity/exercise.py b/ReckonPrimer.activity/exercise.py
index c824214..09d83ce 100755
--- a/ReckonPrimer.activity/exercise.py
+++ b/ReckonPrimer.activity/exercise.py
@@ -6,7 +6,7 @@ class Exercise:
"""This is the base class for the individual exercises.
An exercise is characterized by a topic. A topic determines the
fields of the settings self._sett and public methods of Exercise.
- The values of self._sett may vary from exercise to exercise.
+ The values of self._sett may vary between exercises within 1 topic.
"""
def __init__(self):
""" An Exercise stores data on evaluation, i.e date, duration TODO.
@@ -37,7 +37,9 @@ class Exercise:
self._calcs = self._generate_calcs()
def get_calcs(self):
- """ Get all calculations generated by the current settings. """
+ """ Newly generate all calculations according to current settings
+ and return all calculations. """
+ self._calcs = self._generate_calcs()
return self._calcs
def get_next_calc(self):