[Freevo-cvslog] freevo/lib/mevas/mevas rect.py,1.2,1.3

[Jason T. <ta...@us...>]

Update of /cvsroot/freevo/freevo/lib/mevas/mevas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6720

Modified Files:
	rect.py 
Log Message:
In optimize_for_rendering(), be more likely to union to rectangles.


Index: rect.py
===================================================================
RCS file: /cvsroot/freevo/freevo/lib/mevas/mevas/rect.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rect.py	20 Aug 2004 15:46:49 -0000	1.2
--- rect.py	30 Aug 2004 19:32:45 -0000	1.3
***************
*** 147,155 ****
  			# larger than the two rectangles separately, then take the
  			# union instead.
! 			# TODO: test empirically if 20% is a good figure.
  			if not merged:
  				r3 = union(r1, r2)
  				area_r3 = r3[1][0] * r3[1][1]
! 				if area_r3 < (area_r1 + area_r2) * 1.2:
  					list.remove(r2)
  					new_list.append(r3)
--- 147,155 ----
  			# larger than the two rectangles separately, then take the
  			# union instead.
! 			# TODO: test empirically if 50% is a good figure.
  			if not merged:
  				r3 = union(r1, r2)
  				area_r3 = r3[1][0] * r3[1][1]
! 				if area_r3 < (area_r1 + area_r2) * 1.5:
  					list.remove(r2)
  					new_list.append(r3)