[Igarden-commit] Garden/source/LayoutDB MaterialCollection.cpp, 1.6.2.3, 1.6.2.4 MaterialCollection.h, 1.5.2.3, 1.5.2.4

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialCollection.cpp MaterialCollection.h 
Log Message:
Fully implement planting regions for choosing the quick pick list 

Index: MaterialCollection.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.cpp,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** MaterialCollection.cpp	12 Dec 2006 03:57:09 -0000	1.6.2.3
--- MaterialCollection.cpp	13 Dec 2006 12:11:22 -0000	1.6.2.4
***************
*** 352,355 ****
--- 352,372 ----
  }
  
+ // ---------------------------------------------------------------------------
+ ///	ParseXML
+ //
+ void MaterialCollection::GetNameFromXML(XGXMLObject *obj, String &str)
+ {
+ 	XGXMLData		*dataObj;
+ 	const char		*val;
+ 
+ 	dataObj = dynamic_cast<XGXMLData*>(obj);
+ 	PRECONDITION(strcmp(dataObj->GetTag(), "Palette") == 0);
+ 	val = dataObj->GetArgValue("Name");
+ 	if(val != NULL)
+ 		str.SetCString(val);
+ 	else
+ 		str.SetCString("");
+ }
+ 
  //elem.name = material->GetDisplayName(kUsePreferencesSetting);
  

Index: MaterialCollection.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialCollection.h,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -d -r1.5.2.3 -r1.5.2.4
*** MaterialCollection.h	12 Dec 2006 23:23:15 -0000	1.5.2.3
--- MaterialCollection.h	13 Dec 2006 12:11:22 -0000	1.5.2.4
***************
*** 64,67 ****
--- 64,68 ----
  	
  		void				ParseXML(XGXMLObject *obj);
+ 		static void			GetNameFromXML(XGXMLObject *obj, String &str);
  		
  	protected: