[Igarden-commit] Garden/source/SiteData SiteDataDialog.cpp, 1.14.2.7, 1.14.2.8

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

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

Modified Files:
      Tag: Release_branch_v1
	SiteDataDialog.cpp 
Log Message:
Handle zone as one of the search parameters (from Site Data)

Index: SiteDataDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SiteData/SiteDataDialog.cpp,v
retrieving revision 1.14.2.7
retrieving revision 1.14.2.8
diff -C2 -d -r1.14.2.7 -r1.14.2.8
*** SiteDataDialog.cpp	26 Mar 2008 22:29:46 -0000	1.14.2.7
--- SiteDataDialog.cpp	12 May 2008 11:18:20 -0000	1.14.2.8
***************
*** 80,84 ****
  		AttributeDictionary::GetIndexedEnumDisplayValue(kPlantZone, n, value);
  		zonePop->Insert(n, value.c_str());
! 		if(n << 1L == _zone)
  			zonePop->SetValue(n);
  	}
--- 80,86 ----
  		AttributeDictionary::GetIndexedEnumDisplayValue(kPlantZone, n, value);
  		zonePop->Insert(n, value.c_str());
! 		if(_zone == 0)
! 			zonePop->SetValue(0);
! 		else if(1L << (n-1) == _zone)
  			zonePop->SetValue(n);
  	}
***************
*** 160,163 ****
--- 162,166 ----
  	XGPopControl		*zonePop, *regionPop;
  	char				shortMsg[256], longMsg[256];
+ 	long				val;
  
  	switch (viewID)
***************
*** 166,170 ****
  			zonePop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSiteZone));
  			AssertValidView(zonePop);
! 			_zone = zonePop->GetValue() << 1L;
  			break;
  		case kSiteRegionMenu:
--- 169,177 ----
  			zonePop = dynamic_cast<XGPopControl*>(dlog->FindViewByID(kSiteZone));
  			AssertValidView(zonePop);
! 			val = zonePop->GetValue();
! 			if(val >= 1)
! 				_zone = 1L << (val - 1);
! 			else
! 				_zone = 0;
  			break;
  		case kSiteRegionMenu:
***************
*** 289,292 ****
--- 296,300 ----
  
  	_prefs->SetInt32Pref(kZoneSiteData, _zone);
+ 	
  	if(_hasSpringFrost)
  		_prefs->SetDatePref(kSpringFrostSiteData, _springFrost);