exmult.py: sett butts OK

3 files changed, 56 insertions, 25 deletions

diff --git a/ReckonPrimer.activity/display.py b/ReckonPrimer.activity/display.py
index aac4c31..e9e3389 100644
--- a/ReckonPrimer.activity/display.py
+++ b/ReckonPrimer.activity/display.py
@@ -561,7 +561,7 @@ class Display:
         self.flc_alignment = self.flc_butt.get_children()[0]
         self.flc_hbox = self.flc_alignment.get_children()[0]
         self.flc_image, self.flc_label = self.flc_hbox.get_children()
-        print('###display.set_coll_to_learner: flc_butt.show()')
+        #print('###display.set_coll_to_learner: flc_butt.show()')
         self.flc_label.set_label("Start")
         self.flc_butt.show()
         #disabled by default: waiting for a task to be selected
diff --git a/ReckonPrimer.activity/exercises/exaddsimp.py b/ReckonPrimer.activity/exercises/exaddsimp.py
index f252b87..079ce02 100644
--- a/ReckonPrimer.activity/exercises/exaddsimp.py
+++ b/ReckonPrimer.activity/exercises/exaddsimp.py
@@ -282,35 +282,29 @@ class ExAddSimp(Exercise):
             if ( i == 5 ):
                 self.toggle_pos5_lower.set_active(True)
 
-    #**** callbacks ********************************************************
+    #**** callbacks ********************************************
 
     def toggle_number_callback(self, widget, i):
 
         if widget.get_active():
             if(i < self._sett['min']):
                 self._sett['min'] = i
-                self.set_buttons(self._sett)
-            elif( i > self._sett['max'] ):
+            elif(i > self._sett['max']):
                 self._sett['max'] = i
-                self.set_buttons(self._sett)
-
         else:
-            if( i == self._sett['min'] ):
-                if( self._sett['min'] == self._sett['max'] ):
+            if(i == self._sett['min']):
+                if(self._sett['min'] == self._sett['max']):
                     widget.set_active(True)
                 else:
                     self._sett['min'] = i+1
-                self.set_buttons(self._sett)
-
-            elif( i == self._sett['max'] ):
-                if( self._sett['min'] == self._sett['max'] ):
+            elif(i == self._sett['max']):
+                if( self._sett['min'] == self._sett['max']):
                     widget.set_active(True)
                 else:
                     self._sett['max'] = i-1
-                self.set_buttons(self._sett)
-
             else:
                 widget.set_active(True)
+        self.set_buttons(self._sett)
         #BEGIN LPCHANGE
         self._dis_generated_calcs('digit '+ str(i))
         #END LPCHANGE 
diff --git a/ReckonPrimer.activity/exercises/exmult.py b/ReckonPrimer.activity/exercises/exmult.py
index 397412f..3785dbe 100644
--- a/ReckonPrimer.activity/exercises/exmult.py
+++ b/ReckonPrimer.activity/exercises/exmult.py
@@ -137,10 +137,10 @@ class ExMult(Exercise):
         _max_length = 6 #FIXXXME class variable of ExMult
         _max_width = 9  #FIXXXME class variable of Display
         self.len1_butts = []
-        for i in range(_max_length):
+        for i in range(_max_length): #len of left factor
             self.toggle = gtk.ToggleButton(str(_max_length-i))
             self.toggle_label = self.toggle.get_child()
-            self.toggle.modify_font(pango.FontDescription("sans 12"))
+            self.toggle_label.modify_font(pango.FontDescription("sans 12"))
             self.toggle.connect("toggled", self.set_len1_callback, i)
             self._dis.settings_table.attach(self.toggle, 0+i, 1+i, 3, 4)
             self.toggle.show()
@@ -193,8 +193,8 @@ class ExMult(Exercise):
     ### set buttons ##################################################
 
     def set_buttons(self, sett): #FIXME remove sett
-        print('##### exmult set_buttons')
-        _max_length = 6 #FIXXXME class variable !
+        print('---exmult set_buttons')
+        _max_length = 6 #FIXXXME Display._max_length !
         for i in range(_max_length):
             if  i < _max_length -  self._sett['fact1']:
                 self.len1_butts[i].set_active(False)
@@ -209,15 +209,52 @@ class ExMult(Exercise):
     ### callbacks ####################################################
 
     def set_len1_callback(self, widget, clickno):
-        print('##### exmult set_len1_callback, clickno=', clickno)
-        _max_length = 6 #FIXXXME class variable !
-        self._sett['fact1'] = _max_length - clickno +1
-        print("##### exmult set_len1_callback, self._sett['fact1']=",\
-              self._sett['fact1'])
-        print("##### exmult set_len1_callback, self.display._sett['fact1']=",\
-              self.display._sett['fact1'])
+        _max_length = 6 #FIXXXME class variable of ExMult
+        print('exmult.set_len1_callback, clickno=',clickno)
+        if widget.get_active(): #gtk made just active
+            print('exmult.set_len1_callback,.get_active()=True')
+            if(_max_length - clickno > self._sett['fact1']):
+                print('exmult.set_len1_callback, le-cl > fact1')
+                self._sett['fact1'] = _max_length - clickno
+            elif(_max_length - clickno < 2):
+                print('exmult.set_len1_callback, le-cl < 2')
+                pass # not less then "1" button
+        else: #gtk made just inactive (before was active)
+            print('exmult.set_len1_callback,.get_active()=False')
+            if(_max_length - clickno == self._sett['fact1']):
+                print('exmult.set_len1_callback, le-cl == fact1')
+                if(_max_length - clickno < 2):
+                    print('exmult.set_len1_callback, le-cl < 2')
+                    widget.set_active(True)
+                else:
+                    print('exmult.set_len1_callback, le-cl >= 2')
+                    self._sett['fact1'] = _max_length - clickno -1
+            else:
+                print('exmult.set_len1_callback, le-cl != fact1')
+                widget.set_active(True)
         self.set_buttons(self._sett)
 
+
+###############################################
+#        self._sett['fact1'] = _max_length - clickno +1
+#        print("##### exmult set_len1_callback, self._sett['fact1']=",\
+#              self._sett['fact1'])
+#        print("##### exmult set_len1_callback, self.display._sett['fact1']=",\
+#              self.display._sett['fact1'])
+#        self.set_buttons(self._sett)
+
+
+
+
+
+
+
+
+
+
+
+
+
     def set_len2_callback(self, widget, i):
         #max len of right factor can NOT YET be changed
         #due to limited _generate_calcs, format