sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another iteration on the spread out box. Make it work

Browse Source 
well also for the mesh.
This commit is contained in:
Marco Pesenti Gritti 2006-10-25 14:31:44 +02:00
parent 15e3a4f791
commit ebb896cb5b
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sugar/graphics/spreadbox.py
View File

@ -21,7 +21,8 @@ import math
import cairo import cairo
import hippo import hippo
_DISTANCE_THRESHOLD = 120.0 _DISTANCE_THRESHOLD = 10.0
_FORCE_CONSTANT = 0.1
class SpreadBox(hippo.CanvasBox, hippo.CanvasItem): class SpreadBox(hippo.CanvasBox, hippo.CanvasItem):
__gtype_name__ = 'SugarSpreadBox' __gtype_name__ = 'SugarSpreadBox'
@ -41,21 +42,36 @@ class SpreadBox(hippo.CanvasBox, hippo.CanvasItem):
self._items_to_position.remove(item) self._items_to_position.remove(item)
self.remove(item) self.remove(item)
def _get_distance(self, icon1, icon2): def _get_item_radius(self, item):
[icon1_x, icon1_y] = self.get_position(icon1) [width, height] = item.get_request()
[icon2_x, icon2_y] = self.get_position(icon2) return math.sqrt(width ** 2 + height ** 2) / 2
a = icon1_x - icon2_x def _get_item_center(self, item):
b = icon1_y - icon2_y [width, height] = item.get_request()
[x, y] = self.get_position(item)
return math.sqrt(a * a + b * b) c_x = int(x + float(width) / 2.0)
c_y = int(y + float(height) / 2.0)
return [c_x, c_y]
def _get_repulsion(self, icon1, icon2): def _get_repulsion(self, icon1, icon2):
[icon1_x, icon1_y] = self.get_position(icon1) [c1_x, c1_y] = self._get_item_center(icon1)
[icon2_x, icon2_y] = self.get_position(icon2) [c2_x, c2_y] = self._get_item_center(icon2)
f_x = icon1_x - icon2_x a = c2_x - c1_x
f_y = icon1_y - icon2_y b = c2_y - c1_y
r1 = self._get_item_radius(icon1)
r2 = self._get_item_radius(icon2)
distance = math.sqrt(a ** 2 + b ** 2) - r1 - r2
if distance < _DISTANCE_THRESHOLD:
f_x = int(math.ceil(-_FORCE_CONSTANT * float(a)))
f_y = int(math.ceil(-_FORCE_CONSTANT * float(b)))
else:
f_x = 0
f_y = 0
return [f_x, f_y] return [f_x, f_y]
@ -80,10 +96,9 @@ class SpreadBox(hippo.CanvasBox, hippo.CanvasItem):
for icon2 in self.get_children(): for icon2 in self.get_children():
if icon1 != icon2: if icon1 != icon2:
distance = self._get_distance(icon1, icon2)
if distance <= _DISTANCE_THRESHOLD:
self._stable = False
[f_x, f_y] = self._get_repulsion(icon1, icon2) [f_x, f_y] = self._get_repulsion(icon1, icon2)
if f_x != 0 or f_y != 0:
self._stable = False
vx += f_x vx += f_x
vy += f_y vy += f_y
@ -110,7 +125,7 @@ class SpreadBox(hippo.CanvasBox, hippo.CanvasItem):
self._items_to_position = [] self._items_to_position = []
tries = 10 tries = 20
self._spread_icons() self._spread_icons()
while not self._stable and tries > 0: while not self._stable and tries > 0:
self._spread_icons() self._spread_icons()

18
tests/test-spread-box.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/python
# Copyright (C) 2006, Red Hat, Inc. # Copyright (C) 2006, Red Hat, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -14,19 +16,13 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#!/usr/bin/python import sys
import random
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
import gobject import gobject
from sugar.session.UITestSession import UITestSession
session = UITestSession()
session.start()
import sys
import random
import gtk import gtk
import hippo import hippo
@ -39,9 +35,9 @@ def _create_icon():
icon = CanvasIcon(size=100, color=color, icon = CanvasIcon(size=100, color=color,
icon_name='stock-buddy') icon_name='stock-buddy')
box.add(icon) box.add_item(icon)
return (len(box.get_children()) < 15) return (len(box.get_children()) < 20)
window = gtk.Window() window = gtk.Window()
window.connect("destroy", lambda w: gtk.main_quit()) window.connect("destroy", lambda w: gtk.main_quit())