Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2010-10-26 13:33:03 (GMT)
committer Walter Bender <walter@sugarlabs.org>2010-10-26 13:33:03 (GMT)
commit842d084f5d92a4354bf017d5fafce4ddc78843c1 (patch)
tree9aa0bbf6c7761bd751b3a648c9b7aa3edd2d4b60 /TurtleArt
parentc996f3959214da574cbca46eeb5b1cfa79f48da5 (diff)
added back in missing pendown arg to prim_move to fix legacy setxy block
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/talogo.py24
1 files changed, 16 insertions, 8 deletions
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index e35c265..1819520 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -284,8 +284,7 @@ class LogoCode:
DEFPRIM = {
'(': [1, lambda self, x: self._prim_opar(x)],
'and': [2, lambda self, x, y: _and(x, y)],
- 'arc': [2, lambda self, x, y: self._prim_move(self.tw.canvas.arc, x, y,
- update_heading=True)],
+ 'arc': [2, lambda self, x, y: self._prim_arc(self.tw.canvas.arc, x, y)],
'back': [1, lambda self, x: self._prim_move(self.tw.canvas.forward,
-x)],
'black': [0, lambda self: BLACK],
@@ -406,8 +405,8 @@ class LogoCode:
x, y, z, a, b)],
'textcolor': [0, lambda self: self.tw.canvas.textcolor],
'textsize': [0, lambda self: self.tw.textsize],
- 'titlex': [0, lambda self: self.tw.titlex],
- 'titley': [0, lambda self: self.tw.titley],
+ 'titlex': [0, lambda self: CONSTANTS['titlex']],
+ 'titley': [0, lambda self: CONSTANTS['titley']],
'topy': [0, lambda self: CONSTANTS['topy']],
'tpos': [0, lambda self: CONSTANTS['toppos']],
'turtle': [1, lambda self, x: self.tw.canvas.set_turtle(x)],
@@ -1084,17 +1083,26 @@ class LogoCode:
self.tw.canvas.right(value)
self.update_label_value('heading', self.tw.canvas.heading)
- def _prim_move(self, cmd, value1, value2=None, update_heading=False):
+ def _prim_move(self, cmd, value1, value2=None, pendown=True):
if value2 is None:
cmd(value1)
else:
- cmd(value1, value2)
+ print cmd, value1, value2, pendown
+ cmd(value1, value2, pendown=pendown)
self.update_label_value('xcor',
self.tw.canvas.xcor / self.tw.coord_scale)
self.update_label_value('ycor',
self.tw.canvas.ycor / self.tw.coord_scale)
- if update_heading:
- self.update_label_value('heading', self.tw.canvas.heading)
+ if len(self.value_blocks['see']) > 0:
+ self._see()
+
+ def _prim_arc(self, cmd, value1, value2):
+ cmd(value1, value2)
+ self.update_label_value('xcor',
+ self.tw.canvas.xcor / self.tw.coord_scale)
+ self.update_label_value('ycor',
+ self.tw.canvas.ycor / self.tw.coord_scale)
+ self.update_label_value('heading', self.tw.canvas.heading)
if len(self.value_blocks['see']) > 0:
self._see()