Revision 2962 trunk/extensions/extGeoreferencing/src/com/iver/cit/gvsig/fmap/layers/FLyrPoints.java

View differences:

FLyrPoints.java
62 62
 */
63 63
public class FLyrPoints extends FLyrDefault {
64 64
	
65
	public class GeoPoint{
66
		public Point2D pixelPoint = null;
67
		public Point2D mapPoint = null;
68
		public GeoPoint(Point2D p, Point2D m){
69
			this.pixelPoint = p;
70
			this.mapPoint = m;
71
		}
72
	}
73
	
65 74
	private ArrayList pointList = new ArrayList();
66 75
	private final int DIAM_CIRCLE = 18;
67 76
	private String lastTool = null;
......
78 87
		g.setColor(Color.red);
79 88
				
80 89
		for(int i=0; i<pointList.size();i++){
81
			Point2D pto = vp.fromMapPoint((Point2D)pointList.get(i));
90
			//Point2D pto = vp.fromMapPoint((Point2D)pointList.get(i));
91
			Point2D pto = ((GeoPoint)pointList.get(i)).pixelPoint;
82 92
			int dpto = (DIAM_CIRCLE >> 1);
83 93
			g.drawOval(	(int)pto.getX() - dpto, 
84 94
						(int)pto.getY() - dpto, 
......
104 114
	 * A?ade un punto a la lista
105 115
	 * @param point punto para la lista
106 116
	 */
107
	public void addPoint(Point2D point){
108
		pointList.add(point);
117
	public void addPoint(Point2D pixel, Point2D map){
118
		pointList.add(new GeoPoint(pixel, map));
109 119
	}
110 120
	
111 121
	/**
122
	 * Actualiza un punto de la lista de una posici?n determinada
123
	 * @param point punto para la lista
124
	 */
125
	public void updatePoint(Point2D pixel, Point2D map, int pos){
126
		GeoPoint gp = (GeoPoint)pointList.get(pos);
127
		if(pixel != null)
128
			gp.pixelPoint = pixel;
129
		if(map != null)
130
			gp.mapPoint = map;
131
	}
132
	
133
	/**
112 134
	 * Devuelve el n?mero de puntos de la lista
113 135
	 * @return
114 136
	 */

Also available in: Unified diff