From 61c08754e0cc0f41e2d27b3ea94b00b14970d8f6 Mon Sep 17 00:00:00 2001 From: Walther Neuper Date: Mon, 11 Jan 2010 14:55:21 +0000 Subject: Merge branch 'master' of git://git.sugarlabs.org/rp/mifixs-clone --- diff --git a/ReckonPrimer.activity/coach.py b/ReckonPrimer.activity/coach.py index 57f95bd..310538d 100755 --- a/ReckonPrimer.activity/coach.py +++ b/ReckonPrimer.activity/coach.py @@ -32,13 +32,16 @@ class Coach: # calls back with notify('exerc-selected'... OR 'switch-to-setts' def exercise_selected(self, key): + self._dis.init_calc() self._ex = self._collect.select(key) self._learner.start_calcs(self._ex) def switch_to_settings(self, key): self._ex = self._collect.select(key) + self._dis.init_calc() self._dis.offer_setting(self._ex) def settings_done(self, settings): self._ex.update_setting(settings) + self._dis.init_calc() self._learner.start_calcs(self._ex) diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py index d1c085d..a1f9fcd 100755 --- a/ReckonPrimer.activity/display.py +++ b/ReckonPrimer.activity/display.py @@ -289,6 +289,25 @@ class Display: end_iterator = self.log_buffer.get_end_iter() mark = self.log_buffer.create_mark(None, end_iterator, True) self.log_view.scroll_mark_onscreen(mark) + + def protocol_generated_calcs(self, calculations, change): + print("DEBUG: in display.protocol_generated_calcs") + end_iterator = self.log_buffer.get_end_iter() + self.log_buffer.insert_with_tags_by_name(end_iterator, "\n---------- " + change + " ----------" , "fixxxme!" ) + for c in calculations: + end_iterator = self.log_buffer.get_end_iter() + + #['1', '-', '1', '=', '0'] + to_format = c[0] + printable_calc = to_format[0] + " " + \ + to_format[1] + " " + \ + to_format[2] + " " + \ + to_format[3] + " " + \ + to_format[4] + self.log_buffer.insert_with_tags_by_name(end_iterator, "\n" + printable_calc, "fixxxme!" ) + + mark = self.log_buffer.create_mark(None, end_iterator, True) + self.log_view.scroll_mark_onscreen(mark) def input_digit(self, widget, dig, proterr, protok): """callback: input a digit and give feedback. diff --git a/ReckonPrimer.activity/exercises/exaddsimp.py b/ReckonPrimer.activity/exercises/exaddsimp.py index 3fdc302..2ec1d88 100755 --- a/ReckonPrimer.activity/exercises/exaddsimp.py +++ b/ReckonPrimer.activity/exercises/exaddsimp.py @@ -117,22 +117,16 @@ class ExAddSimp(Exercise): self.toggle_equal_fixed_right = gtk.ToggleButton("<<") self.toggle_label = self.toggle_equal_fixed_right.get_child() - self.toggle_label.modify_font(pango.FontDescription( - "sans %d" % style.zoom(12))) - self.toggle_equal_fixed_right.connect( - "toggled", self.toggle_equal_fixed_right_callback) - self._display.settings_table.attach( - self.toggle_equal_fixed_right, 7, 8, 10, 11 ) + self.toggle_label.modify_font(pango.FontDescription("sans %d" % style.zoom(12))) + self.toggle_equal_fixed_right.connect("toggled", self.toggle_equal_fixed_right_callback) + self._display.settings_table.attach(self.toggle_equal_fixed_right, 5, 6, 10, 11 ) self.toggle_equal_fixed_right.show() self.toggle_equal_fixed_left = gtk.ToggleButton("<<") self.toggle_label = self.toggle_equal_fixed_left.get_child() - self.toggle_label.modify_font(pango.FontDescription( - "sans %d" % style.zoom(12))) - self.toggle_equal_fixed_left.connect( - "toggled", self.toggle_equal_fixed_left_callback) - self._display.settings_table.attach( - self.toggle_equal_fixed_left, 7, 8, 12, 13 ) + self.toggle_label.modify_font(pango.FontDescription("sans %d" % style.zoom(12))) + self.toggle_equal_fixed_left.connect("toggled", self.toggle_equal_fixed_left_callback) + self._display.settings_table.attach(self.toggle_equal_fixed_left, 5, 6, 12, 13 ) self.toggle_equal_fixed_left.show() self.toggle_pos1 = gtk.ToggleButton("--") @@ -233,13 +227,12 @@ class ExAddSimp(Exercise): # Buttons 9 .. 0 self.number_butts = [] - for i in range(0,10+1): + for i in range(0,9+1): self.toggle = gtk.ToggleButton(str(i)) self.toggle_label = self.toggle.get_child() - self.toggle_label.modify_font(pango.FontDescription( - "sans %d" % style.zoom(12))) + self.toggle_label.modify_font(pango.FontDescription("sans %d" % style.zoom(12))) self.toggle.connect("toggled", self.toggle_number_callback, i) - self._display.settings_table.attach(self.toggle, 6, 7, 10-i, 11-i) + self._display.settings_table.attach(self.toggle, 4, 5, 10-i, 11-i) self.toggle.show() self.number_butts.append(self.toggle) @@ -318,37 +311,62 @@ class ExAddSimp(Exercise): else: widget.set_active(True) - + #BEGIN LPCHANGE + self._display_generated_calcs('digit '+ str(i)) + #END LPCHANGE + # callbacks updating the settings def toggle_max_callback(self, widget): if widget.get_active(): self._display._sett['cut-max'] = True + #BEGIN LPCHANGE + self._display_generated_calcs('max') + #END LPCHANGE else: self._display._sett['cut-max'] = False + #BEGIN LPCHANGE + self._display_generated_calcs('no max') + #END LPCHANGE def toggle_plus_callback(self, widget): if widget.get_active(): self._display._sett['+'] = True + #BEGIN LPCHANGE + self._display_generated_calcs('plus') + #END LPCHANGE else: if( self.toggle_minus.get_active() ): self._display._sett['+'] = False + #BEGIN LPCHANGE + self._display_generated_calcs('no plus') + #END LPCHANGE + else: widget.set_active(True) + def toggle_minus_callback(self, widget): if widget.get_active(): self._display._sett['-'] = True + #BEGIN LPCHANGE + self._display_generated_calcs('minus') + #END LPCHANGE else: if( self.toggle_plus.get_active() ): self._display._sett['-'] = False + #BEGIN LPCHANGE + self._display_generated_calcs('no minus') + #END LPCHANGE else: widget.set_active(True) + def toggle_shuffle_callback(self, widget): if widget.get_active(): self._display._sett['shuffle'] = True else: self._display._sett['shuffle'] = False + def toggle_equal_fixed_right_callback(self, widget): if widget.get_active(): @@ -356,14 +374,21 @@ class ExAddSimp(Exercise): self.toggle_pos1.set_active(True) self.toggle_pos3.set_active(True) self.toggle_pos5.set_active(True) + #BEGIN LPCHANGE + self._display_generated_calcs('fixed right') + #END LPCHANGE else: if( self.toggle_equal_fixed_left.get_active() ): self._display._sett['_+_=_'] = False self.toggle_pos1.set_active(False) self.toggle_pos3.set_active(False) self.toggle_pos5.set_active(False) + #BEGIN LPCHANGE + self._display_generated_calcs('unfixed right') + #END LPCHANGE else: widget.set_active(True) + def toggle_equal_fixed_left_callback(self, widget): if widget.get_active(): @@ -371,14 +396,21 @@ class ExAddSimp(Exercise): self.toggle_pos1_lower.set_active(True) self.toggle_pos3_lower.set_active(True) self.toggle_pos5_lower.set_active(True) + #BEGIN LPCHANGE + self._display_generated_calcs('fixed left') + #END LPCHANGE else: if( self.toggle_equal_fixed_right.get_active() ): self._display._sett['_=_+_'] = False self.toggle_pos1_lower.set_active(False) self.toggle_pos3_lower.set_active(False) self.toggle_pos5_lower.set_active(False) + #BEGIN LPCHANGE + self._display_generated_calcs('unfixed left') + #END LPCHANGE else: widget.set_active(True) + def toggle_pos1_callback(self, widget): @@ -501,3 +533,9 @@ class ExAddSimp(Exercise): _subs.append(_c) return _subs +#BEGIN LPCHANGE + def _display_generated_calcs(self, change): + print("DEBUG: in exaddsubsimp._display_generated_calcs()") + self._display.protocol_generated_calcs(self._generate_calcs(), change) +#END LPCHANGE + -- cgit v0.9.1