Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@walter-laptop.(none)>2010-02-23 19:15:24 (GMT)
committer Walter Bender <walter@walter-laptop.(none)>2010-02-23 19:15:24 (GMT)
commit39cfc145f0ca7436ccb710f3fa77df782de1fe18 (patch)
treef4dff372384d4d1fec9b1db766b1ddaa633b2225
parentf452560bef5bd1f4d93d96fb0515ea48c57ec39d (diff)
clean upv21
-rw-r--r--COPYING32
-rw-r--r--NEWS5
-rw-r--r--activity/activity.info2
-rw-r--r--game.py11
-rw-r--r--grid.py3
-rw-r--r--sprites.py310
6 files changed, 242 insertions, 121 deletions
diff --git a/COPYING b/COPYING
index a817f22..6953d7e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,20 +1,14 @@
-Copyright (c) 2007-9, Playful Invention Company, Sugar Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c) 2009-10, Walter Bender
+Copyright (c) 2009 Michele Pratusevich
+Copyright (c) 2009 Vincent Le
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
diff --git a/NEWS b/NEWS
index f07269f..5032112 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+21
+
+* general clean up of sprite library
+* updated licenses
+
20
* added more combinations to the dice game, e.g., 5=4+1, 5=3+2
diff --git a/activity/activity.info b/activity/activity.info
index 86356e1..8ebf7e9 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Visual Match
-activity_version = 20
+activity_version = 21
license = GPLv3
bundle_id = org.sugarlabs.VisualMatchActivity
exec = sugar-activity VisualMatchActivity.VisualMatchActivity
diff --git a/game.py b/game.py
index 528e728..eec122e 100644
--- a/game.py
+++ b/game.py
@@ -220,7 +220,8 @@ class Game():
def _process_selection(self, spr):
# Make sure a card in the matched pile isn't selected.
- if spr.x == MATCH_POSITION:
+ x, y = spr.get_xy()
+ if x == MATCH_POSITION:
return True
# Make sure that the current card isn't already selected.
@@ -236,8 +237,8 @@ class Game():
if a is None:
i = self.clicked.index(a)
self.clicked[i] = spr
- self.selected[i].spr.x = spr.x
- self.selected[i].spr.y = spr.y
+ x, y = spr.get_xy()
+ self.selected[i].spr.move((x,y))
self.selected[i].show_card()
break
@@ -417,8 +418,8 @@ class Game():
else:
self.clicked[j] = self.deck.index_to_card(i).spr
k = self.grid.spr_to_grid(self.clicked[j])
- self.selected[j].spr.x = self.grid.grid_to_xy(k)[0]
- self.selected[j].spr.y = self.grid.grid_to_xy(k)[1]
+ self.selected[j].spr.move((self.grid.grid_to_xy(k)[0],
+ self.grid.grid_to_xy(k)[1]))
self.selected[j].show_card()
j += 1
diff --git a/grid.py b/grid.py
index 7c25ada..ee93683 100644
--- a/grid.py
+++ b/grid.py
@@ -116,8 +116,7 @@ class Grid:
# Place a card at position x,y and display it.
def place_a_card(self, c, x, y):
if c is not None:
- c.spr.x = x
- c.spr.y = y
+ c.spr.move((x,y))
c.show_card()
# Convert from sprite x,y to grid index.
diff --git a/sprites.py b/sprites.py
index bed9bae..a361ba0 100644
--- a/sprites.py
+++ b/sprites.py
@@ -21,6 +21,57 @@
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
#THE SOFTWARE.
+"""
+
+sprites.py is a simple sprites library for managing graphics objects,
+'sprites', on a canvas. It manages multiple sprites with methods such
+as move, hide, set_layer, etc.
+
+There are two classes:
+
+class Sprites maintains a collection of sprites.
+class Sprite manages individual sprites within the collection.
+
+Example usage:
+ # Import the classes into your program.
+ from sprites import Sprites Sprite
+
+ # Create a new sprite collection for a gtk Drawing Area.
+ my_drawing_area = gtk.DrawingArea()
+ self.sprite_list = Sprites(my_drawing_area)
+
+ # Create a "pixbuf" (in this example, from SVG).
+ my_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+ # Create a sprite at position x1, y1.
+ my_sprite = sprites.Sprite(self.sprite_list, x1, y1, my_pixbuf)
+
+ # Move the sprite to a new position.
+ my_sprite.move((x1+dx, y1+dy))
+
+ # Create another "pixbuf".
+ your_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>")
+
+ # Create a sprite at position x2, y2.
+ your_sprite = sprites.Sprite(self.sprite_list, x2, y2, my_pixbuf)
+
+ # Assign the sprites to layers.
+ # In this example, your_sprite will be on top of my_sprite.
+ my_sprite.set_layer(100)
+ your_sprite.set_layer(200)
+
+ # Now put my_sprite on top of your_sprite.
+ my_sprite.set_layer(300)
+
+# method for converting SVG to a gtk pixbuf
+def svg_str_to_pixbuf(svg_string):
+ pl = gtk.gdk.PixbufLoader('svg')
+ pl.write(svg_string)
+ pl.close()
+ pixbuf = pl.get_pixbuf()
+ return pixbuf
+"""
+
import pygtk
pygtk.require('2.0')
import gtk
@@ -30,11 +81,16 @@ import pango
#
# A class for the list of sprites and everything they share in common
#
+
class Sprites:
- def __init__(self, canvas):
+ def __init__(self, canvas, area=None, gc=None):
self.canvas = canvas
- self.area = self.canvas.window
- self.gc = self.area.new_gc()
+ if area == None:
+ self.area = self.canvas.window
+ self.gc = self.area.new_gc()
+ else:
+ self.area = area
+ self.gc = gc
self.cm = self.gc.get_colormap()
self.list = []
@@ -47,10 +103,10 @@ class Sprites:
def length_of_list(self):
return(len(self.list))
- def append_to_list(self,spr):
+ def append_to_list(self, spr):
self.list.append(spr)
- def insert_in_list(self,spr,i):
+ def insert_in_list(self, spr, i):
if i < 0:
self.list.insert(0, spr)
elif i > len(self.list)-1:
@@ -58,7 +114,7 @@ class Sprites:
else:
self.list.insert(i, spr)
- def remove_from_list(self,spr):
+ def remove_from_list(self, spr):
if spr in self.list:
self.list.remove(spr)
@@ -78,49 +134,84 @@ class Sprites:
#
class Sprite:
def __init__(self, sprites, x, y, image):
- self.sprites = sprites
- self.x = x
- self.y = y
+ self._sprites = sprites
+ self._x = int(x)
+ self._y = int(y)
+ self._scale = [12]
+ self._rescale = [True]
+ self._horiz_align = ["center"]
+ self._vert_align = ["middle"]
+ self._fd = None
+ self._bold = False
+ self._italic = False
+ self._color = None
+ self._width = 0
+ self._height = 0
+ self._margins = [0,0,0,0]
self.layer = 100
self.labels = []
- self.scale = [24]
- self.rescale = [True]
- self.horiz_align = ["center"]
- self.vert_align = ["middle"]
- self.fd = None
- self.bold = False
- self.italic = False
- self.color = None
+ self.images = []
+ self._dx = [] # image offsets
+ self._dy = []
self.set_image(image)
- self.sprites.append_to_list(self)
+ self._sprites.append_to_list(self)
- def set_image(self, image):
- self.image = image
- if isinstance(self.image,gtk.gdk.Pixbuf):
- self.width = self.image.get_width()
- self.height = self.image.get_height()
+ def set_image(self, image, i=0, dx=0, dy=0):
+ while len(self.images) < i+1:
+ self.images.append(None)
+ self._dx.append(0)
+ self._dy.append(0)
+ self.images[i] = image
+ self._dx[i] = dx
+ self._dy[i] = dy
+ if isinstance(self.images[i], gtk.gdk.Pixbuf):
+ _w = self.images[i].get_width()
+ _h = self.images[i].get_height()
else:
- self.width, self.height = self.image.get_size()
+ _w, _h = self.images[i].get_size()
+ if i == 0: # Always reset width and height when base image changes.
+ self._width = _w + dx
+ self._height = _h + dy
+ else:
+ if _w + dx > self._width:
+ self._width = _w + dx
+ if _h + dy > self._height:
+ self._height = _h + dy
def move(self, pos):
self.inval()
- self.x,self.y = pos
+ self._x,self._y = int(pos[0]),int(pos[1])
self.inval()
- def set_shape(self, image):
+ def move_relative(self, pos):
self.inval()
- self.set_image(image)
+ self._x += int(pos[0])
+ self._y += int(pos[1])
+ self.inval()
+
+ def get_xy(self):
+ return (self._x, self._y)
+
+ def get_dimensions(self):
+ return (self._width, self._height)
+
+ def get_layer(self):
+ return self.layer
+
+ def set_shape(self, image, i=0):
+ self.inval()
+ self.set_image(image, i)
self.inval()
def set_layer(self, layer):
- self.sprites.remove_from_list(self)
+ self._sprites.remove_from_list(self)
self.layer = layer
- for i in range(self.sprites.length_of_list()):
- if layer < self.sprites.get_sprite(i).layer:
- self.sprites.insert_in_list(self, i)
+ for i in range(self._sprites.length_of_list()):
+ if layer < self._sprites.get_sprite(i).layer:
+ self._sprites.insert_in_list(self, i)
self.inval()
return
- self.sprites.append_to_list(self)
+ self._sprites.append_to_list(self)
self.inval()
def set_label(self, new_label, i=0):
@@ -130,115 +221,146 @@ 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 set_margins(self, l=0, t=0, r=0, b=0):
+ self._margins = [l,t,r,b]
+
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)
+ self._fd = pango.FontDescription(font)
def set_label_color(self, rgb):
- self.color = self.sprites.cm.alloc_color(rgb)
+ self._color = self._sprites.cm.alloc_color(rgb)
def set_label_attributes(self, scale, rescale=True, horiz_align="center",
vert_align="middle", i=0):
self._extend_labels_array(i)
- self.scale[i] = scale
- self.rescale[i] = rescale
- self.horiz_align[i] = horiz_align
- self.vert_align[i] = vert_align
+ self._scale[i] = scale
+ self._rescale[i] = rescale
+ self._horiz_align[i] = horiz_align
+ self._vert_align[i] = vert_align
def hide(self):
self.inval()
- self.sprites.remove_from_list(self)
+ self._sprites.remove_from_list(self)
def inval(self):
- self.sprites.area.invalidate_rect(
- gtk.gdk.Rectangle(self.x,self.y,self.width,self.height), False)
+ self._sprites.area.invalidate_rect(
+ gtk.gdk.Rectangle(self._x,self._y,self._width,self._height), False)
def draw(self):
- if isinstance(self.image,gtk.gdk.Pixbuf):
- self.sprites.area.draw_pixbuf(
- self.sprites.gc, self.image, 0, 0, self.x, self.y)
- else:
- self.sprites.area.draw_drawable(
- self.sprites.gc, self.image, 0, 0, self.x, self.y, -1, -1)
+ for i,img in enumerate(self.images):
+ if isinstance(img, gtk.gdk.Pixbuf):
+ self._sprites.area.draw_pixbuf(
+ self._sprites.gc, img, 0, 0, self._x+self._dx[i],
+ self._y+self._dy[i])
+ elif img is not None:
+ self._sprites.area.draw_drawable(
+ self._sprites.gc, img, 0, 0, self._x+self._dx[i],
+ self._y+self._dy[i], -1, -1)
if len(self.labels) > 0:
self.draw_label()
def hit(self, pos):
x, y = pos
- if x < self.x:
+ if x < self._x:
return False
- if x > self.x+self.width:
+ if x > self._x+self._width:
return False
- if y < self.y:
+ if y < self._y:
return False
- if y > self.y+self.height:
+ if y > self._y+self._height:
return False
return True
def draw_label(self):
+ my_width = self._width-self._margins[0]-self._margins[2]
+ if my_width < 0:
+ my_width = 0
+ my_height = self._height-self._margins[1]-self._margins[3]
for i in range(len(self.labels)):
- pl = self.sprites.canvas.create_pango_layout(self.labels[i])
- self.fd.set_size(int(self.scale[i]*pango.SCALE))
- pl.set_font_description(self.fd)
+ pl = self._sprites.canvas.create_pango_layout(str(self.labels[i]))
+ self._fd.set_size(int(self._scale[i]*pango.SCALE))
+ pl.set_font_description(self._fd)
w = pl.get_size()[0]/pango.SCALE
- if w > self.width:
- if self.rescale[i] is True:
- self.fd.set_size(int(self.scale[i]*pango.SCALE*\
- self.width/w))
- pl.set_font_description(self.fd)
+ if w > my_width:
+ if self._rescale[i] is True:
+ self._fd.set_size(
+ int(self._scale[i]*pango.SCALE*my_width/w))
+ pl.set_font_description(self._fd)
w = pl.get_size()[0]/pango.SCALE
else:
j = len(self.labels[i])-1
- while(w > self.width and j > 0):
- pl = self.sprites.canvas.create_pango_layout(
+ while(w > my_width and j > 0):
+ pl = self._sprites.canvas.create_pango_layout(
"…"+self.labels[i][len(self.labels[i])-j:])
- self.fd.set_size(int(self.scale[i]*pango.SCALE))
- pl.set_font_description(self.fd)
+ self._fd.set_size(int(self._scale[i]*pango.SCALE))
+ pl.set_font_description(self._fd)
w = pl.get_size()[0]/pango.SCALE
j -= 1
- if self.horiz_align[i] == "center":
- x = int(self.x+(self.width-w)/2)
- elif self.horiz_align[i] == 'left':
- x = self.x
+ if self._horiz_align[i] == "center":
+ x = int(self._x+self._margins[0]+(my_width-w)/2)
+ elif self._horiz_align[i] == 'left':
+ x = int(self._x+self._margins[0])
else: # right
- x = int(self.x+self.width-w)
+ x = int(self._x+self._width-w-self._margins[2])
h = pl.get_size()[1]/pango.SCALE
- if self.vert_align[i] == "middle":
- y = int(self.y+(self.height-h)/2)
- elif self.vert_align[i] == "top":
- y = self.y
+ if self._vert_align[i] == "middle":
+ y = int(self._y+self._margins[1]+(my_height-h)/2)
+ elif self._vert_align[i] == "top":
+ y = int(self._y+self._margins[1])
else: # bottom
- y = int(self.y+self.height-h)
- self.sprites.gc.set_foreground(self.color)
- self.sprites.area.draw_layout(self.sprites.gc, x, y, pl)
+ y = int(self._y+self._height-h-self._margins[3])
+ self._sprites.gc.set_foreground(self._color)
+ self._sprites.area.draw_layout(self._sprites.gc, x, y, pl)
def label_width(self):
max = 0
for i in range(len(self.labels)):
- pl = self.sprites.canvas.create_pango_layout(self.labels[i])
- self.fd.set_size(int(self.scale[i]*pango.SCALE))
- pl.set_font_description(self.fd)
+ pl = self._sprites.canvas.create_pango_layout(self.labels[i])
+ self._fd.set_size(int(self._scale[i]*pango.SCALE))
+ pl.set_font_description(self._fd)
w = pl.get_size()[0]/pango.SCALE
if w > max:
max = w
return max
- def get_pixel(self, image, x, y):
- array = image.get_pixels()
- offset = (y*image.get_width()+x)*4
- 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 label_safe_width(self):
+ return self._width-self._margins[0]-self._margins[2]
+
+ def label_safe_height(self):
+ return self._height-self._margins[1]-self._margins[3]
+
+ def label_left_top(self):
+ return (self._margins[0], self._margins[1])
+
+ def get_pixel(self, pos, i=0):
+ x, y = pos
+ x = x-self._x
+ y = y-self._y
+ if y > self.images[i].get_height()-1:
+ return (-1,-1,-1,-1)
+ try:
+ array = self.images[i].get_pixels()
+ if array is not None:
+ offset = (y*self.images[i].get_width()+x)*4
+ r,g,b,a = ord(array[offset]), ord(array[offset+1]),\
+ ord(array[offset+2]), ord(array[offset+3])
+ return (r,g,b,a)
+ else:
+ return (-1,-1,-1,-1)
+ except IndexError:
+ print "Index Error: %d %d" % (len(array), offset)
+ return (-1,-1,-1,-1)