Revision: 2132
http://mrbs.svn.sourceforge.net/mrbs/?rev=2132&view=rev
Author: cimorrison
Date: 2011-10-20 14:38:49 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Fixed overlap checking algorithm to check for the case where one rectangles is
inside another
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-20 14:19:55 UTC (rev 2131)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-20 14:38:49 UTC (rev 2132)
@@ -1334,6 +1334,17 @@
{
return true;
}
+ <?php // they also overlap if r1 is inside r2 ?>
+ if ((r1.w >= r2.w) && (r1.n >= r2.n) && (r1.e <= r2.e) && (r1.s <=
r2.s))
+ {
+ return true;
+ }
+ <?php // or r2 is inside r1 ?>
+ if ((r2.w >= r1.w) && (r2.n >= r1.n) && (r2.e <= r1.e) && (r2.s <=
r1.s))
+ {
+ return true;
+ }
+ return false;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
