[Igarden-commit] Garden/source/SourceMaterialDB Material.h, 1.22.2.1, 1.22.2.2 PlantSelection.cpp, 1.27, 1.27.2.1 Material.cpp, 1.43.2.2, 1.43.2.3

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

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

Modified Files:
      Tag: Release_branch_v1
	Material.h PlantSelection.cpp Material.cpp 
Log Message:
Add extra note that picture may differ

Index: PlantSelection.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/PlantSelection.cpp,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -C2 -d -r1.27 -r1.27.2.1
*** PlantSelection.cpp	24 May 2006 12:16:50 -0000	1.27
--- PlantSelection.cpp	29 Dec 2006 21:18:31 -0000	1.27.2.1
***************
*** 620,623 ****
--- 620,624 ----
  	bool				usedInDocument = false;
  	XGScrollView		*scrollView;
+ 	pictureLikeness_t	likeness;
  	
  	displayView = dynamic_cast<RGHypertextView*>(_window->FindViewByID(kLowerDescription));
***************
*** 633,637 ****
  		text += filePath.c_str();
  		text += "'>";
! 		resultName = _currentMat->GetPictureTitle(kUsePreferencesSetting, kNameAsHTML);
  	}
  	else
--- 634,638 ----
  		text += filePath.c_str();
  		text += "'>";
! 		resultName = _currentMat->GetPictureTitle(kUsePreferencesSetting, kNameAsHTML, likeness);
  	}
  	else
***************
*** 792,795 ****
--- 793,797 ----
  	long			n, count;
  	PictureInfo		entry;
+ 	pictureLikeness_t likeness;
  	
  	displayView = dynamic_cast<RGHypertextView*>(_window->FindViewByID(kLowerDescription));
***************
*** 804,808 ****
  	{
  		_currentMat->GetIndexedPictureAlternative(n, entry);
! 		canon = _currentMat->GetIndexedPictureTitle(n, kUsePreferencesSetting, kNameAsHTML);
  		
  		XGUUID			uid;
--- 806,810 ----
  	{
  		_currentMat->GetIndexedPictureAlternative(n, entry);
! 		canon = _currentMat->GetIndexedPictureTitle(n, kUsePreferencesSetting, kNameAsHTML, likeness);
  		
  		XGUUID			uid;

Index: Material.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.cpp,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -C2 -d -r1.43.2.2 -r1.43.2.3
*** Material.cpp	29 Dec 2006 04:23:45 -0000	1.43.2.2
--- Material.cpp	29 Dec 2006 21:18:32 -0000	1.43.2.3
***************
*** 1037,1055 ****
  }
  
! String Material::GetPictureTitle(namePreference_t pref, nameFormat_t fmt)
  {
  	PictureInfo entry;
  	GetDefaultPictureTag(entry);
! 	return InternGetPictureTitle(pref, fmt, entry);
  }
  
! String Material::GetIndexedPictureTitle(long index, namePreference_t pref, nameFormat_t fmt)
  {
  	PictureInfo entry;
  	GetIndexedPictureAlternative(index, entry);
! 	return InternGetPictureTitle(pref, fmt, entry);
  }
  
! String Material::InternGetPictureTitle(namePreference_t pref, nameFormat_t fmt, PictureInfo &entry)
  {
  	String		result, canon, species, variety;
--- 1037,1055 ----
  }
  
! String Material::GetPictureTitle(namePreference_t pref, nameFormat_t fmt, pictureLikeness_t &likeness)
  {
  	PictureInfo entry;
  	GetDefaultPictureTag(entry);
! 	return InternGetPictureTitle(pref, fmt, entry, likeness);
  }
  
! String Material::GetIndexedPictureTitle(long index, namePreference_t pref, nameFormat_t fmt, pictureLikeness_t &likeness)
  {
  	PictureInfo entry;
  	GetIndexedPictureAlternative(index, entry);
! 	return InternGetPictureTitle(pref, fmt, entry, likeness);
  }
  
! String Material::InternGetPictureTitle(namePreference_t pref, nameFormat_t fmt, PictureInfo &entry, pictureLikeness_t &likeness)
  {
  	String		result, canon, species, variety;
***************
*** 1091,1096 ****
  					result += name;
  				}
! 				if(!variety.empty())
  				{
  					result += " '";
  					result += variety;
--- 1091,1099 ----
  					result += name;
  				}
! 				if(variety.empty())
! 					likeness = kPictureMayDiffer;
! 				else
  				{
+ 					likeness = kPictureExact;
  					result += " '";
  					result += variety;
***************
*** 1100,1103 ****
--- 1103,1107 ----
  			else if(compare == kPartialNameMatch)
  			{
+ 				likeness = kPictureWillDiffer;
  				if(pref == kPreferCanonical || pref == kPreferBoth)
  				{
***************
*** 1131,1134 ****
--- 1135,1139 ----
  		else if(strlen(entry.GetTitle()) != 0)
  		{
+ 			likeness = kPictureExact;
  			result += entry.GetTitle();
  		}
***************
*** 1139,1142 ****
--- 1144,1148 ----
  		String	varName;
  		
+ 		likeness = kPictureExact;
  		GetString(kFieldCommonName, result);
  		var = GetVariant();

Index: Material.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/Material.h,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -d -r1.22.2.1 -r1.22.2.2
*** Material.h	12 Dec 2006 00:54:39 -0000	1.22.2.1
--- Material.h	29 Dec 2006 21:18:31 -0000	1.22.2.2
***************
*** 60,63 ****
--- 60,70 ----
  } nameFormat_t;
  
+ typedef enum
+ {
+ 	kPictureExact,
+ 	kPictureMayDiffer,
+ 	kPictureWillDiffer
+ } pictureLikeness_t;
+ 
  extern materialID_t	gNilMaterialID;
  
***************
*** 120,125 ****
  		void				GetPictureRelativePath(String &filePath);
  		bool				GetPictureFileSpec(XGFileSpecifier& fileSpec);
! 		String				GetPictureTitle(namePreference_t pref, nameFormat_t fmt);
! 		String				GetIndexedPictureTitle(long index, namePreference_t pref, nameFormat_t fmt);
  		long				GetNumPictureAlternatives();
  		void				GetIndexedPictureAlternative(long index, PictureInfo& entry);
--- 127,132 ----
  		void				GetPictureRelativePath(String &filePath);
  		bool				GetPictureFileSpec(XGFileSpecifier& fileSpec);
! 		String				GetPictureTitle(namePreference_t pref, nameFormat_t fmt, pictureLikeness_t &differ);
! 		String				GetIndexedPictureTitle(long index, namePreference_t pref, nameFormat_t fmt, pictureLikeness_t &differ);
  		long				GetNumPictureAlternatives();
  		void				GetIndexedPictureAlternative(long index, PictureInfo& entry);
***************
*** 179,183 ****
  		// methods
  		String *			GetAttributeValueStr(attributeID_t attr, measureUnits_t units);
! 		String				InternGetPictureTitle(namePreference_t pref, nameFormat_t fmt, PictureInfo &entry);
  		materialID_t		_idCache;
  		
--- 186,190 ----
  		// methods
  		String *			GetAttributeValueStr(attributeID_t attr, measureUnits_t units);
! 		String				InternGetPictureTitle(namePreference_t pref, nameFormat_t fmt, PictureInfo &entry, pictureLikeness_t &differ);
  		materialID_t		_idCache;