Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block.py14
-rw-r--r--sprites.py9
-rw-r--r--talogo.py14
3 files changed, 26 insertions, 11 deletions
diff --git a/block.py b/block.py
index 2182eb5..5a875e4 100644
--- a/block.py
+++ b/block.py
@@ -54,10 +54,18 @@ class Blocks:
else:
self.list.insert(i, block)
- def remove_from_list(self,block):
+ def remove_from_list(self, block):
if block in self.list:
self.list.remove(block)
+ #
+ # block and spr utilities
+ #
+ def spr_to_block(self, spr):
+ for b in self.list:
+ if spr = b.spr:
+ return b
+
#
# A class for the individual blocks
#
@@ -83,7 +91,7 @@ class Block:
print "%s (%d %d)" % (name, x, y)
else:
print "%s %s (%d %d)" % (name, labels[0], x, y)
- basic_style = ['forward', 'back', 'left', 'right']
+ basic_style = ['forward', 'back', 'left', 'right', 'seth']
box_style = ['number']
if name in basic_style:
svg = block_factory.SVG()
@@ -104,7 +112,7 @@ class Block:
elif name in box_style:
svg = block_factory.SVG()
svg.set_scale(scale)
- svg.expand(20,0)
+ svg.expand(60,0)
svg.set_gradiant(True)
svg.set_colors(colors)
self.spr = sprites.Sprite(self.blocks.sprites, x, y,
diff --git a/sprites.py b/sprites.py
index 8e72f78..9f8c969 100644
--- a/sprites.py
+++ b/sprites.py
@@ -87,7 +87,7 @@ class Sprite:
self.y = y
self.layer = 100
self.labels = []
- self.scale = [24]
+ self.scale = [12]
self.rescale = [True]
self.horiz_align = ["center"]
self.vert_align = ["middle"]
@@ -246,3 +246,10 @@ class Sprite:
r,g,b,a = ord(array[offset]),ord(array[offset+1]),ord(array[offset+2]),\
ord(array[offset+3])
return (a<<24)+(b<<16)+(g<<8)+r
+
+ def set_selected(self, selected):
+ if selected:
+ return
+ else:
+ return
+
diff --git a/talogo.py b/talogo.py
index 6487ec8..9ca6210 100644
--- a/talogo.py
+++ b/talogo.py
@@ -92,16 +92,16 @@ def blocks_to_code(lc,spr):
else:
if spr.proto.name=='number':
try:
- code.append(float(spr.label))
+ code.append(float(spr.labels[0]))
except:
- code.append(float(ord(spr.label[0])))
+ code.append(float(ord(spr.labels[0][0])))
elif spr.proto.name=='string' or spr.proto.name=='title':
- if type(spr.label) == float or type(spr.label) == int:
- if int(spr.label) == spr.label:
- spr.label = int(spr.label)
- code.append('#s'+str(spr.label))
+ if type(spr.labels[0]) == float or type(spr.labels[0]) == int:
+ if int(spr.labels[0]) == spr.labels[0]:
+ spr.labels[0] = int(spr.labels[0])
+ code.append('#s'+str(spr.labels[0]))
else:
- code.append('#s'+spr.label)
+ code.append('#s'+spr.labels[0])
elif spr.proto.name=='journal':
if spr.ds_id != None:
code.append('#smedia_'+str(spr.ds_id))