[Igarden-commit] Garden/source/LayoutDB Element.h, 1.38.2.13, 1.38.2.14 PaintElement.cpp, 1.26.2.9, 1.26.2.10 Element.cpp, 1.40.2.12, 1.40.2.13 BSPNode.cpp, 1.28.2.7, 1.28.2.8

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

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

Modified Files:
      Tag: Release_branch_v1
	Element.h PaintElement.cpp Element.cpp BSPNode.cpp 
Log Message:
Fix problem where elements would look selected when they weren't

Index: BSPNode.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.cpp,v
retrieving revision 1.28.2.7
retrieving revision 1.28.2.8
diff -C2 -d -r1.28.2.7 -r1.28.2.8
*** BSPNode.cpp	26 Mar 2008 22:23:14 -0000	1.28.2.7
--- BSPNode.cpp	10 May 2008 22:50:40 -0000	1.28.2.8
***************
*** 458,462 ****
  			{
  				elem->Draw(view);
! 				if(elem->IsSelected())
  				{
  					elem->DrawAnchorPoints(view);
--- 458,462 ----
  			{
  				elem->Draw(view);
! 				if(elem->IsSelected(view))
  				{
  					elem->DrawAnchorPoints(view);

Index: Element.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.cpp,v
retrieving revision 1.40.2.12
retrieving revision 1.40.2.13
diff -C2 -d -r1.40.2.12 -r1.40.2.13
*** Element.cpp	19 Apr 2008 11:18:17 -0000	1.40.2.12
--- Element.cpp	10 May 2008 22:50:40 -0000	1.40.2.13
***************
*** 59,63 ****
  : _layer(0)
  {
- 	_isSelected = false;
  	_visible = true;
  	_creatingTool = NULL;
--- 59,62 ----
***************
*** 74,78 ****
  	PRECONDITION(layer != NULL);
  	_layer = layer;
- 	_isSelected = false;
  	_visible = true;
  	_creatingTool = NULL;
--- 73,76 ----
***************
*** 87,91 ****
  : _layer(0)
  {
- 	_isSelected = false;
  	_visible = true;
  	_bounds.yOffset = top;
--- 85,88 ----
***************
*** 464,470 ****
  ///	IsSelected
  //
! bool Element::IsSelected()
  {
! 	return _isSelected;
  }
  
--- 461,467 ----
  ///	IsSelected
  //
! bool Element::IsSelected(PlanView *view)
  {
! 	return view->IsElementSelected(this);
  }
  
***************
*** 988,1011 ****
  
  // ---------------------------------------------------------------------------
- //		void	Element::Select( bool doSelect, WritablePlanView* view )
- // ---------------------------------------------------------------------------
- //
- 
- 
- void
- Element::Select( bool doSelect, WritablePlanView* view )
- {
- 	PRECONDITION(view != NULL);
- 	_isSelected = doSelect;
- 	RefreshElement(view);
- }
- 
- 
- 
- 
- 
- 
- 
- // ---------------------------------------------------------------------------
  ///	RefreshElement
  //
--- 985,988 ----
***************
*** 1119,1123 ****
  	PRECONDITION(layer != NULL);
  	toElement->_layer = layer;
- 	toElement->_isSelected = _isSelected;
  	count = _overlapPoints.Length();
  	for(n = 0; n < count; n++)
--- 1096,1099 ----

Index: Element.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/Element.h,v
retrieving revision 1.38.2.13
retrieving revision 1.38.2.14
diff -C2 -d -r1.38.2.13 -r1.38.2.14
*** Element.h	4 May 2008 11:38:47 -0000	1.38.2.13
--- Element.h	10 May 2008 22:50:31 -0000	1.38.2.14
***************
*** 156,160 ****
  		static void				RegisterElementClasses();
  #pragma mark Test
! 		bool					IsSelected();
  		virtual bool			IsPointOver(planPoint_t point, PlanView* view);
  		bool					IntersectsUpdateRegion(PlanView* view);
--- 156,160 ----
  		static void				RegisterElementClasses();
  #pragma mark Test
! 		bool					IsSelected(PlanView *view);
  		virtual bool			IsPointOver(planPoint_t point, PlanView* view);
  		bool					IntersectsUpdateRegion(PlanView* view);
***************
*** 216,220 ****
  		virtual void*			CloneFromTemplate();
  		virtual planRectangle_t	GetBoundingRectangle() = 0;
- 		virtual void			Select(bool doSelect, WritablePlanView* view);
  		virtual void			RefreshElement(PlanView* intoView);
  		virtual void			RefreshContent(PlanView* intoView);
--- 216,219 ----
***************
*** 249,253 ****
  		// attributes
  		Layer*						_layer;
- 		bool						_isSelected;
  		XGDynArray<overlapPoint_t>	_overlapPoints;
  		XGDynArray<warningEntry_t>	_warnings;
--- 248,251 ----

Index: PaintElement.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PaintElement.cpp,v
retrieving revision 1.26.2.9
retrieving revision 1.26.2.10
diff -C2 -d -r1.26.2.9 -r1.26.2.10
*** PaintElement.cpp	26 Mar 2008 22:21:35 -0000	1.26.2.9
--- PaintElement.cpp	10 May 2008 22:50:38 -0000	1.26.2.10
***************
*** 227,231 ****
  				_path->DrawBounds(view);
  			}
! 			if(ShouldDrawCenterline() || IsSelected())
  			{
  				view->SetLineType(view->GetDefaultPaintLineType());
--- 227,231 ----
  				_path->DrawBounds(view);
  			}
! 			if(ShouldDrawCenterline() || IsSelected(view))
  			{
  				view->SetLineType(view->GetDefaultPaintLineType());