Fixed some tabbing issues in amount problems.

4 files changed, 28 insertions, 22 deletions

diff --git a/amountproblem.py b/amountproblem.py
index bf6b9d4..cd5c22c 100644
--- a/amountproblem.py
+++ b/amountproblem.py
@@ -92,12 +92,9 @@ class AmountProblem(Problem):
         #    self.shape1_in_pair = True
         #else:
         #    self.shape1_in_pair = False
-         
-        # Uncomment to place the upper shape in a pair.   
-        #self.shape1_in_pair = True
         
-        #self.problem_number = 6
-        #print "problem_number =", problem_number
+        #self.problem_number = 4
+        #print "problem_number =", self.problem_number
     
         if self.problem_number == 0:
             self.n_shape1 = 6
@@ -383,7 +380,11 @@ class AmountProblem(Problem):
             else:                      
                 return False
             
+        i_to_be_removed = -1
+        j_to_be_removed = -1
+            
         time_to_break_outer_loop = False
+        
         for i in range(0, len(self.shape1)):
             if time_to_break_outer_loop:
                 break
@@ -394,34 +395,39 @@ class AmountProblem(Problem):
                     #print "   New x =", (self.shape1[i].pos.x + self.shape2[j].pos.x)/2
                     #print "   New y =", (self.shape1[i].pos.y + self.shape2[j].pos.y)/2
                     
-                    #self.group_object = GroupObject( Vector((self.shape1[i].pos.x + self.shape2[j].pos.x)/2 - 50, \
-                    #    (self.shape1[i].pos.y + self.shape2[j].pos.y)/2 - 100), \
-                    #    Vector(125, 200), self.shape1[i].color, self.shape1_name, \
-                    #    self.shape2[j].color, self.shape2_name, False, self.container)
-                    
                     self.group_object = GroupObject( Vector((self.shape1[i].pos.x + self.shape2[j].pos.x)/2 - 50, \
                         300), \
                         Vector(125, 200), self.shape1[i].color, self.shape1_name, \
                         self.shape2[j].color, self.shape2_name, False, self.container)
 
-
+                    self.container.add_object(self.group_object)
                     self.group_object.selectable = True
-        
+                    self.container.select_object(self.group_object)
+                    self.container.adjust_tab_order()
+                    
                     self.container.moons_visible = False
                     self.amount_letter1.symbol_visible = False
                     self.amount_letter2.symbol_visible = False
                     
-                    self.container.remove_object(self.shape1[i])
-                    self.shape1.remove(self.shape1[i])
+                    i_to_be_removed = i
+                    j_to_be_removed = j
                     
-                    self.container.remove_object(self.shape2[j])
-                    self.shape2.remove(self.shape2[j])
-                    self.container.add_object(self.group_object)
                     time_to_break_outer_loop = True
                     break
-                
-        if (len(self.shape1) == 0 or len(self.shape2) == 0):
+          
+        if i_to_be_removed != -1:
+            self.shape1[i_to_be_removed].selected = False
+            self.shape1[i_to_be_removed].selectable = False
+            self.container.remove_object(self.shape1[i_to_be_removed])
+            self.shape1.remove(self.shape1[i_to_be_removed])
             
+        if j_to_be_removed != -1:
+            self.shape2[j_to_be_removed].selected = False
+            self.shape2[j_to_be_removed].selectable = False
+            self.container.remove_object(self.shape2[j_to_be_removed])
+            self.shape2.remove(self.shape2[j_to_be_removed])
+                        
+        if (len(self.shape1) == 0 or len(self.shape2) == 0):  
             for i in range(0, self.n_shape1_model):
                 self.container.remove_object(self.shape1_model[i])
             for i in range(0, self.n_shape2_model):
@@ -465,6 +471,7 @@ class AmountProblem(Problem):
                             self.shape2[j].color, self.shape2_name, True, self.container)
                         
                         self.group_object.selectable = True
+                        self.container.select_object(self.group_object)
                         
                         self.container.moons_visible = False
                         self.amount_letter1.symbol_visible = False
diff --git a/compare3lesson.py b/compare3lesson.py
index 3e878d9..93c54d7 100644
--- a/compare3lesson.py
+++ b/compare3lesson.py
@@ -37,7 +37,6 @@ from areaproblem import AreaProblem
 from massproblem import MassProblem
 from volumeproblem import VolumeProblem
 from cuttingproblem import CuttingProblem
-
 import gtk, math, random, rsvg
 
 MOON_SVG = rsvg.Handle('moon.svg')
@@ -128,7 +127,7 @@ class Compare3Lesson(ObjectArea):
             while self.alphabetical_letter2 == self.alphabetical_letter1:
                 self.alphabetical_letter2 = random.choice(['A', 'B', 'C', 'D', 'G', 'H', 'K', 'L', 'M', 'N', 'P', 'S', 'T'])
                 
-        #print "new problem: self.level is: ", self.level        
+        #print "new problem: self.level is: ", self.level
       
         if self.level == 0:
             self.problem_type = 'length'
diff --git a/nextproblemobject.py b/nextproblemobject.py
index 28969b5..8e11de4 100644
--- a/nextproblemobject.py
+++ b/nextproblemobject.py
@@ -67,6 +67,7 @@ class NextProblemObject(Object):
                 or key_name == 'KP_Page_Up' \
                 or key_name == 'KP_Page_Down' \
                 or key_name == 'KP_End' \
+                or key_name == 'Return' \
                 or key_name == 'space':
             self.container.finish_next_problem_arrow()
             return True
diff --git a/objectarea.py b/objectarea.py
index 8f0b8e8..f2c7640 100644
--- a/objectarea.py
+++ b/objectarea.py
@@ -271,7 +271,6 @@ class ObjectArea(gtk.Layout):
         # Tab key selects the next object.

         if key_name == 'Tab' or key_name == 'KP_Home':

             #print "ObjectArea: on_key: key_name was ", key_name

-            

             #print "   There are: ", len(self.objects), "objects"

             if len(self.objects):

                 #print "   The currently selected object is: ", self.selected_object