From 4c261605f09d09bcb89f8f291f383beb6dd0179d Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Wed, 20 Jan 2010 16:27:40 +0000
Subject: catching problem with labels

---
diff --git a/block.py b/block.py
index 5a7cb3d..2182eb5 100644
--- a/block.py
+++ b/block.py
@@ -63,7 +63,7 @@ class Blocks:
 #
 class Block:
     def __init__(self, blocks, proto_name, x, y, labels=[], 
-                 colors=["#00A000","#00FF00"], scale=1.0):
+                 colors=["#00A000","#00FF00"], scale=2.0):
         self.blocks = blocks
         self.spr = None
         self._new_block_from_prototype(proto_name, labels, colors, scale, x, y)
@@ -79,7 +79,10 @@ class Block:
         # etc.
 
     def _new_block_from_prototype(self, name, labels, colors, scale, x, y):
-        print "%s %s (%d %d)" % (name, labels[0], x, y)
+        if len(labels) == 0:
+            print "%s (%d %d)" % (name, x, y)
+        else:
+            print "%s %s (%d %d)" % (name, labels[0], x, y)
         basic_style = ['forward', 'back', 'left', 'right']
         box_style = ['number']
         if name in basic_style:
@@ -92,9 +95,9 @@ class Block:
             svg.set_slot(True)
             svg.set_gradiant(True)
             svg.set_colors(colors)
-            print "creating new basic block"
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
+            print "created new basic block: %s" % (str(self.spr))
             self.spr.set_layer(2000)
             self.spr.draw()
             self.spr.set_label(labels[0])
@@ -106,9 +109,13 @@ class Block:
             svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_box()))
-        
-        for l in labels:
-            self.spr.set_label(l, labels.index(l))
+            print "created new box block: %s" % (str(self.spr))
+        else:
+            print "don't know how to create a block for %s" % (name)
+            return
+
+        for label in labels:
+            self.spr.set_label(label, labels.index(label))
 
 #
 # Load pixbuf from SVG string
diff --git a/sprites.py b/sprites.py
index bf1433d..8e72f78 100644
--- a/sprites.py
+++ b/sprites.py
@@ -134,19 +134,19 @@ class Sprite:
             self.labels[i] = new_label.replace("\0"," ")
         else:
             self.labels[i] = str(new_label)
-        if self.fd is None:
-            self.set_font('Sans')
-        if self.color is None:
-            self.color = self.sprites.cm.alloc_color('black')
         self.inval()
 
     def _extend_labels_array(self, i):
-         while len(self.labels) < i+1:
-            self.labels.append(" ")
-            self.scale.append(self.scale[0])
-            self.rescale.append(self.rescale[0])
-            self.horiz_align.append(self.horiz_align[0])
-            self.vert_align.append(self.vert_align[0])
+        if self.fd is None:
+           self.set_font('Sans')
+        if self.color is None:
+           self.color = self.sprites.cm.alloc_color('black')
+        while len(self.labels) < i+1:
+           self.labels.append(" ")
+           self.scale.append(self.scale[0])
+           self.rescale.append(self.rescale[0])
+           self.horiz_align.append(self.horiz_align[0])
+           self.vert_align.append(self.vert_align[0])
 
     def set_font(self, font):
         self.fd = pango.FontDescription(font)
--
cgit v0.9.1