diff options
author | pmoxhay <pmoxhay@earthlink.net> | 2009-06-03 18:30:38 (GMT) |
---|---|---|
committer | pmoxhay <pmoxhay@earthlink.net> | 2009-06-03 18:30:38 (GMT) |
commit | b9f59225110d47cb04962d7e482c7738bdbeffe3 (patch) | |
tree | 57004b99f0bdb87d5ea1033caa8dab11b35e5c08 | |
parent | ce10acc9fd1b02ca9a455fdf9b098432b622636b (diff) |
Amounts no longer disappear in AnswerBox.
-rw-r--r-- | compare3lesson.py | 2 | ||||
-rw-r--r-- | groupobject.py | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/compare3lesson.py b/compare3lesson.py index 0356866..e40a627 100644 --- a/compare3lesson.py +++ b/compare3lesson.py @@ -140,7 +140,7 @@ class Compare3Lesson(ObjectArea): #print "... so self.problem_type is now: ", self.problem_type # Uncomment this to choose a particular problem type. - #self.problem_type = 'mass' + #self.problem_type = 'amount' if self.problem_type == 'length': self.problem = LengthProblem(self, self.color_scheme, (self.alphabetical_letter1, self.alphabetical_letter2) ) diff --git a/groupobject.py b/groupobject.py index 80fa471..97b3cc6 100644 --- a/groupobject.py +++ b/groupobject.py @@ -88,9 +88,15 @@ class GroupObject(MovableObject): def get_bounds(self): if self.shape1_in_pair: - return self.pos + Vector(-30, 0), self.pos + Vector(200, 200) + return (self.pos + Vector(-30, 0)).scaled(self.amount_scale), (self.pos + Vector(200, 200)).scaled(self.amount_scale) else: - return self.pos + Vector(-30, 0), self.pos + Vector(100, 200) + return (self.pos + Vector(-30, 0)).scaled(self.amount_scale), (self.pos + Vector(100, 200)).scaled(self.amount_scale) + + #def get_bounds(self): + #if self.shape1_in_pair: + # return self.pos + Vector(-30, 0), self.pos + Vector(200, 200) + #else: + # return self.pos + Vector(-30, 0), self.pos + Vector(100, 200) def draw_circle(self, cr, pos, color): cr.save() |