/ - Diff - Application: gvSIG desktop - gvSIG

Revision 1584

     	private int lastY;
     	private FSymbol symbol = new FSymbol(FConstant.SYMBOL_TYPE_POINT, Color.RED);
     	private JConsole console;
     	private int gridSize = 20;
     	private Point2D mapAdjustedPoint;
     	private CadMapControl cadMapControl;
     	private boolean questionAsked = false;
     	private CadGrid grid = new CadGrid();
     	private Point adjustedPoint;
     	private boolean adjustGrid;
     	/**
     	 * Pinta de alguna manera especial las geometrias seleccionadas para la
     	 * edici?n. En caso de que el snapping est? activado, pintar? el efecto
-...
     		 */
     		grid.drawGrid(g);
     		drawCursor(g);
     		if (adjustedPoint!=null){
     		Point2D p = getMapControl().getViewPort().toMapPoint((int) adjustedPoint.getX(),
     				(int) adjustedPoint.getY());
     		((CadTool) cadToolStack.peek()).drawOperation(g, editableFeatureSource,
     			selection, p.getX(), p.getY());
+    		}
+    	}
     	/**
-...
     	 */
     	private void drawCursor(Graphics g) {
     		Point p = adjustedPoint;
     		if (p==null) grid.setViewPort(cadMapControl.getMapControl().getViewPort());
     		int size1 = 15;
     		int size2 = 3;
     		g.drawLine((int) (p.getX() - size1), (int) (p.getY()),
-...
     	 * @param b
     	 */
     	public void setAdjustGrid(boolean b) {
     		adjustGrid = b;
     		grid.setAdjustGrid(b);
+    	}
+    }

      */
     package com.iver.cit.gvsig.gui.cad;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import java.awt.Graphics;
     import java.awt.Point;
     import java.awt.geom.Point2D;
     import java.awt.geom.Rectangle2D;
     /**
      * DOCUMENT ME!
      * Clase encargada de gestionar las diferentes operaciones que se realizan
      * sobre el grid.
+     *
      * @author Vicente Caballero Navarro
      */
     public class CadGrid {
     	private boolean grid = false;
     	private int gridSize = 20;
     	private CadMapControl cadmapcontrol;
     	private int gridSize = 1000;
     	private ViewPort viewport;
     	private boolean adjustGrid;
     	/**
     	 * Crea un nuevo CadGrid.
     	 * Inserta el viewPort.
+    	 *
     	 * @param cmc DOCUMENT ME!
     	 * @param vp
     	 */
     	public CadGrid() {
     	public void setViewPort(ViewPort vp) {
     		viewport = vp;
+    	}
     public void setCadMapControl(CadMapControl cmc){
     	cadmapcontrol=cmc;
+    }
     	/**
     	 * Ajusta un punto de la imagen que se pasa como  par?metro al handler m?s
     	 * cercano si se encuentra lo suficientemente  cerca y devuelve la
-...
     	 */
     	public double adjustToGrid(Point point) {
     		if (grid) {
     			Point p = new Point(point);
     			point.x = (((int) point.getX() + (gridSize / 2)) / gridSize) * gridSize;
     			point.y = (((int) point.getY() + (gridSize / 2)) / gridSize) * gridSize;
     			Point2D auxp = new Point2D.Double(0, 0);
     			Point2D po = viewport.toMapPoint(point);
     			Rectangle2D extent = viewport.getAdjustedExtent();
     			double x = ((po.getX() + gridSize) % gridSize) -
     				((auxp.getX()) % gridSize);
     			double y = ((po.getY() + gridSize) % gridSize) -
     				((auxp.getY()) % gridSize);
     			Point2D p = new Point(point);
     			point.x = (int) (p.getX() - viewport.fromMapDistance(x));
     			point.y = (int) (p.getY() + viewport.fromMapDistance(y));
     			return p.distance(point);
+    		}
-...
     			return;
+    		}
     		for (int x = 0; x < cadmapcontrol.getWidth(); x += gridSize) {
     			for (int y = 0; y < cadmapcontrol.getHeight(); y += gridSize) {
     				g.drawRect(x, y, 1, 1);
     		Rectangle2D extent = viewport.getAdjustedExtent();
     		Point2D auxp = new Point2D.Double(0, 0);
     		for (int i = (int) extent.getMinX(); i < (extent.getMaxX() + gridSize);
     				i += gridSize) {
     			for (int j = (int) extent.getMinY();
     					j < (extent.getMaxY() + gridSize); j += gridSize) {
     				Point2D po = new Point2D.Double(i, j);
     				Point2D point = viewport.fromMapPoint(po);
     				double x = ((po.getX() + gridSize) % gridSize) -
     					((auxp.getX()) % gridSize);
     				double y = ((po.getY() + gridSize) % gridSize) -
     					((auxp.getY()) % gridSize);
     				x = (int) (point.getX() - viewport.fromMapDistance(x));
     				y = (int) (point.getY() + viewport.fromMapDistance(y));
     				g.drawOval((int) x, (int) y, 1, 1);
+    			}
+    		}
+    	}
     	public void setUseGrid(boolean b){
     		grid=b;
     	/**
     	 * Inserta un boolean que indica si se utiliza o no el grid y de esta forma
     	 * dibujarse.
+    	 *
     	 * @param b boolean
     	 */
     	public void setUseGrid(boolean b) {
     		grid = b;
+    	}
     	/**
     	 * Inserta un boolean que indica si se ajusta o no al grid y de esta forma
     	 * dibujarse.
+    	 *
     	 * @param b boolean
     	 */
     	public void setAdjustGrid(boolean b) {
     		adjustGrid = b;
+    	}
+    }

Also available in: Unified diff