[Igarden-commit] Garden/source/PlanTool ActiveMaterial.cpp, 1.45.2.7, 1.45.2.8

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

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

Modified Files:
      Tag: Release_branch_v1
	ActiveMaterial.cpp 
Log Message:
Re-enable plant picture display (was disabled by speed improvements to SourceMaterialFile)

Index: ActiveMaterial.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/ActiveMaterial.cpp,v
retrieving revision 1.45.2.7
retrieving revision 1.45.2.8
diff -C2 -d -r1.45.2.7 -r1.45.2.8
*** ActiveMaterial.cpp	2 Dec 2006 05:30:55 -0000	1.45.2.7
--- ActiveMaterial.cpp	19 Dec 2006 12:51:22 -0000	1.45.2.8
***************
*** 43,46 ****
--- 43,47 ----
  #include "PlanPaletteView.h"
  #include "CPlanPanel.h"
+ #include "SourceQuery.h"
  
  using yaaf::XGBroadcast;
***************
*** 369,372 ****
--- 370,376 ----
  	if(material != NULL)
  	{
+ 		String		fullName = material->GetFullCanonicalName();
+ 		SourceQuery	query(SourceMaterialFile::GetSourceDatabase());
+ 		
  		if(material->GetPictureFileSpec(fileSpec))
  			material->GetPictureRelativePath(fileName);
***************
*** 374,378 ****
  		{
  			material->GetString(kMaterialPlanDrawing, fileName);
! 			if(fileName.Length() != 0)
  				isSVG = true;
  		}
--- 378,387 ----
  		{
  			material->GetString(kMaterialPlanDrawing, fileName);
! 			if(fileName.Length() == 0)
! 			{
! 				query.FindPictures(fullName, kOnePicture);
! 				material->GetPictureRelativePath(fileName);
! 			}
! 			else
  				isSVG = true;
  		}