diff options
| author | Marion <marion.zepf@gmail.com> | 2013-08-31 17:05:51 (GMT) |
|---|---|---|
| committer | Marion <marion.zepf@gmail.com> | 2013-08-31 17:05:51 (GMT) |
| commit | b824b27903c7fb01e1880551a0d8ed1eea187bf4 (patch) | |
| tree | 536bdea70f059c9aa6c767a496cc5075eefa420c /plugins | |
| parent | 8076e1880999823d3c5df393431a419b3f9780c2 (diff) | |
| parent | e108487cff19177002f60f1d754f9a205fb91d15 (diff) | |
update Primitive of 'setxy' block; Merge mainline/master into type-system
Conflicts:
TurtleArt/tabasics.py -- replace Primitive for 'setxy' block with a
completely new one (i.e. reject both versions)
- Also add a Primitive for the deprecated version of the 'setxy' block.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/turtle_blocks_extras/turtle_blocks_extras.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py index d3865c7..ce18907 100644 --- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py +++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py @@ -1414,8 +1414,10 @@ Journal objects')) def _prim_showlist(self, sarray): """ Display list of media objects """ - x = self.tw.turtles.get_active_turtle.get_xy()[0] / self.tw.coord_scale - y = self.tw.turtles.get_active_turtle.get_xy()[1] / self.tw.coord_scale + x = (self.tw.turtles.get_active_turtle().get_xy()[0] / + self.tw.coord_scale) + y = (self.tw.turtles.get_active_turtle().get_xy()[1] / + self.tw.coord_scale) for s in sarray: self.tw.turtles.get_active_turtle().set_xy(x, y, pendown=False) self._prim_show(s) |