[Igarden-commit] Garden/source/LayoutDB RectanglePath.cpp, 1.38, 1.38.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	RectanglePath.cpp 
Log Message:
Add z-axis

Index: RectanglePath.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/RectanglePath.cpp,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -d -r1.38 -r1.38.2.1
*** RectanglePath.cpp	22 Jun 2006 00:34:59 -0000	1.38
--- RectanglePath.cpp	2 Nov 2006 23:27:52 -0000	1.38.2.1
***************
*** 82,85 ****
--- 82,86 ----
  	point.xOffset = rect.xOffset;
  	point.yOffset = rect.yOffset;
+ 	point.zOffset = 0.0;			// Set zaxis when placed
  	_pathPoints.push_back(point);
  	point.xOffset += rect.xSize;
***************
*** 162,165 ****
--- 163,167 ----
  	point.xOffset = rect.xOffset;
  	point.yOffset = rect.yOffset;
+ 	point.zOffset = 0.0;
  	AddAnchorPoint(point);
  	_pathPoints.push_back(point);
***************
*** 204,218 ****
--- 206,226 ----
  	top.xOffset = start.xOffset + ((middle.xOffset - start.xOffset)/2.0);
  	top.yOffset = start.yOffset + ((middle.yOffset - start.yOffset)/2.0);
+ 	top.zOffset = 0.0;		// Set zaxis when placed
  	bottom.xOffset = top.xOffset + dx;
  	bottom.yOffset = top.yOffset + dy;
+ 	bottom.zOffset = 0.0;	// Set zaxis when placed
  	right.xOffset = middle.xOffset + (/*(oppositeCorner.xOffset - middle.xOffset)*/dx/2.0);
  	right.yOffset = middle.yOffset + (/*(oppositeCorner.yOffset - middle.yOffset)*/dy/2.0);
+ 	right.zOffset = 0.0;	// Set zaxis when placed
  	left.xOffset = right.xOffset - (middle.xOffset - start.xOffset);
  	left.yOffset = right.yOffset - (middle.yOffset - start.yOffset);
+ 	left.zOffset = 0.0;		// Set zaxis when placed
  	
  	corner1.xOffset = middle.xOffset + dx;
  	corner1.yOffset = middle.yOffset + dy;
+ 	corner1.zOffset = 0.0;	// Set zaxis when placed
  	corner2.xOffset = start.xOffset + dx;
  	corner2.yOffset = start.yOffset + dy;
+ 	corner2.zOffset = 0.0;	// Set zaxis when placed
  
  	//	  3--------2
***************
*** 344,353 ****
--- 352,365 ----
  		left.xOffset = _pathPoints[0].xOffset + ((_pathPoints[3].xOffset - _pathPoints[0].xOffset)/2.0);
  		left.yOffset = _pathPoints[0].yOffset + ((_pathPoints[3].yOffset - _pathPoints[0].yOffset)/2.0);
+ 		left.zOffset = 0.0;		// Anchors are at z 0.0
  		right.xOffset = _pathPoints[1].xOffset + ((_pathPoints[2].xOffset - _pathPoints[1].xOffset)/2.0);
  		right.yOffset = _pathPoints[1].yOffset + ((_pathPoints[2].yOffset - _pathPoints[1].yOffset)/2.0);
+ 		right.zOffset = 0.0;
  		top.xOffset = _pathPoints[0].xOffset + ((_pathPoints[1].xOffset - _pathPoints[0].xOffset)/2.0);
  		top.yOffset = _pathPoints[0].yOffset + ((_pathPoints[1].yOffset - _pathPoints[0].yOffset)/2.0);
+ 		top.zOffset = 0.0;
  		bottom.xOffset = _pathPoints[3].xOffset + ((_pathPoints[2].xOffset - _pathPoints[3].xOffset)/2.0);
  		bottom.yOffset = _pathPoints[3].yOffset + ((_pathPoints[2].yOffset - _pathPoints[3].yOffset)/2.0);
+ 		bottom.zOffset = 0.0;
  		_anchorPoints.push_back(left);
  		_anchorPoints.push_back(right);
***************
*** 937,940 ****
--- 949,953 ----
  		to.xOffset = pt.xOffset + deltaX;
  		to.yOffset = pt.yOffset + deltaY;
+ 		to.zOffset = ElevationAtPosition(to.xOffset, to.yOffset);
  		
  		if(n > 0)
***************
*** 953,956 ****
--- 966,971 ----
  					item.xOffset = (long)(from.xOffset + cos(angle)*subOff);
  					item.yOffset = (long)(from.yOffset + sin(angle)*subOff);
+ 					item.zOffset = 	ElevationAtPosition(item.xOffset, item.yOffset);
+ 
  					
  					spreadOut = IsPointNearPreviousElement(item, spacing);