[GME-commit] GMESRC/GME/Gme GMEView.cpp,1.170,1.171

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv26630

Modified Files:
	GMEView.cpp 
Log Message:
Bug Fix for the case when the user inserts an annotation, and specifies aspect visibility information such that in the current aspect the annotation will be hidden.
Previously in such cases the annotation was drawn, and it disappeared after a 'Repaint'.
The doubleclicked/selected annotation might become hidden in the current aspect since the user can make modifications in the annotation editor dialog.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** GMEView.cpp	6 Jul 2005 23:09:11 -0000	1.170
--- GMEView.cpp	7 Jul 2005 19:16:24 -0000	1.171
***************
*** 682,689 ****
  			while(pos) {
  				ann = selectedAnnotations.GetNext(pos);
! 				tracker.m_rect = ann->GetLocation();
! 				pDC->LPtoDP(&tracker.m_rect);
! 				tracker.m_nStyle = CRectTracker::solidLine | CRectTracker::resizeInside;
! 				tracker.Draw(pDC);
  			}
  		}
--- 682,692 ----
  			while(pos) {
  				ann = selectedAnnotations.GetNext(pos);
! 				if( ann->IsVisible()) // the selectedAnnotation might become hidden is this aspect
! 				{
! 					tracker.m_rect = ann->GetLocation();
! 					pDC->LPtoDP(&tracker.m_rect);
! 					tracker.m_nStyle = CRectTracker::solidLine | CRectTracker::resizeInside;
! 					tracker.Draw(pDC);
! 				}
  			}
  		}