adding Turtle class

1 files changed, 9 insertions, 25 deletions

diff --git a/tasetup.py b/tasetup.py
index 920abe3..77fc458 100644
--- a/tasetup.py
+++ b/tasetup.py
@@ -29,9 +29,6 @@ import time
 
 from gettext import gettext as _
 
-# from tasprites import *
-
-import block
 import sprites
 from constants import *
 
@@ -266,21 +263,10 @@ def setup_selectors(tw,s):
     tw.selbuttons.append(cat)
 
 def setup_misc(tw):
-    # tw.category_spr = Sprite(tw, 0, 0, tw.selbuttons[0].group)
-    tw.category_spr = sprites.Sprite(tw.sprites, 0, 0, tw.selbuttons[0].group)
+    tw.category_spr = sprites.Sprite(tw.sprite_list, 0, 0,
+                                     tw.selbuttons[0].group)
     tw.category_spr.type = 'category'
     tw.category_spr.set_layer(CATEGORY_LAYER)
-    # masks get positioned on top of other blocks
-    # tw.select_mask = Sprite(tw,100,100,\
-    tw.select_mask = sprites.Sprite(tw.sprites, 100, 100,\
-        load_image(tw, tw.path, '', 'masknumber'))
-    tw.select_mask.type = 'selectmask'
-    tw.select_mask.hide()
-    # tw.select_mask_string = Sprite(tw,100,100,\
-    tw.select_mask_string = sprites.Sprite(tw.sprites, 100, 100,\
-                                load_image(tw, tw.path, '', 'maskstring'))
-    tw.select_mask_string.type = 'selectmask'
-    tw.select_mask_string.hide()
     # used to hide the palette
     tw.hidden_palette_icon = load_image(tw, tw.path, '','blocks-')
     # media blocks get positioned into other blocks
@@ -293,14 +279,14 @@ def setup_misc(tw):
     tw.media_shapes['pythonloaded'] = \
         load_image(tw, tw.path_lang, 'sensors', 'nop-loaded')
     # coordinare systems
-    # tw.cartesian_coordinates_spr = Sprite(tw, tw.width/2-600, tw.height/2-450, \
-    tw.cartesian_coordinates_spr = sprites.Sprite(tw.sprites, tw.width/2-600, tw.height/2-450, \
+    tw.cartesian_coordinates_spr = sprites.Sprite(tw.sprite_list,
+                                      tw.width/2-600, tw.height/2-450,
                                       load_image(tw, tw.path, '', "Cartesian"))
     tw.cartesian_coordinates_spr.type = 'coordinates'
     tw.cartesian_coordinates_spr.set_layer(OVERLAY_LAYER)
     tw.cartesian_coordinates_spr.hide()
-    # tw.polar_coordinates_spr = Sprite(tw, tw.width/2-600, tw.height/2-450, \
-    tw.polar_coordinates_spr = sprites.Sprite(tw.sprites, tw.width/2-600, tw.height/2-450, \
+    tw.polar_coordinates_spr = sprites.Sprite(tw.sprite_list,
+                                      tw.width/2-600, tw.height/2-450,
                                       load_image(tw, tw.path, '', "polar"))
     tw.polar_coordinates_spr.type = 'coordinates'
     tw.polar_coordinates_spr.set_layer(OVERLAY_LAYER)
@@ -318,9 +304,8 @@ def setup_misc(tw):
     tw.status_shapes['overflowerror'] = \
         load_image(tw, tw.path, '', 'overflowerror')
     tw.status_shapes['syntaxerror'] = load_image(tw, tw.path, '', 'syntaxerror')
-    # tw.status_spr = Sprite(tw,0,(tw.height-175), \
-    tw.status_spr = sprites.Sprite(tw.sprites, 0, (tw.height-175), \
-            tw.status_shapes['status'])
+    tw.status_spr = sprites.Sprite(tw.sprite_list, 0, (tw.height-175),
+                                   tw.status_shapes['status'])
     tw.status_spr.set_label("test")
     # tw.status_spr.set_label_attributes(1.0, True, "left")
     tw.status_spr.type = 'status'
@@ -334,8 +319,7 @@ def setup_selector(tw,name,y,blockdescriptions):
     # selector tabs
     offshape = load_image(tw, tw.path, 'palette', name+'off')
     onshape = load_image(tw, tw.path, 'palette', name+'on')
-    # spr = Sprite(tw,143,y,offshape)
-    spr = sprites.Sprite(tw.sprites, 143, y, offshape)
+    spr = sprites.Sprite(tw.sprite_list, 143, y, offshape)
     spr.set_layer(TAB_LAYER)
     spr.offshape = offshape
     spr.onshape = onshape