[Igarden-commit] Garden/source/LayoutDB InstanceData.cpp, 1.27.2.4, 1.27.2.5 InstanceData.h, 1.16.2.1, 1.16.2.2

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

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

Modified Files:
      Tag: Release_branch_v1
	InstanceData.cpp InstanceData.h 
Log Message:
Add basic pruning capability (natural shaping to current size only)
Speed up refresh when columns et is changed

Index: InstanceData.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/InstanceData.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** InstanceData.h	12 Dec 2006 00:52:02 -0000	1.16.2.1
--- InstanceData.h	23 May 2008 11:21:17 -0000	1.16.2.2
***************
*** 121,124 ****
--- 121,125 ----
  		UInt32					_length;
  		UInt32					_width;
+ 		UInt32					_pruningType;
  		IDPersist*				_compat;
  		planLength_t			_spreadLow;

Index: InstanceData.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/InstanceData.cpp,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -C2 -d -r1.27.2.4 -r1.27.2.5
*** InstanceData.cpp	19 Mar 2008 01:44:37 -0000	1.27.2.4
--- InstanceData.cpp	23 May 2008 11:21:17 -0000	1.27.2.5
***************
*** 40,44 ****
  : _parent(parent), _germinationDataLoaded(false)
  {
! 	Int32	length, n, count, low, high;
  	char	*buf;
  	
--- 40,44 ----
  : _parent(parent), _germinationDataLoaded(false)
  {
! 	Int32	length, n, count, low, high, val;
  	char	*buf;
  	
***************
*** 72,75 ****
--- 72,78 ----
  	if(!_compat->GetInt32(kSowLocation, &_sowLocation))
  		_sowLocation = 0;
+ 	if(!_compat->GetInt32(kInstancePruningType, &val))
+ 		val = 0;
+ 	_pruningType = static_cast<pruningType_t>(val);
  
  	if(!_compat->GetDate(kActualPlantOutDate, _ActualPlantOut))
***************
*** 119,122 ****
--- 122,126 ----
  	_germinationDataLoaded = true;
  	_sowLocation = 0;
+ 	_pruningType = kPruningNone;
  }
  
***************
*** 146,149 ****
--- 150,154 ----
  		_userComments = p._userComments;
  		_supplierIDs = p._supplierIDs;
+ 		_pruningType = p._pruningType;
  	}
  
***************
*** 172,175 ****
--- 177,181 ----
  	_length = p._length;
  	_width = p._width;
+ 	_pruningType = p._pruningType;
  }
  
***************
*** 711,715 ****
  		writer.WriteStartTagArg("Comments", str);
  	}
! 
  	numEntries = _supplierIDs.Length();
  	if(numEntries != 0)
--- 717,727 ----
  		writer.WriteStartTagArg("Comments", str);
  	}
! 	if(_pruningType != 0)
! 	{
! 		AttributeDictionary::ConvertValueToXML(this, kInstancePruningType, str);
! 		writer.WriteStartTagArg("Sow", str);
! 	}
! 	
! 	
  	numEntries = _supplierIDs.Length();
  	if(numEntries != 0)
***************
*** 802,805 ****
--- 814,821 ----
  		break;
  	
+ 	case kInstancePruningType:
+ 		result = _pruningType == 0;
+ 		break;
+ 			
  	default:
  		break;
***************
*** 817,820 ****
--- 833,840 ----
  		switch(propertyID)
  		{
+ 		case kInstancePruningType:
+ 			*result = _pruningType;
+ 			break;
+ 				
  		case kInstanceYear:
  			*result = _year;
***************
*** 892,895 ****
--- 912,919 ----
  		break;
  		
+ 	case kInstancePruningType:
+ 		_pruningType = value;
+ 		break;
+ 					
  	default:
  		FatalErrorAssert("Data type does not match");