[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/geotools MarkerLayer.java,1.6,1.7

[James M. <jma...@us...>]

Update of /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools
In directory usw-pr-cvs1:/tmp/cvs-serv7147/uk/ac/leeds/ccg/geotools

Modified Files:
	MarkerLayer.java 
Log Message:
Made sure paintScaled takes filters into account



Index: MarkerLayer.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools/MarkerLayer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarkerLayer.java	2001/07/31 10:37:24	1.6
--- MarkerLayer.java	2001/11/20 17:59:29	1.7
***************
*** 14,18 ****
      public void addMarker(GeoPoint p){
          addGeoPoint(p);
!        
          markers.put(new Integer(p.getID()),defaultMarker);
      }
--- 14,18 ----
      public void addMarker(GeoPoint p){
          addGeoPoint(p);
!         
          markers.put(new Integer(p.getID()),defaultMarker);
      }
***************
*** 26,63 ****
          defaultMarker = m;
      }
! 		public void setDefaultSize(int i){
! 			defaultSize=i;
! 		}
!    
      
!     public void paintScaled(GeoGraphics gg)
!     {
          GeoPoint temp;
          for(int i = 0;i < shapeList.size() ;i++) {
! 			    temp = (GeoPoint)shapeList.elementAt(i);
!                             Integer id = new Integer(temp.getID());
!                             Marker m = (Marker)markers.get(id);
!                             if(m==null) m=defaultMarker;
! 			    m.paintScaled(gg,temp,defaultSize);
! 		}
          
      }
      
!      public void paintHighlight(Graphics g, Scaler scale, int id, ShadeStyle style)
!     {
          int p[],r;
          r = style.getLineWidth();
! 		for(int i = 0;i < shapeList.size();i++) {
! 			GeoPoint temp = (GeoPoint)shapeList.elementAt(i);
! 			if(temp.getID()==id){
! 				Integer idObj = new Integer(temp.getID());
!                                 Marker m = (Marker)markers.get(idObj);
!                                 if(m==null) m=defaultMarker;
!                                 m.paintHighlight(g,temp,defaultSize,scale,style);
! 			}
! 		}
      }
      
!      
      
  }
--- 26,64 ----
          defaultMarker = m;
      }
!     public void setDefaultSize(int i){
!         defaultSize=i;
!     }
      
!     
!     public void paintScaled(GeoGraphics gg) {
          GeoPoint temp;
+         Filter filter= gg.getFilter();
          for(int i = 0;i < shapeList.size() ;i++) {
!             temp = (GeoPoint)shapeList.elementAt(i);
!             Integer id = new Integer(temp.getID());
!             if(filter==null || filter.isVisible(id.intValue())){
!                 Marker m = (Marker)markers.get(id);
!                 if(m==null) m=defaultMarker;
!                 m.paintScaled(gg,temp,defaultSize);
!             }
!         }
          
      }
      
!     public void paintHighlight(Graphics g, Scaler scale, int id, ShadeStyle style) {
          int p[],r;
          r = style.getLineWidth();
!         for(int i = 0;i < shapeList.size();i++) {
!             GeoPoint temp = (GeoPoint)shapeList.elementAt(i);
!             if(temp.getID()==id){
!                 Integer idObj = new Integer(temp.getID());
!                 Marker m = (Marker)markers.get(idObj);
!                 if(m==null) m=defaultMarker;
!                 m.paintHighlight(g,temp,defaultSize,scale,style);
!             }
!         }
      }
      
!     
      
  }