NEPPEL: found flaw in make_input_remainder

3 files changed, 21 insertions, 19 deletions

diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index 3554b33..ab141af 100755
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -88,9 +88,9 @@ class Display:
         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)
-        self.feedback_table = gtk.Table  (14, 9, True)
+        self.settings_table = gtk.Table  (14, 10, True)
+        self.collection_table = gtk.Table(14, 10, True)
+        self.feedback_table = gtk.Table  (14, 10, True)
         
         # Insert the 3 tables into the right half of the screen
         self.table.attach(self.settings_table,  1, 2, 0, 5)
@@ -156,7 +156,7 @@ class Display:
         self.name_label = gtk.Label(self.name)
         self.name_label.modify_font(pango.FontDescription("sans 16"))
         #self.feedback_table.attach(self.name_label, 0, 6, 13, 14)
-        self.feedback_table.attach(self.name_label, 0, 9, 13, 14)
+        self.feedback_table.attach(self.name_label, 0, 10, 13, 14)
         
         # Section for progress bar
         self.progressbar = gtk.ProgressBar(adjustment=None)
@@ -166,7 +166,7 @@ class Display:
         style.bg[gtk.STATE_PRELIGHT] = gtk.gdk.color_parse("green")
         self.progressbar.set_style (style)
         self.progressbar.set_fraction(0)      
-        self.feedback_table.attach(self.progressbar, 0, 9, 8, 9)
+        self.feedback_table.attach(self.progressbar, 0, 10, 8, 9)
 
         # Labels for progress bar
         self.progress0 = gtk.Label("0")
@@ -212,12 +212,12 @@ class Display:
         self.progress_total = gtk.Label(str(self.total_calcs))
         self.progress_total.modify_font(pango.FontDescription("sans 16"))
         #self.feedback_table.attach(self.progress_total, 5, 6, 9, 10 )
-        self.feedback_table.attach(self.progress_total, 8, 9, 9, 10 )
+        self.feedback_table.attach(self.progress_total, 9, 10, 9, 10 )
         self.progress_total.show()
         
         self.sfb_butt = gtk.Button(None, gtk.STOCK_STOP) 
         self.sfb_butt.connect("clicked", self.release_feedb_callback)     
-        self.feedback_table.attach(self.sfb_butt, 0, 9, 13, 14)
+        self.feedback_table.attach(self.sfb_butt, 0, 10, 13, 14)
         self.sfb_alignment = self.sfb_butt.get_children()[0]
         self.sfb_hbox = self.sfb_alignment.get_children()[0]
         self.sfb_image, self.sfb_label = self.sfb_hbox.get_children()
@@ -382,12 +382,12 @@ class Display:
         """ Another exercise has been selected. """
         #WN091215 DAS IST AB JETZT FALSCH: ex<->sett + ex<->coll moeglich
         self.settings_table.destroy()
-        self.settings_table = gtk.Table(14, 9, True)
+        self.settings_table = gtk.Table(14, 10, True)
         self.table.attach(self.settings_table, 1, 2, 0, 5)
         self.settings_table.show()
         
         self.feedback_table.destroy()
-        self.feedback_table = gtk.Table(14, 9, True)
+        self.feedback_table = gtk.Table(14, 10, True)
         self.table.attach(self.feedback_table, 1, 2, 0, 5)
         self.feedback_table.show()
             
@@ -412,7 +412,7 @@ class Display:
         # button switching from collect_table to settings_table
         self.sts_butt = gtk.Button("")
         self.sts_butt.connect("clicked", self.switch_learner_to_setts)
-        self.collection_table.attach(self.sts_butt, 8, 9, 13, 14)
+        self.collection_table.attach(self.sts_butt, 9, 10, 13, 14)
         self.sts_alignment = self.sts_butt.get_children()[0]
         self.sts_butt.show()    
 
diff --git a/ReckonPrimer.activity/extimesdiv.py b/ReckonPrimer.activity/extimesdiv.py
index afda57c..4d62fb8 100755
--- a/ReckonPrimer.activity/extimesdiv.py
+++ b/ReckonPrimer.activity/extimesdiv.py
@@ -170,12 +170,12 @@ _dic['shuffle_inner'], _dic['remainder'], _dic['vadd'], _dic['vmult']))
 
         self.label = gtk.Label("=")
         self.label.modify_font(pango.FontDescription("sans 12"))
