[gcompris: 101/111] reusing code
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris: 101/111] reusing code
- Date: Thu, 4 Oct 2012 00:03:03 +0000 (UTC)
commit f4855966375ce7bfafd213a36a79cf31398645ad
Author: serah <serah4291 gmail com>
Date: Fri Sep 14 02:55:29 2012 +0530
reusing code
src/color_mix_light-activity/Makefile.am | 4 +-
src/color_mix_light-activity/color_mix_light.py | 243 ++------------------
src/color_mix_light-activity/init_path.sh | 6 +-
src/color_mix_light-activity/resources/Makefile.am | 2 -
.../resources/color_mix_light/Makefile.am | 9 -
.../resources/color_mix_light/background.jpg | Bin 74754 -> 0 bytes
.../resources/color_mix_light/torch_blue.png | Bin 25788 -> 0 bytes
.../resources/color_mix_light/torch_green.png | Bin 28830 -> 0 bytes
.../resources/color_mix_light/torch_red.png | Bin 31292 -> 0 bytes
9 files changed, 23 insertions(+), 241 deletions(-)
---
diff --git a/src/color_mix_light-activity/Makefile.am b/src/color_mix_light-activity/Makefile.am
index 4ad759c..236f764 100644
--- a/src/color_mix_light-activity/Makefile.am
+++ b/src/color_mix_light-activity/Makefile.am
@@ -1,13 +1,11 @@
include $(top_srcdir)/Makefile.activity
-SUBDIRS = resources
+SUBDIRS =
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= color_mix_light.py
-
-
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
diff --git a/src/color_mix_light-activity/color_mix_light.py b/src/color_mix_light-activity/color_mix_light.py
index ee9310d..3c66d10 100644
--- a/src/color_mix_light-activity/color_mix_light.py
+++ b/src/color_mix_light-activity/color_mix_light.py
@@ -27,6 +27,7 @@ import pango
import random
from gcompris import gcompris_gettext as _
+from color_mix import Colors, Color_tubes
class Gcompris_color_mix_light:
"""Empty gcompris python class"""
@@ -37,6 +38,8 @@ class Gcompris_color_mix_light:
self.game_complete = False
self.gcomprisBoard.level = 1
self.gcomprisBoard.maxlevel = 4
+ self.win = 0
+ self.lost = False
# Needed to get key_press
gcomprisBoard.disable_im_context = True
@@ -56,7 +59,7 @@ class Gcompris_color_mix_light:
# Set a background image
gcompris.set_background(self.gcomprisBoard.canvas.get_root_item(),
- 'color_mix_light/background.jpg')
+ 'color_mix/background.jpg')
text = goocanvas.Text(
parent = self.rootitem,
@@ -73,27 +76,34 @@ class Gcompris_color_mix_light:
b_points = goocanvas.Points( [(548, 213), (665, 177)] )
m_points = goocanvas.Points( [(390, 372), (390, 490)] )
- colors = Colors(self, self.rootitem, self.gcomprisBoard.level)
+ colors = Colors(self, self.rootitem, self.gcomprisBoard.level, 0)
# Pass the points of the buttons and slider for the color tubes
red_tube = Color_tubes(self.rootitem, colors, 'torch_red.png',
- 1, 90, 115, r_points, 232, 210, 120, 175, self.gcomprisBoard.level)
+ 1, 90, 115, r_points, 232, 210, 120, 175,
+ self.gcomprisBoard.level, 1)
green_tube = Color_tubes(self.rootitem, colors, 'torch_green.png',
- 2, 265, 265, m_points, 390, 372, 390, 490, self.gcomprisBoard.level)
+ 2, 265, 265, m_points, 390, 372, 390, 490,
+ self.gcomprisBoard.level, 1)
blue_tube = Color_tubes(self.rootitem, colors, 'torch_blue.png',
- 3, 462, 115, b_points, 554, 210, 672, 175, self.gcomprisBoard.level)
+ 3, 462, 115, b_points, 554, 210, 672, 175,
+ self.gcomprisBoard.level, 1)
def game_over(self, result):
self.game_complete = True
if result == 1:
+ self.win += 1
+ self.lost = False
self.next_level()
gcompris.bonus.display(gcompris.bonus.WIN, gcompris.bonus.TUX)
else:
+ self.lost = True
gcompris.bonus.display(gcompris.bonus.LOOSE, gcompris.bonus.TUX)
def next_level(self):
- if self.gcomprisBoard.level < self.gcomprisBoard.maxlevel:
+ if self.gcomprisBoard.level < self.gcomprisBoard.maxlevel and self.win == 5:
self.gcomprisBoard.level += 1
+ self.win = 0
def end(self):
self.rootitem.remove()
@@ -119,8 +129,9 @@ class Gcompris_color_mix_light:
self.board_paused = pause
if pause == False and self.game_complete:
self.game_complete = False
- self.end()
- self.start()
+ if self.lost == False:
+ self.end()
+ self.start()
def set_level(self, level):
self.gcomprisBoard.level = level
@@ -128,219 +139,3 @@ class Gcompris_color_mix_light:
self.end()
self.start()
-class Color_tubes:
- """ Class containing the three primary color tubes"""
-
-
- def __init__(self, rootitem, color_instance, image, primary_color,
- x, y, points, incr_x, incr_y, decr_x, decr_y, level):
- self.rootitem = rootitem
- self.primary_color = primary_color
- self.color_instance = color_instance
-
- # Load the tube image
- image = 'color_mix_light/' + image
- pixbuf = gcompris.utils.load_pixmap(image)
- tube = goocanvas.Image(
- parent = self.rootitem,
- pixbuf = pixbuf,
- x = x,
- y = y
- )
-
- button_width = 20
- line = goocanvas.Polyline(
- parent = self.rootitem,
- points = points,
- stroke_color = "white",
- width = 2.0)
-
- self.difference_x = (incr_x - decr_x) / 7
- self.difference_y = (incr_y - decr_y) / 8
- slider_x = decr_x + self.difference_x
- slider_y = decr_y + self.difference_y
- self.bar = goocanvas.Polyline(
- parent = self.rootitem,
- points = goocanvas.Points([(slider_x, slider_y - 4),
- (slider_x, slider_y + 6)]),
- stroke_color = "white",
- line_width = 10.0)
-
- self.scale_value = 1
- move = int(255/ (level * 2 + 1))
- self.color_button(decr_x, decr_y, button_width, '-', -move)
- self.color_button(incr_x, incr_y, button_width, '+', move)
-
- def color_button(self, x, y, size, text, move):
- button = goocanvas.Rect(
- parent = self.rootitem,
- x = x - size / 2.0,
- y = y - size / 2.0,
- width = size,
- height = size,
- line_width = 1.0,
- stroke_color_rgba= 0xCECECEFFL,
- fill_color_rgba = 0x333333FFL,
- radius_x = 15.0,
- radius_y = 5.0,
- )
- gcompris.utils.item_focus_init(button, None)
-
- text = goocanvas.Text(
- parent = self.rootitem,
- x = x,
- y = y,
- text = text,
- font = gcompris.skin.get_font("gcompris/subtitle"),
- fill_color = "white",
- anchor = gtk.ANCHOR_CENTER,
- alignment = pango.ALIGN_CENTER
- )
- gcompris.utils.item_focus_init(text, button)
-
- button.connect("button_press_event", self.move_bar, move)
- text.connect("button_press_event", self.move_bar, move)
-
- def move_bar(self, widget, target, event, move):
- self.scale_value += move
- # Take care not to bypass bounds
- if self.scale_value > 256:
- self.scale_value = 255
- return
- elif self.scale_value < 0:
- self.scale_value = 1
- return
-
- self.bar.translate(move * self.difference_x * 0.019,
- move * self.difference_y * 0.023)
- self.set_color(move)
-
- def set_color(self, change):
- if self.primary_color == 1:
- self.color_instance.color1 += int(change)
- self.color_instance.resultant_color(1)
- elif self.primary_color == 2:
- self.color_instance.color2 += int(change)
- self.color_instance.resultant_color(2)
- if self.primary_color == 3:
- self.color_instance.color3 += int(change)
- self.color_instance.resultant_color(3)
-
-class Colors:
- """ Class containing all the colors"""
-
-
- def __init__(self, game, rootitem, level):
- self.game = game
- self.rootitem = rootitem
-
- self.color_rgb = [0, 0, 0]
- self.color1 = self.color2 = self.color3 = 0
-
- self.color_image = goocanvas.Ellipse(
- parent = rootitem,
- center_x = 395,
- center_y = 230,
- radius_y = 60,
- radius_x = 75,
- stroke_color_rgba = 0x000000FFL,
- fill_color_rgba = 0x000000FFL,
- line_width = 0.5)
-
- # Random color to be matched
- self.increment = int(255/ (level * 2 + 1))
- rand_r = random.randrange(0, 2 * level + 1)
- rand_g = random.randrange(0, 2 * level + 1)
- rand_b = random.randrange(0, 2 * level + 1)
-
- self.r_random = rand_r * self.increment
- self.g_random = rand_g * self.increment
- self.b_random = rand_b * self.increment
- code = self.hex_code(self.r_random, self.g_random, self.b_random)
-
- random_color = goocanvas.Rect(
- parent = rootitem,
- radius_x = 6,
- radius_y = 6,
- x = 350,
- y = 50,
- width = 100,
- height = 70,
- stroke_color_rgba = long(code, 16),
- fill_color_rgba = long(code, 16))
-
- # OK Button
- ok = goocanvas.Svg(parent = rootitem,
- svg_handle = gcompris.skin.svg_get(),
- svg_id = "#OK"
- )
- ok.translate(0, -130)
-
- ok.connect("button_press_event", self.ok_event)
- gcompris.utils.item_focus_init(ok, None)
-
- def ok_event(self, widget, target, event):
- c_diff = self.color_rgb[0] - self.r_random
- m_diff = self.color_rgb[1] - self.g_random
- y_diff = self.color_rgb[2] - self.b_random
- if self.color_rgb[0] - self.increment <= self.r_random <= self.color_rgb[0] + self.increment and \
- self.color_rgb[1] - self.increment <= self.g_random <= self.color_rgb[1] + self.increment and \
- self.color_rgb[2] - self.increment <= self.b_random <= self.color_rgb[2] + self.increment:
- self.game.game_over(1)
- else:
- self.show_message(c_diff, m_diff, y_diff)
- self.game.game_over(2)
-
- def show_message(self, red, green, blue):
- if red > 0 and abs(red) > self.increment:
- self.message('Too much red', 300)
- elif red < 0 and abs(red) > self.increment:
- self.message('Not enough red', 300)
-
- if green > 0 and abs(green) > self.increment:
- self.message('Too much green', 375)
- elif green < 0 and abs(green) > self.increment:
- self.message('Not enough green', 375)
-
- if blue > 0 and abs(blue) > self.increment:
- self.message('Too much blue', 450)
- elif blue < 0 and abs(blue) > self.increment:
- self.message('Not enough blue', 450)
-
- def message(self, msg, y):
- text = goocanvas.Text(
- parent = self.rootitem,
- x = 150,
- y = y,
- fill_color_rgba = 0x550000FFL,
- anchor = gtk.ANCHOR_CENTER,
- alignment = pango.ALIGN_CENTER,
- text = _(msg))
- bounds = text.get_bounds()
- gap = 20
-
- back = goocanvas.Rect(
- parent = self.rootitem,
- radius_x = 6,
- radius_y = 6,
- x = bounds.x1 - gap,
- y = bounds.y1 - gap,
- width = bounds.x2 - bounds.x1 + gap * 2,
- height = bounds.y2 - bounds.y1 + gap * 2,
- stroke_color_rgba = 0xFFFFFFFFL,
- fill_color_rgba = 0xCCCCCC44L)
-
- def resultant_color(self, change):
- self.color_rgb[0] = self.color1
- self.color_rgb[1] = self.color2
- self.color_rgb[2] = self.color3
-
- color_code = self.hex_code(self.color_rgb[0], self.color_rgb[1],
- self.color_rgb[2])
- self.color_image.set_property('fill_color_rgba', long(color_code, 16))
-
- def hex_code(self, r, g, b):
- hexchars = "0123456789ABCDEF"
- return hexchars[r / 16] + hexchars[r % 16] + hexchars[g / 16] + \
- hexchars[g % 16] + hexchars[b / 16] + hexchars[b % 16] + 'FFL'
-
diff --git a/src/color_mix_light-activity/init_path.sh b/src/color_mix_light-activity/init_path.sh
index df30b33..4b7a2ba 100755
--- a/src/color_mix_light-activity/init_path.sh
+++ b/src/color_mix_light-activity/init_path.sh
@@ -3,7 +3,7 @@
path=$1
activity=color_mix_light
plugindir=$path/../boards/.libs
-pythonplugindir=$path
-resourcedir=$path/resources
-section="/discovery/colors_group"
+pythonplugindir=$path/../color_mix-activity:$path/../color_mix_light-activity
+resourcedir=$path/../color_mix-activity/resources
+section="/experimental"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
