[Igarden-commit] Garden/source/PlanTool MaterialInfoPanel.cpp, 1.17.2.7, 1.17.2.8 MaterialInfoPanel.h, 1.7.2.2, 1.7.2.3

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

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

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

Index: MaterialInfoPanel.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/MaterialInfoPanel.cpp,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -C2 -d -r1.17.2.7 -r1.17.2.8
*** MaterialInfoPanel.cpp	17 May 2008 21:52:37 -0000	1.17.2.7
--- MaterialInfoPanel.cpp	23 May 2008 11:23:17 -0000	1.17.2.8
***************
*** 29,32 ****
--- 29,34 ----
  #include "RGSlideControl.h"
  #include "XMessages.h"
+ #include "AttributeDictionary.h"
+ #include "InstanceData.h"
  #include "MaterialInfoForm.h"
  #include "RGPanelSet.h"
***************
*** 184,189 ****
--- 186,193 ----
  	PlanView			*planView;
  	short				minYear, maxYear, primaryYear;
+ 	uint32				i, count;
  	double				percentSize;
  	Material			*mat;
+ 	String				name;
  	
  	planView  = _parent->GetPlanView();
***************
*** 222,225 ****
--- 226,251 ----
  	textGad = dynamic_cast<XGStaticText*>(_view->FindViewByID(kPlantInfoSpacingText));
  	textGad->SetTitle(message);
+ 	
+ 	XGPopControl	*pop;
+ 	
+ 	pop = dynamic_cast<XGPopControl*>(_view->FindViewByID(8));
+ 	AssertValidView(pop);
+ 	pop->DeleteAll();
+ 	count = AttributeDictionary::NumEnumValues(kInstancePruningType);
+ 	for(i = 0; i < count; i++)
+ 	{
+ 		AttributeDictionary::GetIndexedEnumDisplayValue(kInstancePruningType, i, name );
+ 		pop->Append(name.c_str());
+ 	}
+ 	InstanceData*	inst = ref->LatestInstanceData(kInstancePruningType);
+ 	if(inst != NULL)
+ 	{
+ 		Int32	val;
+ 		
+ 		inst->GetInt32(kInstancePruningType, &val);
+ 		pop->SetValue(val);
+ 	}
+ 	else
+ 		pop->SetValue(0);
  }
  
***************
*** 292,295 ****
--- 318,338 ----
  
  
+ long PlantInfoPanel::DoPopValue(long /*arg*/, void* /*parg*/)
+ {
+ 	long			item;
+ 	InstanceData	*inst;
+ 	
+ 	inst = _ref->LatestInstanceData();
+ 	if(inst != NULL)
+ 	{
+ 		XGPopControl	*pop = dynamic_cast<XGPopControl*>(_view->FindViewByID(8));
+ 		AssertValidView(pop);
+ 		inst->SetInt32(kInstancePruningType, pop->GetValue());
+ 	}
+ 	
+ 	return 0;
+ }
+ 
+ 
  //****************************************************************
  //****************************************************************

Index: MaterialInfoPanel.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/PlanTool/MaterialInfoPanel.h,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -C2 -d -r1.7.2.2 -r1.7.2.3
*** MaterialInfoPanel.h	16 Feb 2008 19:24:10 -0000	1.7.2.2
--- MaterialInfoPanel.h	23 May 2008 11:23:17 -0000	1.7.2.3
***************
*** 84,87 ****
--- 84,88 ----
  	virtual	void			ComputeWindowTitle(String &title);
  	virtual	void			ComputeDescriptiveText(measureUnits_t units, String &title);
+ 	virtual	long			DoPopValue(long /*arg*/, void* /*parg*/);
  };