From 154ff98581f12f4ec5bce7a37a15afe0d86f0a36 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Sat, 23 Jan 2010 22:13:27 +0000
Subject: multiple label support

---
(limited to 'block.py')

diff --git a/block.py b/block.py
index be829e3..4ec0595 100644
--- a/block.py
+++ b/block.py
@@ -103,10 +103,7 @@ class Block:
     def _new_block_from_factory(self, sprite_list, name, labels, colors,
                                 scale, x, y):
 
-        if len(labels) == 0:
-            print "new block: %s (%d %d)" % (name, x, y)
-        else:
-            print "new block: %s %s (%d %d)" % (name, labels[0], x, y)
+        print "new block: %s (%d %d)" % (name, x, y)
 
         svg = SVG()
         svg.set_scale(scale)
@@ -119,10 +116,27 @@ class Block:
         self._make_block(name, 0, svg)
         self.spr = sprites.Sprite(sprite_list, x, y, self.shape)
 
-
         self.spr.set_margins(self._left, 0, self._right, 0)
-        if BLOCK_NAMES.has_key(name):
-            self.spr.set_label(BLOCK_NAMES[name])
+
+        # if labels were passed, use them
+        if len(labels) > 0:
+            print labels
+            for i, l in enumerate(labels):
+                self.spr.set_label(l,i)
+                if i == 1: # top
+                    self.spr.set_label_attributes(9, True, "right", "top", i)
+                elif i == 2: # bottom
+                    self.spr.set_label_attributes(9, True, "right", "bottom", i)
+        # otherwise use default values
+        elif BLOCK_NAMES.has_key(name):
+            print BLOCK_NAMES[name]
+            for i, l in enumerate(BLOCK_NAMES[name]):
+                self.spr.set_label(l,i)
+                if i == 1: # top
+                    self.spr.set_label_attributes(9, True, "right", "top", i)
+                elif i == 2: # bottom
+                    self.spr.set_label_attributes(9, True, "right", "bottom", i)
+
         # make sure the label fits
         lw = self.spr.label_width()        
         lwh = self.spr.label_area_dimensions()
@@ -132,13 +146,7 @@ class Block:
             self.spr.set_shape(self.shape)
 
         """
-        # NEED TO ADD EXTRA LABELS
-        if len(labels) > 0:
-            if BLOCK_NAMES.has_key(name):
-                self.spr.set_label(BLOCK_NAMES[name])
-            for i, label in enumerate(labels):
-                if i > 0:
-                    self.spr.set_label(label, labels[i])
+        Do something with default values?
         """
 
     def _make_block(self, name, e, svg):
--
cgit v0.9.1