[Igarden-commit] Garden/source/LayoutDB Element.cpp, 1.40.2.11, 1.40.2.12

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/LayoutDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6673/source/LayoutDB

Modified Files:
      Tag: Release_branch_v1
	Element.cpp 
Log Message:
Improve handling of overlap warnings

Index: Element.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.cpp,v
retrieving revision 1.40.2.11
retrieving revision 1.40.2.12
diff -C2 -d -r1.40.2.11 -r1.40.2.12
*** Element.cpp	18 Apr 2008 02:42:16 -0000	1.40.2.11
--- Element.cpp	19 Apr 2008 11:18:17 -0000	1.40.2.12
***************
*** 560,563 ****
--- 560,564 ----
  	bool			changed = false, found;
  	long			n, count;
+ 	double			dx, dy;
  	planPoint_t		testPoint;
  	
***************
*** 566,570 ****
  	{
  		testPoint = _overlapPoints[n].point;
! 		if(testPoint.xOffset == aPoint.xOffset && testPoint.yOffset == aPoint.yOffset)
  		{
  			found = true;
--- 567,573 ----
  	{
  		testPoint = _overlapPoints[n].point;
! 		dx = testPoint.xOffset - aPoint.xOffset;
! 		dy = testPoint.yOffset - aPoint.yOffset;
! 		if(dx > -0.5 && dx < 0.5 && dy > -0.5 && dy < 0.5)
  		{
  			found = true;