[Igarden-commit] Garden/source/LayoutDB MaterialRef.cpp, 1.119.2.2, 1.119.2.3

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.cpp 
Log Message:
Create ability to have monochrome drawing styles

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119.2.2
retrieving revision 1.119.2.3
diff -C2 -d -r1.119.2.2 -r1.119.2.3
*** MaterialRef.cpp	1 Nov 2006 03:18:29 -0000	1.119.2.2
--- MaterialRef.cpp	15 Nov 2006 12:17:49 -0000	1.119.2.3
***************
*** 1132,1136 ****
  	cnvErr_t		err;
  	long			overrideLength, overrideWidth;
! 	RGGLSVGDraw		draw;
  	Variant			*variant;
  	XGFileSpecifier	spec;
--- 1132,1136 ----
  	cnvErr_t		err;
  	long			overrideLength, overrideWidth;
! 	RGGLSVGDraw		draw(kUseMonochrome);
  	Variant			*variant;
  	XGFileSpecifier	spec;
***************
*** 1447,1451 ****
  			points.push_back(aPoint);
  		}
! 		view->DrawGenericItemGroup(&points, GetMaterialType());
  		view->DrawNotation(GetBoundingRectangle());
  		view->EndItemDraw();
--- 1447,1468 ----
  			points.push_back(aPoint);
  		}
! 		if((GetMaterialType() & kMajorMaterialType) == kMaterialTypePlant)
! 			view->DrawGenericItemGroup(&points, GetMaterialType());
! 		else
! 		{
! 			landscapeHeight_t	height;
! 			planLength_t		spread;
! 			XGFileSpecifier		spec;
! 
! 			GetLatestPlantDimensions(&height, &spread);
! 			if(GetPlanDrawFile(spec))
! 			{
! 				view->SetItemSize(_cacheWidth, _cacheLength, height, true);
! 				view->DrawItemGroup(GetMaterialType(), &points, spec);
! 			}
! 			else
! 				view->DrawGenericItemGroup(&points, GetMaterialType());
! 		}
! 		
  		view->DrawNotation(GetBoundingRectangle());
  		view->EndItemDraw();
***************
*** 2573,2577 ****
  				long			widthCount, lengthCount;
  				planLength_t	totalHeight;
! 				RGGLSVGDraw		draw;
  				
  				CalculateItemBounds();
--- 2590,2594 ----
  				long			widthCount, lengthCount;
  				planLength_t	totalHeight;
! 				RGGLSVGDraw		draw(kUseMonochrome);
  				
  				CalculateItemBounds();
***************
*** 3256,3260 ****
  void MaterialRef::CalculateItemBounds()
  {
! 	RGGLSVGDraw		draw;
  	double			length, width;
  	planSize_t		minSize, incrSize, maxSize;
--- 3273,3277 ----
  void MaterialRef::CalculateItemBounds()
  {
! 	RGGLSVGDraw		draw(kUseMonochrome);
  	double			length, width;
  	planSize_t		minSize, incrSize, maxSize;