From a21d0c672ffd12d6ffe7d2b34a387c779fdf5a41 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Sat, 21 Aug 2010 02:51:02 +0000
Subject: reset overlays and turtle on clear

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index d0b58e2..a0298ec 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -175,17 +175,18 @@ class TurtleGraphics:
         self.setgray(100, share)
         self.setcolor(0, share)
         self.settextcolor(70)
-        # self.settextsize(48) # depreciated
         self.setshade(50, share)
         self.setpen(True, share)
         for turtle_key in iter(self.tw.turtles.dict):
             self.set_turtle(turtle_key)
             self.tw.active_turtle.set_color(0)
             self.tw.active_turtle.set_shade(50)
+            self.tw.active_turtle.set_gray(100)
             self.tw.active_turtle.set_pen_size(5)
             self.tw.active_turtle.set_pen_state(True)
             self.seth(0, share)
             self.setxy(0, 0, share)
+            self.tw.active_turtle.hide()
         self.set_turtle(DEFAULT_TURTLE)
         self.tw.svg_string = ''
         self.svg.reset_min_max()
@@ -628,6 +629,7 @@ class TurtleGraphics:
             self.setxy(0, 0, False)
             self.tw.active_turtle.set_pen_state(True)
         self.tw.active_turtle = self.tw.turtles.get_turtle(k, False)
+        self.tw.active_turtle.show()
         tx, ty = self.tw.active_turtle.get_xy()
         self.xcor = -self.width / 2 + tx + 28
         self.ycor = self.height / 2 - ty - 30
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 4765222..ba57147 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -458,7 +458,7 @@ class LogoCode:
         if run_flag:
             print "running code: %s" % (code)
             self.setup_cmd(code)
-            if self.tw.hide is False:
+            if not self.tw.hide:
                 self.tw.display_coordinates()
         else:
             return code
@@ -627,7 +627,7 @@ class LogoCode:
             raise logoerror(str(self.iresult))
         self.iline = oldiline
         self.ireturn()
-        if self.tw.hide is False and self.tw.step_time > 0:
+        if not self.tw.hide and self.tw.step_time > 0:
             self.tw.display_coordinates()
         yield True
     
@@ -708,6 +708,7 @@ class LogoCode:
                         return False
                 except StopIteration:
                     self.tw.turtles.show_all()
+                    # self.tw.active_turtle.show()
                     return False
         except logoerror, e:
             self.tw.showlabel('syntaxerror', str(e)[1:-1])
@@ -774,6 +775,8 @@ class LogoCode:
         stop_media(self)
         self.tw.canvas.clearscreen()
         self.scale = _DEFAULT_SCALE
+        self.tw.set_polar(False)
+        self.tw.set_cartesian(False)
 
     def prim_start(self):
         """ Start block: recenter """
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 23344e2..abfb415 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -47,7 +47,7 @@ class Turtles:
         """ Find a turtle """
         if self.dict.has_key(k):
             return self.dict[k]
-        elif append is False:
+        elif not append:
             return None
         else:
             if colors == None:
@@ -132,7 +132,7 @@ class Turtle:
         """ Set the turtle heading (and shape: one per 10 degrees) """
         self.heading = heading        
         i = (int(self.heading+5)%360)/10
-        if self.hidden is False and self.spr is not None:
+        if not self.hidden and self.spr is not None:
             try:
                 self.spr.set_shape(self.shapes[i])
             except IndexError:
@@ -176,7 +176,7 @@ class Turtle:
     def move(self, pos):
         """ Move the turtle. """
         self.x, self.y = pos[0], pos[1]
-        if self.hidden is False and self.spr is not None:
+        if not self.hidden and self.spr is not None:
             self.spr.move(pos)
         return(self.x, self.y)
 
--
cgit v0.9.1