diff options
author | Walter Bender <walter@sugarlabs.org> | 2013-08-30 20:27:37 (GMT) |
---|---|---|
committer | Walter Bender <walter@sugarlabs.org> | 2013-08-30 20:27:37 (GMT) |
commit | e108487cff19177002f60f1d754f9a205fb91d15 (patch) | |
tree | 3aece82e3a02b1779e69871a7aaa5342e96671ec /TurtleArt/taturtle.py | |
parent | da8a3049fd259954e180e7ce33f90bb36f67f65a (diff) | |
parent | 75b09fa3329de3e2b9a856ba0263ce74d6b28f3f (diff) |
merge from mzepf set_xy takes x, y instead of (x, y)
Diffstat (limited to 'TurtleArt/taturtle.py')
-rw-r--r-- | TurtleArt/taturtle.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py index 1ed557c..8d2afea 100644 --- a/TurtleArt/taturtle.py +++ b/TurtleArt/taturtle.py @@ -157,7 +157,7 @@ class Turtles: # if it is a new turtle, start it in the center of the screen self._active_turtle = self.get_turtle(turtle_name, True, colors) self._active_turtle.set_heading(0.0, False) - self._active_turtle.set_xy((0.0, 0.0), False, pendown=False) + self._active_turtle.set_xy(0.0, 0.0, False, pendown=False) self._active_turtle.set_pen_state(True) elif colors is not None: self._active_turtle = self.get_turtle(turtle_name, False) @@ -562,16 +562,15 @@ class Turtle: int(distance)])) self._turtles.turtle_window.send_event(event) - def set_xy(self, pos, share=True, pendown=True, dragging=False): + def set_xy(self, x, y, share=True, pendown=True, dragging=False): old = self.get_xy() - try: if dragging: - xcor = pos[0] - ycor = pos[1] + xcor = x + ycor = y else: - xcor = pos[0] * self._turtles.turtle_window.coord_scale - ycor = pos[1] * self._turtles.turtle_window.coord_scale + xcor = x * self._turtles.turtle_window.coord_scale + ycor = y * self._turtles.turtle_window.coord_scale except (TypeError, ValueError): debug_output('bad value sent to %s' % (__name__), self._turtles.turtle_window.running_sugar) |