diff options
Diffstat (limited to 'compare3lesson.py')
| -rw-r--r-- | compare3lesson.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/compare3lesson.py b/compare3lesson.py index 93c54d7..ed16676 100644 --- a/compare3lesson.py +++ b/compare3lesson.py @@ -86,17 +86,25 @@ class Compare3Lesson(ObjectArea): self.nextarrow = None self.pose_problem_stage1() - + + self.solution_pending = False + #TODO- Put this code in the ShapeObjects themselves. def check_problem_solved(self): + #print "Compare3Lesson: check_problem_solved called" if self.stage == 1: + if self.solution_pending: + if not self.is_animating(): + #print "Stage 1 Complete" + self.solution_pending = False + self.finish_problem_stage1() + self.pose_problem_stage2() + #print " check_problem_solved calling problem_solved_stage1" - if self.problem_solved_stage1(): - #print "Stage 1 Complete" - self.finish_problem_stage1() - self.pose_problem_stage2() - + elif self.problem_solved_stage1(): + self.solution_pending = True + def register_error(self): #print '\a' self.n_errors += 1 @@ -168,7 +176,7 @@ class Compare3Lesson(ObjectArea): #print "self.recently_used = ", self.recently_used # Uncomment this to choose a particular problem type. - #self.problem_type = 'cutting' + self.problem_type = 'volume' if self.problem_type == 'length': self.problem = LengthProblem(self, self.color_scheme, (self.alphabetical_letter1, self.alphabetical_letter2) ) @@ -251,13 +259,6 @@ class Compare3Lesson(ObjectArea): self.problem.shape2.draggable = False elif self.problem_type == 'volume': self.problem.finish_problem_stage1() - self.problem.shape1.calculate_bounds() - self.problem.shape2.calculate_bounds() - # Make the ShapeObjects inactive. - self.problem.shape1.selected = False - self.problem.shape1.draggable = False - self.problem.shape2.selected = False - self.problem.shape2.draggable = False def pose_problem_stage2(self): #print "pose_problem_stage2 called" |