From 74eca08857a4d7b1403c59b2d7ff9d0d6140c985 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Mon, 27 Jul 2009 15:38:47 +0000
Subject: improved debugging logic

---
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index e88fde9..2684a33 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -864,7 +864,7 @@ class ProjectToolbar(gtk.Toolbar):
         self.debugproject.set_icon("debugon")
         self.stop.set_icon("stopiton")
         self.activity.tw.lc.trace = 1
-        tawindow.runbutton(self.activity.tw, 20)
+        tawindow.runbutton(self.activity.tw, 30)
         gobject.timeout_add(1000,self.debugproject.set_icon,"debugoff")
 
     def do_stop(self, button):
diff --git a/images/info.svg b/images/info.svg
index a701a23..5a2dbc7 100644
--- a/images/info.svg
+++ b/images/info.svg
@@ -5,16 +5,16 @@
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
    width="767"
-   height="200"
+   height="160"
    id="svg2">
   <defs
      id="defs27" />
   <path
-     d="M 15.625132,199.50188 C 12.131069,199.50188 8.6370065,184.53052 6.1412475,171.28928 C 3.6454885,158.04803 1.1497297,139.51029 1.1497297,120.97254 L 1.1497297,78.600561 C 1.1497297,61.386943 3.6454885,33.580327 6.1412475,22.987331 C 8.6370065,12.394335 12.131069,1.8013387 15.625132,1.8013387 L 750.87572,1.8013387 C 753.37148,1.8013387 757.86384,7.0978368 761.35791,22.987331 C 764.85196,37.552701 765.85027,62.711067 765.85027,78.600561 L 765.85027,120.97254 C 765.85027,139.51029 763.85366,158.04803 761.35791,171.28928 C 758.86215,184.53052 754.86894,199.50188 750.87572,199.50188 L 15.625132,199.50188 z"
+     d="M 15.507829,158.97219 C 12.012652,158.97219 8.517475,147.01146 6.0209201,136.43294 C 3.5243653,125.85441 1.0278107,111.04448 1.0278107,96.234539 L 1.0278107,62.383259 C 1.0278107,48.631174 3.5243653,26.41627 6.0209201,17.953449 C 8.517475,9.4906294 12.012652,1.0278084 15.507829,1.0278084 L 750.99286,1.0278084 C 753.48942,1.0278084 757.98321,5.2592194 761.4784,17.953449 C 764.97356,29.589828 765.97219,49.689027 765.97219,62.383259 L 765.97219,96.234539 C 765.97219,111.04448 763.97494,125.85441 761.4784,136.43294 C 758.98184,147.01146 754.98736,158.97219 750.99286,158.97219 L 15.507829,158.97219 z"
      id="path4"
-     style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:2.29945922px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#e0a000;stroke-width:2.05562115px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <g
-     transform="translate(648,65.625)"
+     transform="translate(648,66.625)"
      id="g6">
     <path
        d="M 79.5,438.5 C 79.5,443 75.75,446.5 71,446.5 C 66.5,446.5 62.75,443 62.75,438.5 C 62.75,434 66.5,430.25 71,430.25 C 75.75,430.25 79.5,434 79.5,438.5 L 79.5,438.5 z"
@@ -32,7 +32,7 @@
     </text>
   </g>
   <g
-     transform="translate(5.5,0)"
+     transform="translate(5.5,1)"
      id="g14">
     <path
        d="M 44,15 L 10.5,15 L 27.5,-14 L 44,15 z"
@@ -52,11 +52,12 @@
   </g>
   <text
      x="5.5"
+     y="1"
      id="text22"
      style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans">
     <tspan
        x="26.5"
-       y="29"
+       y="30"
        id="tspan24"
        style="font-size:24px">!</tspan>
   </text>
diff --git a/talogo.py b/talogo.py
index 0b0d264..7c75e13 100644
--- a/talogo.py
+++ b/talogo.py
@@ -239,7 +239,33 @@ def infixnext(lc):
 
 def debug_trace(lc, token):
     if lc.trace:
-        showlabel(lc, token)
+        if token.name in ['forward', 'right', 'back', 'left', 'seth', 'setxy', 'arc', \
+                          'heading', 'xcor', 'ycor']:
+            my_string = token.name  +\
+                        "\nxcor= " + str(int(lc.tw.turtle.xcor)) +\
+                        "\nycor= " + str(int(lc.tw.turtle.ycor)) +\
+                        "\nheading= " + str(int(lc.tw.turtle.heading)) +\
+                        "\nscale= " + str(lc.scale)
+        elif token.name in ['penup', 'pendown', 'setcolor', 'setshade', 'fillscreen',\
+                           'settextcolor', 'settextsize', 'shade', 'color', 'pensize']:
+            if lc.tw.turtle.pendown:
+                penstatus = "\npen down"
+            else:
+                penstatus = "\npen up"
+            my_string = token.name + penstatus +\
+                        "\ncolor= " + str(int(lc.tw.turtle.color)) +\
+                        "\nshade= " + str(lc.tw.turtle.shade) +\
+                        "\npen size= " + str(lc.tw.turtle.pensize)
+        else:
+            my_string = token.name + "\nblocks status:\n"
+            for k,v in lc.boxes.iteritems():
+                tmp = k +":" + str(v) + "\n"
+                my_string += tmp
+        shp = 'info'
+        setshape(lc.tw.status_spr, lc.tw.status_shapes[shp])
+        setlabel(lc.tw.status_spr, my_string)
+        setlayer(lc.tw.status_spr, 710)
+    return
 
 def undefined_check(lc, token):
     if token.fcn != None: return False
--
cgit v0.9.1