diff options
author | Christian Mayer <christian.mayer@student.tugraz.at> | 2010-01-11 14:52:36 (GMT) |
---|---|---|
committer | Christian Mayer <christian.mayer@student.tugraz.at> | 2010-01-11 14:52:36 (GMT) |
commit | ce820f7f223b77819f9d79600f89424568033856 (patch) | |
tree | 8c48baf42cd249f5cf4e131304ac4c7af6741b67 | |
parent | 1fd6f43d88c760f1253d96dd21bbd763386f7745 (diff) | |
parent | c6757efd0ed3195d746d9f10c9f458175f53e9fd (diff) |
Merge branch 'master' of git://git.sugarlabs.org/rp/mainline
-rwxr-xr-x | ReckonPrimer.activity/display.py | 1 | ||||
-rwxr-xr-x | ReckonPrimer.activity/exercises/exaddsimp.py | 11 | ||||
-rwxr-xr-x | ReckonPrimer.activity/exercises/exercise.py | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py index 9e2d062..a1f9fcd 100755 --- a/ReckonPrimer.activity/display.py +++ b/ReckonPrimer.activity/display.py @@ -87,6 +87,7 @@ class Display: self.log_view.show() self.scrolled_window.show() + # 3 tables as overlays with same 15 lines and 6 columns self.settings_table = gtk.Table (14, 9, True) self.collection_table = gtk.Table(14, 9, True) diff --git a/ReckonPrimer.activity/exercises/exaddsimp.py b/ReckonPrimer.activity/exercises/exaddsimp.py index d4dc222..3b76590 100755 --- a/ReckonPrimer.activity/exercises/exaddsimp.py +++ b/ReckonPrimer.activity/exercises/exaddsimp.py @@ -481,13 +481,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/exercises/exercise.py b/ReckonPrimer.activity/exercises/exercise.py index c3bfcc9..3049a4e 100755 --- a/ReckonPrimer.activity/exercises/exercise.py +++ b/ReckonPrimer.activity/exercises/exercise.py @@ -9,7 +9,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. @@ -40,7 +40,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): |