-        self._display.settings_table.attach(self.label, 3, 4, 9, 10 )
+        self._display.settings_table.attach(self.label, 5, 6, 9, 10 )
         self.label.show()
 
         self.label = gtk.Label("2")
         self.label.modify_font(pango.FontDescription("sans 12"))
-        self._display.settings_table.attach(self.label, 4, 5, 9, 10 )
+        self._display.settings_table.attach(self.label, 6, 7, 9, 10 )
         self.label.show()
 
         self.toggle_shuffle_all = gtk.ToggleButton("@")
@@ -213,7 +213,7 @@ style.zoom(12)))
         self.toggle_times_label.modify_font(pango.FontDescription("sans %d" %
 style.zoom(12)))
         self.toggle_times.connect("toggled", self.toggle_times_callback)
-        self._display.settings_table.attach(self.toggle_times, 7, 8, 9, 10 )
+        self._display.settings_table.attach(self.toggle_times, 8, 9, 9, 10 )
         self.toggle_times.show()
 
         self.toggle_commute = gtk.ToggleButton("<")
@@ -221,7 +221,7 @@ style.zoom(12)))
         self.toggle_commute_label.modify_font(pango.FontDescription("sans %d" %
 style.zoom(12)))
         self.toggle_commute.connect("toggled", self.toggle_commute_callback)
-        self._display.settings_table.attach(self.toggle_commute, 7, 8, 10, 11 )
+        self._display.settings_table.attach(self.toggle_commute, 8, 9, 10, 11 )
         self.toggle_commute.show()
 
         self.toggle_div = gtk.ToggleButton("<")
@@ -229,7 +229,7 @@ style.zoom(12)))
         self.toggle_div_label.modify_font(pango.FontDescription("sans %d" %
 style.zoom(12)))
         self.toggle_div.connect("toggled", self.toggle_div_callback)
-        self._display.settings_table.attach(self.toggle_div, 7, 8, 12, 13 )
+        self._display.settings_table.attach(self.toggle_div, 8, 9, 12, 13 )
         self.toggle_div.show()
 
         self.toggle_in = gtk.ToggleButton("<")
@@ -247,7 +247,7 @@ style.zoom(12)))
         self.toggle_vadd_label.modify_font(pango.FontDescription("sans %d" %
 style.zoom(12)))
         self.toggle_vadd.connect("toggled", self.toggle_vadd_callback)
-        self._display.settings_table.attach(self.toggle_vadd, 1, 2, 1, 9 )
+        self._display.settings_table.attach(self.toggle_vadd, 2, 3, 1, 10 )
         self.toggle_vadd.show()
 
         self.toggle_vmult = gtk.ToggleButton("0")
@@ -255,7 +255,7 @@ style.zoom(12)))
         self.toggle_vmult_label.modify_font(pango.FontDescription("sans %d" %
 style.zoom(12)))
         self.toggle_vmult.connect("toggled", self.toggle_vmult_callback)
-        self._display.settings_table.attach(self.toggle_vmult, 3, 4, 1, 9 )
+        self._display.settings_table.attach(self.toggle_vmult, 4, 5, 1, 10 )
         self.toggle_vmult.show()
 
         ###end new buttons by martinn########################################
@@ -268,7 +268,7 @@ 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, 2, 3, 11-i, 12-i)
+            self._display.settings_table.attach(self.toggle, 3, 4, 10-i, 11-i)
             self.toggle.show()
             self.number_butts.append(self.toggle)
 
diff --git a/ReckonPrimer.activity/functions.py b/ReckonPrimer.activity/functions.py
index 0c8f646..cd8d4ba 100755
--- a/ReckonPrimer.activity/functions.py
+++ b/ReckonPrimer.activity/functions.py
@@ -225,7 +225,9 @@ def make_input(coll_calc, linepos):
 

 

 def make_input_remainder(strs, res, rem):

-    """make the 2 lines for input result and remainder with ':' and 'in'"""

+    """make the line for input result and remainder with ':' and 'in'.

+    res:     , rem:

+    """

     #print('in make_input_remainder: len(strs)=', len(strs))

     #print('in make_input_remainder: strs=', strs)

     #print('in make_input_remainder: res=', res, ', rem=', rem)