diff options
| -rw-r--r-- | TurtleArtActivity.py | 12 | ||||
| -rw-r--r-- | block.py | 15 | ||||
| -rw-r--r-- | taproject.py | 6 | ||||
| -rw-r--r-- | tawindow.py | 4 |
4 files changed, 19 insertions, 18 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index a622098..15bd409 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -416,22 +416,18 @@ class TurtleArtActivity(activity.Activity): """ def _do_cartesian_cb(self, button): if self.tw.cartesian is True: - # FIXME: encapsulation - tawindow.hide(self.tw.cartesian_coordinates_spr) + self.tw.cartesian_coordinates_spr.hide() self.tw.cartesian = False else: - # FIXME: encapsulation - tawindow.setlayer(self.tw.cartesian_coordinates_spr,610) + self.tw.cartesian_coordinates_spr.set_layer(610) self.tw.cartesian = True def _do_polar_cb(self, button): if self.tw.polar is True: - # FIXME: encapsulation - tawindow.hide(self.tw.polar_coordinates_spr) + self.tw.polar_coordinates_spr.hide() self.tw.polar = False else: - # FIXME: encapsulation - tawindow.setlayer(self.tw.polar_coordinates_spr,610) + self.tw.polar_coordinates_spr.set_layer(610) self.tw.polar = True """ @@ -113,7 +113,6 @@ class 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_label(labels[0]) elif name in BASIC_STYLE_HEAD: svg.expand(40,0) svg.set_innie([False]) @@ -123,7 +122,6 @@ class Block: self.spr = sprites.Sprite(self.blocks.sprites, x, y, svg_str_to_pixbuf(svg.basic_block())) print "created new basic block head: %s" % (str(self.spr)) - self.spr.set_label(labels[0]) elif name in BASIC_STYLE_TAIL: svg.expand(40,0) svg.set_innie([False]) @@ -133,7 +131,6 @@ class Block: self.spr = sprites.Sprite(self.blocks.sprites, x, y, svg_str_to_pixbuf(svg.basic_block())) print "created new basic block tail: %s" % (str(self.spr)) - self.spr.set_label(labels[0]) elif name in BASIC_STYLE_1ARG: svg.expand(20,0) svg.set_innie([True]) @@ -143,7 +140,6 @@ class Block: self.spr = sprites.Sprite(self.blocks.sprites, x, y, svg_str_to_pixbuf(svg.basic_block())) print "created new basic block 1 arg: %s" % (str(self.spr)) - self.spr.set_label(labels[0]) elif name in BASIC_STYLE_2ARG: svg.expand(20,0) svg.set_innie([True,True]) @@ -153,18 +149,23 @@ class Block: self.spr = sprites.Sprite(self.blocks.sprites, x, y, svg_str_to_pixbuf(svg.basic_block())) print "created new basic block 2 args: %s" % (str(self.spr)) - self.spr.set_label(labels[0]) elif name in BOX_STYLE: svg.expand(50,0) self.spr = sprites.Sprite(self.blocks.sprites, x, y, svg_str_to_pixbuf(svg.basic_box())) print "created new box block: %s" % (str(self.spr)) else: + svg.expand(50,0) + self.spr = sprites.Sprite(self.blocks.sprites, x, y, + svg_str_to_pixbuf(svg.basic_box())) 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)) + if len(labels) > 0: + self.spr.set_label(labels[0]) + for label in labels: + self.spr.set_label(label, labels.index(label)) # # Load pixbuf from SVG string diff --git a/taproject.py b/taproject.py index b2b790e..350785b 100644 --- a/taproject.py +++ b/taproject.py @@ -50,6 +50,7 @@ try: from sugar.datastore import datastore except: pass +import block import sprites nolabel = ['audiooff', 'descriptionoff', 'journal'] @@ -167,8 +168,13 @@ def load_spr(tw,b): except KeyError: print "swapping in a forward block for %s" % (btype) proto = tw.protodict['forward'] + blk = block.Block(tw.blocks,proto.name,b[2]+tw.turtle.canvas.x, + b[3]+tw.turtle.canvas.y) + spr = blk.spr + ''' spr = sprites.Sprite(tw.sprites,b[2]+tw.turtle.canvas.x, b[3]+tw.turtle.canvas.y, proto.image) + ''' spr.type = 'block' spr.proto = proto if label is not None: spr.set_label(label) diff --git a/tawindow.py b/tawindow.py index fb84dd9..5da2cf8 100644 --- a/tawindow.py +++ b/tawindow.py @@ -142,8 +142,6 @@ class TurtleArtWindow(): self.polar = False self.spr = None # "currently selected spr" - - """ DEPRECATED """ @@ -968,7 +966,7 @@ class TurtleArtWindow(): if block2.connections[dock2n] != None: return (100,100) except IndexError: - print "Indec Error %s %s" % (str(dock1n),str(dock2n)) + print "Index Error %s %s" % (str(dock1n),str(dock2n)) if block1==block2: return (100,100) if d1type!=d2type: # some blocks can take strings or nums |