/ - Diff - | gvSIG desktop 1 - gvSIG

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import javax.print.attribute.PrintRequestAttributeSet;
     public abstract class AbstractSymbol implements ISymbol {
     	protected PrintRequestAttributeSet printProperties;
     	private String desc;
     	private boolean isShapeVisible = true;
     	public void setPrintingProperties(PrintRequestAttributeSet printProperties) {
     		this.printProperties = printProperties;
+    	}
     	public final void setDescription(String desc) {
     		this.desc = desc;
+    	}
     	public final String getDescription() {
     		return desc;
+    	}
     	public final boolean isShapeVisible() {
     		return isShapeVisible;
+    	}
     	/**
     	 * Sets this symbol to visible
     	 * @param isShapeVisible
     	 */
     	public final void setIsShapeVisible(boolean isShapeVisible) {
     		this.isShapeVisible = isShapeVisible;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2006/12/04 17:13:39  fjp
     * *** empty log message ***
+    *
     * Revision 1.3  2006/11/14 11:10:27  jaume
     * *** empty log message ***
+    *
     * Revision 1.2  2006/11/09 18:39:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/10/31 16:16:34  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2006/10/30 19:30:35  jaume
     * *** empty log message ***
+    *
     * Revision 1.3  2006/10/26 16:27:33  jaume
     * support for composite marker symbols (not tested)
+    *
     * Revision 1.2  2006/10/26 07:46:58  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/10/25 10:50:41  jaume
     * movement of classes and gui stuff
+    *
     * Revision 1.1  2006/10/18 07:54:06  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Color;
     import java.awt.Point;
     import java.awt.geom.Point2D;
     import java.util.ArrayList;
     import javax.print.attribute.PrintRequestAttributeSet;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.IGeometry;
     /**
      * Abstract class that any MARKER SYMBOL should extend.
+     *
      * @author jaume dominguez faus - jaume.dominguez@iver.es
      */
     public abstract class AbstractMarkerSymbol extends AbstractSymbol {
     	protected Color color = Color.BLACK;
     	protected double rotation;
     	protected Point2D offset;
     	protected ISymbol[] subSymbols; // TODO maybe push it up to ISymbol
     	public double getRotation() {
     		return rotation;
+    	}
     	public void setRotation(double r) {
     		this.rotation = r;
+    	}
     	public Point2D getOffset() {
     		if (offset == null) {
     			offset = new Point();
+    		}
     		return offset;
+    	}
     	public void setOffset(Point offset) {
     		this.offset = offset;
+    	}
     	/**
     	 * TODO maybe push it up to ISymbol
     	 * @param sym
     	 */
     	public void addSymbol(ISymbol sym) {
     		int capacity = 0;
     		if (subSymbols != null)
     			capacity = subSymbols.length;
     		ArrayList lst = new ArrayList(capacity);
     		for (int i = 0; i < capacity; i++) {
     			lst.add(subSymbols[i]);
+    		}
     		subSymbols = (ISymbol[])lst.toArray(new ISymbol[0]);
+    	}
     	/**
     	 * TODO maybe push it up to ISymbol
     	 * @param sym
     	 * @return true if this symbol contains the removed one
     	 */
     	public boolean removeSymbol(ISymbol sym) {
     		int capacity = 0;
     		if (subSymbols != null)
     			capacity = subSymbols.length;
     		ArrayList lst = new ArrayList(capacity);
     		for (int i = 0; i < capacity; i++) {
     			lst.add(subSymbols[i]);
+    		}
     		boolean contains = lst.remove(sym);
     		subSymbols = (ISymbol[])lst.toArray(new ISymbol[0]);
     		return contains;
+    	}
     	public boolean isSuitableFor(IGeometry geom) {
     		return geom.getGeometryType() == FShape.POINT;
+    	}
     	public int getOnePointRgb() {
     		return color.getRGB();
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Graphics2D;
     import java.awt.Rectangle;
     import java.awt.Shape;
     import java.awt.geom.AffineTransform;
     import javax.print.attribute.PrintRequestAttributeSet;
     import com.hardcode.gdbms.engine.data.driver.DriverException;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.IGeometry;
     import com.iver.utiles.XMLEntity;
     public class MultiLayerSymbol extends AbstractSymbol {
     	private ISymbol[] layers;
     	private MultiLayerSymbol selectionSymbol;
     	public ISymbol getLayer(int layerIndex) {
     		try{
     			return layers[layerIndex];
     		} catch (Exception e) {
     			return null;
+    		}
+    	}
     	public int getLayerCount() {
     		if (layers == null)
     			return -1;
     		return layers.length;
+    	}
     	public ISymbol getSymbolForSelection() {
     		if (selectionSymbol == null) {
     			selectionSymbol = new MultiLayerSymbol();
     			selectionSymbol.setDescription(getDescription());
     			for (int i = 0; i < layers.length; i++) {
     				selectionSymbol.addLayer(layers[i].getSymbolForSelection());
+    			}
+    		}
     		return selectionSymbol;
+    	}
     	public void addLayer(ISymbol newLayer) {
     		selectionSymbol = null; /* forces the selection symbol to be re-created
     								 * next time it is required
     								 */
     		ISymbol[] newLayers = new ISymbol[layers.length+1];
     		for (int i = 0; i < newLayers.length-1; i++) {
     			newLayers[i] = layers[i];
+    		}
     		layers[layers.length] = newLayer;
+    	}
     	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
     		for (int i = 0; i < layers.length; i++) {
     			layers[i].draw(g, affineTransform, shp);
+    		}
+    	}
     	public int getPixExtentPlus(Graphics2D g, AffineTransform affineTransform, Shape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public int getOnePointRgb() {
     		// will paint only the last layer pixel
     		return layers[layers.length-1].getOnePointRgb();
+    	}
     	public XMLEntity getXMLEntity() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public int getSymbolType() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public boolean isSuitableFor(IGeometry geom) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void drawInsideRectangle(Graphics2D g, AffineTransform scaleInstance, Rectangle r) {
     		for (int i = 0; i < layers.length; i++) {
     			layers[i].drawInsideRectangle(g, scaleInstance, r);
+    		}
+    	}
     	public String getClassName() {
     		return getClass().getName();
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void setPrintingProperties(PrintRequestAttributeSet properties) {
     		for (int i = 0; i < layers.length; i++) {
     			layers[i].setPrintingProperties(properties);
+    		}
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
     * Revision 1.10  2006/11/09 18:39:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.9  2006/11/09 10:22:50  jaume
     * *** empty log message ***
+    *
     * Revision 1.8  2006/11/08 13:05:51  jaume
     * *** empty log message ***
+    *
     * Revision 1.7  2006/11/08 10:56:47  jaume
     * *** empty log message ***
+    *
     * Revision 1.6  2006/11/07 08:52:30  jaume
     * *** empty log message ***
+    *
     * Revision 1.5  2006/11/06 17:08:45  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2006/11/06 16:06:52  jaume
     * *** empty log message ***
+    *
     * Revision 1.3  2006/11/06 07:33:54  jaume
     * javadoc, source style
+    *
     * Revision 1.2  2006/10/31 16:16:34  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/10/30 19:30:35  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.BasicStroke;
     import java.awt.Color;
     import java.awt.Dimension;
     import java.awt.Graphics2D;
     import java.awt.Paint;
     import java.awt.Rectangle;
     import java.awt.RenderingHints;
     import java.awt.Shape;
     import java.awt.TexturePaint;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import java.awt.image.BufferedImage;
     import java.util.ArrayList;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.SymbolFactory;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
     public class MarkerFillSymbol extends AbstractFillSymbol {
     	private double rotation;
     	private AbstractMarkerSymbol markerSymbol = new CharacterMarkerSymbol();
     	private boolean grid = true;
     	private double xOffset = 0;
     	private double yOffset = 0;
     	private double xSeparation = 20;
     	private double ySeparation = 20;
     	public boolean isGrid() {
     		return grid;
+    	}
     	public void setGrid(boolean grid) {
     		this.grid = grid;
+    	}
     	public AbstractMarkerSymbol getMarkerSymbol() {
     		return markerSymbol;
+    	}
     	public void setMarkerSymbol(AbstractMarkerSymbol markerSymbol) {
     		this.markerSymbol = markerSymbol;
+    	}
     	public double getRotation() {
     		return rotation;
+    	}
     	public void setRotation(double rotation) {
     		this.rotation = rotation;
+    	}
     	public double getXOffset() {
     		return xOffset;
+    	}
     	public void setXOffset(double offset) {
     		xOffset = offset;
+    	}
     	public double getXSeparation() {
     		return xSeparation;
+    	}
     	public void setXSeparation(double separation) {
     		xSeparation = separation;
+    	}
     	public double getYOffset() {
     		return yOffset;
+    	}
     	public void setYOffset(double offset) {
     		yOffset = offset;
+    	}
     	public double getYSeparation() {
     		return ySeparation;
+    	}
     	public void setYSeparation(double separation) {
     		ySeparation = separation;
+    	}
     	public ISymbol getSymbolForSelection() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
     		g.setColor(null);
     		g.setStroke(new BasicStroke(0));
     		int w=7;
     		int h=7;
     		BufferedImage bi = null;
     		Rectangle rProv = new Rectangle();
     		rProv.setFrame(0, 0,w,h);
     		Paint resulPatternFill = null;
     		bi= new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
     		Graphics2D gAux = bi.createGraphics();
     		markerSymbol.drawInsideRectangle(gAux, new AffineTransform(), rProv);
     		resulPatternFill = new TexturePaint(bi,rProv);
     		g.setColor(null);
     		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
     				RenderingHints.VALUE_ANTIALIAS_ON);
     		g.setPaint(resulPatternFill);
     		g.fill(shp);
+    	}
     	public int getPixExtentPlus(Graphics2D g, AffineTransform affineTransform, Shape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public XMLEntity getXMLEntity() {
     		XMLEntity xml = new XMLEntity();
     		xml.putProperty("className", getClassName());
     		// color
     		xml.putProperty("color", StringUtilities.color2String(color));
     		xml.putProperty("rotation", rotation);
     		xml.putProperty("grid", grid);
     		xml.putProperty("xOffset", xOffset);
     		xml.putProperty("yOffset", yOffset);
     		xml.putProperty("xSeparation", xSeparation);
     		xml.putProperty("ySeparation", ySeparation);
     		xml.addChild(markerSymbol.getXMLEntity());
     		return xml;
+    	}
     	public int getSymbolType() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void drawInsideRectangle(Graphics2D g, AffineTransform scaleInstance, Rectangle r) {
     		if (isGrid()) {
     			// Use a TexturePaint
     			int w=7;
     			int h=7;
     			BufferedImage bi = null;
     			Rectangle rProv = new Rectangle();
     			rProv.setFrame(0, 0,w,h);
     			Paint resulPatternFill = null;
     			bi= new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
     			Graphics2D gAux = bi.createGraphics();
     			markerSymbol.drawInsideRectangle(gAux, new AffineTransform(), rProv);
     			resulPatternFill = new TexturePaint(bi,rProv);
     			g.setColor(null);
     			g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
     					RenderingHints.VALUE_ANTIALIAS_ON);
     			g.setPaint(resulPatternFill);
     			g.fill(r);
     			g.drawRect(0, 0, r.width, r.height);
     		} else {
     			Point2D[] points = ramdonizePoints(r);
     			for (int i = 0; i < points.length; i++) {
+    			}
+    		}
+    	}
     	private Point2D[] ramdonizePoints(Rectangle r) {
     		ArrayList points = new ArrayList();
     			throw new Error("Not yet implemented!");
     //		return (Point2D[]) points.toArray(new Point2D[0]);
+    	}
     	public String getClassName() {
     		return getClass().getName();
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		rotation = xml.getDoubleProperty("rotation");
     		grid = xml.getBooleanProperty("grid");
     		xOffset = xml.getDoubleProperty("xOffset");
     		yOffset = xml.getDoubleProperty("yOffset");
     		xSeparation = xml.getDoubleProperty("xSeparation");
     		ySeparation = xml.getDoubleProperty("ySeparation");
     		markerSymbol = (AbstractMarkerSymbol) SymbolFactory.
     							createFromXML(xml.getChild(0), null);
+    	}
     	public void setMarker(AbstractMarkerSymbol marker) {
     		this.markerSymbol = marker;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
     * Revision 1.6  2006/12/04 17:13:39  fjp
     * *** empty log message ***
+    *
     * Revision 1.5  2006/11/14 11:10:27  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2006/11/09 18:39:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.3  2006/11/06 07:33:54  jaume
     * javadoc, source style
+    *
     * Revision 1.2  2006/10/31 16:16:34  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/10/30 19:30:35  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Color;
     import javax.print.attribute.PrintRequestAttributeSet;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.IGeometry;
     /**
      * Abstract class that any FILL SYMBOL should extend
+     *
      * @author jaume dominguez faus - jaume.dominguez@iver.es
+     *
      */
     public abstract class AbstractFillSymbol extends AbstractSymbol {
     	Color color = Color.WHITE;
     	Color outline = Color.BLACK; // TODO aix? canviar? a AbsrtactLineSymbol quan existisca
     	public boolean isSuitableFor(IGeometry geom) {
     		return geom.getGeometryType() == FShape.POLYGON;
+    	}
     	public int getOnePointRgb() {
     		return outline.getRGB();
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/11/14 11:10:27  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Color;
     import java.awt.Graphics2D;
     import java.awt.Rectangle;
     import java.awt.Shape;
     import java.awt.geom.AffineTransform;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.SymbolFactory;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
     public class SimpleMarkerSymbol extends AbstractMarkerSymbol {
     	private boolean outline;
     	private Color outlineColor;
     	private double outlineSize;
     	private ISymbol selectionSymbol;
     	public ISymbol getSymbolForSelection() {
     		if (selectionSymbol == null) {
     			XMLEntity xml = getXMLEntity();
     			xml.putProperty("color", StringUtilities.color2String(Color.YELLOW));
     			selectionSymbol = SymbolFactory.createFromXML(xml, getDescription() + " version for selection.");
+    		}
     		return selectionSymbol;
+    	}
     	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public int getPixExtentPlus(Graphics2D g, AffineTransform affineTransform, Shape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public XMLEntity getXMLEntity() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public int getSymbolType() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void drawInsideRectangle(Graphics2D g, AffineTransform scaleInstance, Rectangle r) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public String getClassName() {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-01-10 16:31:36  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2006/11/14 11:10:27  jaume
     * *** empty log message ***
+    *
     * Revision 1.3  2006/11/13 09:15:23  jaume
     * javadoc and some clean-up
+    *
     * Revision 1.2  2006/11/09 18:39:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2006/11/09 10:22:50  jaume
     * *** empty log message ***
+    *
+    *
     */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Color;
     import java.awt.Graphics2D;
     import java.awt.Point;
     import java.awt.Rectangle;
     import java.awt.Shape;
     import java.awt.geom.AffineTransform;
     import java.util.Random;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
     /**
      * <p>
      * Symbol that draws a set of points within a polygon. The amount of points is
      * defined by the field dotCount.<br>
      * </p>
      * <p>
      * This symbol only draws the points. The outline and the fill of the polygon is
      * handled by a SimpleFillSymboll where a DotDensityFillSymbol should be
      * embedded.<br>
      * </p>
      * @author jaume dominguez faus - jaume.dominguez@iver.es
+     *
      */
     public class DotDensityFillSymbol extends AbstractFillSymbol {
     	private int  dotCount;
     	private double dotSize;
     	private double dotSpacing;
     	private boolean fixedPlacement;
     	public DotDensityFillSymbol() {
     		super();
+    	}
     	public ISymbol getSymbolForSelection() {
     		return this; // the selection color is applied in the SimpleFillSymbol
+    	}
     	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
     		int width = shp.getBounds().width;
     		int height = shp.getBounds().height;
     		int minx = shp.getBounds().x;
     		int miny = shp.getBounds().y;
     		Random random = new Random();
     		g.setClip(shp);
     		g.setColor(color);
     		g.setBackground(null);
     		int size = (int) dotSize;
     		for (int i = 0; i < dotCount; i++) {
     			int x = (int) Math.abs(random.nextDouble() * width);
     			int y = (int) Math.abs(random.nextDouble() * height);
     			x = x + minx;
     			y = y + miny;
     			g.fillRect(x, y, size, size);
+    		}
     		g.setClip(null);
+    	}
     	public int getPixExtentPlus(Graphics2D g, AffineTransform affineTransform,
     			Shape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public XMLEntity getXMLEntity() {
     		XMLEntity xml = new XMLEntity();
     		xml.putProperty("className", getClassName());
     		// color
     		xml.putProperty("color", StringUtilities.color2String(color));
     		// description
     		xml.putProperty("desc", getDescription());
     		// is shape visible
     		xml.putProperty("isShapeVisible", isShapeVisible());
     		// dot count
     		xml.putProperty("dotCount", dotCount);
     		// dot size
     		xml.putProperty("dotSize", dotSize);
     		// dot spacing
     		xml.putProperty("dotSpacing", dotSpacing);
     		return xml;
+    	}
     	public int getSymbolType() {
     		return FShape.POLYGON;
+    	}
     	public void drawInsideRectangle(Graphics2D g,
     			AffineTransform scaleInstance, Rectangle r) {
     		int x = r.x;
     		int y = r.y;
     		int width = r.width;
     		int height= r.height;
     		int size = height / 8;
     		g.setColor(color);
     		g.setBackground(null);
     		g.fillRect((int) (x+height*0.2), (int) (y+width*0.2), size, size);
     		g.fillRect((int) (x+height*0.25), (int) (y+width*0.7), size, size);
     		g.fillRect((int) (x+height*0.65), (int) (y+width*0.5), size, size);
     		g.fillRect((int) (x+height*0.8), (int) (y+width*0.1), size, size);
     		g.fillRect((int) (x+height*0.8), (int) (y+width*0.8), size, size);
     		g.fillRect((int) (x+height*0.9), (int) (y+width*0.3), size, size);
     		g.fillRect((int) (x+height*1.1), (int) (y+width*0.8), size, size);
+    	}
     	public String getClassName() {
     		return getClass().getName();
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		// color
     		color = StringUtilities.string2Color(xml.getStringProperty("color"));
     		// description
     		setDescription(xml.getStringProperty("desc"));
     		// is shape visible
     		setIsShapeVisible(xml.getBooleanProperty("isShapeVisible"));
     		// dot count
     		dotCount = xml.getIntProperty("dotCount");
     		// dot size
     		dotSize = xml.getDoubleProperty("dotSize");
     		// dot spacing
     		dotSpacing = xml.getDoubleProperty("dotSpacing");
+    	}
     	public int getDotCount() {
     		return dotCount;
+    	}
     	public void setDotCount(int dotCount) {
     		this.dotCount = dotCount;
+    	}
     	public double getDotSize() {
     		return dotSize;
+    	}
     	public void setDotSize(double dotSize) {
     		this.dotSize = dotSize;
+    	}
     	public double getDotSpacing() {
     		return dotSpacing;
+    	}
     	public void setDotSpacing(double dotSpacing) {
     		this.dotSpacing = dotSpacing;
+    	}
     	public Color getDotColor() {
     		return color;
+    	}
     	public void setDotColor(Color dotColor) {
     		this.color = dotColor;
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id$
      * $Log$
      * Revision 1.1  2007-01-10 16:31:36  jaume
      * *** empty log message ***
+     *
      * Revision 1.6  2006/12/04 17:13:39  fjp
      * *** empty log message ***
+     *
      * Revision 1.5  2006/11/14 11:10:27  jaume
      * *** empty log message ***
+     *
      * Revision 1.4  2006/11/09 18:39:05  jaume
      * *** empty log message ***
+     *
      * Revision 1.3  2006/11/08 10:56:47  jaume
      * *** empty log message ***
+     *
      * Revision 1.2  2006/11/06 17:08:45  jaume
      * *** empty log message ***
+     *
      * Revision 1.1  2006/10/31 16:16:34  jaume
      * *** empty log message ***
+     *
      * Revision 1.4  2006/10/30 19:30:35  jaume
      * *** empty log message ***
+     *
      * Revision 1.3  2006/10/29 23:53:49  jaume
      * *** empty log message ***
+     *
      * Revision 1.2  2006/10/26 16:27:33  jaume
      * support for composite marker symbols (not tested)
+     *
      * Revision 1.1  2006/10/25 10:50:41  jaume
      * movement of classes and gui stuff
+     *
      * Revision 1.3  2006/10/24 19:54:16  jaume
      * added IPersistence
+     *
      * Revision 1.2  2006/10/24 08:02:51  jaume
      * *** empty log message ***
+     *
      * Revision 1.1  2006/10/18 07:54:06  jaume
      * *** empty log message ***
+     *
+     *
      */
     package com.iver.cit.gvsig.fmap.core.symbols;
     import java.awt.Color;
     import java.awt.Font;
     import java.awt.Graphics2D;
     import java.awt.Point;
     import java.awt.Rectangle;
     import java.awt.Shape;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import javax.print.attribute.PrintRequestAttributeSet;
     import org.apache.batik.ext.awt.geom.PathLength;
     import com.iver.cit.gvsig.fmap.core.FPoint2D;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.core.SymbolFactory;
     import com.iver.cit.gvsig.fmap.core.v02.FConstant;
     import com.iver.cit.gvsig.fmap.core.v02.FConverter;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
     import com.vividsolutions.jts.geom.Geometry;
     // TODO quitar batik-util.jar del classpath de extGraph cuando movamos esto a FMap
     /**
      * Symbol that manages symbols from a TrueType font source
      * @author jaume dominguez faus - jaume.dominguez@iver.es
      */
     public class CharacterMarkerSymbol extends AbstractMarkerSymbol {
     	private Font font = new Font("Arial", Font.PLAIN, 20);
     	private int symbol;
     	private ISymbol selectionSymbol;
     	/**
     	 * Creates a new instance of CharacterMarker with default values
+    	 *
     	 */
     	public CharacterMarkerSymbol() {
     		super();
+    	}
     	/**
     	 * Creates a new instance of CharacterMarker specifying the marker source
     	 * font, the character code corresponding to the symbol, and the color that
     	 * will be used in rendering time.
+    	 *
     	 * @param font -
     	 *            src Font
     	 * @param charCode -
     	 *            character code of the symbol for this font
     	 * @param color -
     	 *            color to be used in when rendering.
     	 */
     	public CharacterMarkerSymbol(Font font, int charCode, Color color) {
     		super();
     		this.font = font;
     		symbol = charCode;
     		this.color = color;
+    	}
     	public Font getFont() {
     		return font;
+    	}
     	public void setFont(Font font) {
     		this.font = font;
+    	}
     	public ISymbol getSymbolForSelection() {
     		if (selectionSymbol == null) {
     			XMLEntity xml = getXMLEntity();
     			xml.putProperty("color", StringUtilities.color2String(Color.YELLOW));
     			selectionSymbol = SymbolFactory.createFromXML(xml, getDescription() + " version for selection.");
+    		}
     		return selectionSymbol;
+    	}
     	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
     		g.setFont(getFont());
     		g.setColor(color);
     		g.rotate(getRotation());
     		Point2D p = null;
     		switch (shp.getShapeType()) {
     		case FShape.POINT:
     			p = new Point2D.Double(((FPoint2D) shp).getX(), ((FPoint2D) shp)
     					.getY());
     			break;
     		case FShape.LINE:
     			PathLength pathLen = new PathLength(shp);
     			float midDistance = pathLen.lengthOfPath() / 2;
     			p = pathLen.pointAtLength(midDistance);
     			break;
     		case FShape.POLYGON:
     			Geometry geom = FConverter.java2d_to_jts(shp);
     			com.vividsolutions.jts.geom.Point centroid = geom.getCentroid();
     			p = new Point2D.Double(centroid.getX(), centroid.getY());
+    		}
     		// p = affineTransform.transform(p, null);
     		char[] text = new char[] { (char) symbol };
     		g.drawChars(text, 0, text.length, (int) p.getX(), (int) p.getY());
     		if (subSymbols!=null) {
     			for (int i = 0; i < subSymbols.length; i++) {
     				subSymbols[i].draw(g, affineTransform, shp);
+    			}
+    		}
+    	}
     	public int getPixExtentPlus(Graphics2D g, AffineTransform affineTransform,
     			Shape shp) {
     		// TODO Auto-generated method stub
     		throw new Error("Not yet implemented!");
+    	}
     	public XMLEntity getXMLEntity() {
     		XMLEntity xml = new XMLEntity();
     		// the class name
     		xml.putProperty("className", getClassName());
     		// color
     		xml.putProperty("color", StringUtilities.color2String(color));
     		// font
     		xml.putProperty("font", font.getFontName());
     		// font style
     		xml.putProperty("fontStyle", font.getStyle());
     		// symbol code
     		xml.putProperty("symbolCode", symbol);
     		// description
     		xml.putProperty("desc", getDescription());
     		// is shape visible
     		xml.putProperty("isShapeVisible", isShapeVisible());
     		// x offset
     		xml.putProperty("xOffset", getOffset().getX());
     		// y offset
     		xml.putProperty("yOffset", getOffset().getY());
     		// rotation
     		xml.putProperty("rotation", rotation);
     		return xml;
+    	}
     	public int getSymbolType() {
     		return CHARACTER_MARKER;
+    	}
     	public void drawInsideRectangle(Graphics2D g,
     			AffineTransform scaleInstance, Rectangle r) {
     		g.rotate(getRotation());
     		// Sirve de algo el scaleInstance???
     		// g.setFont(font.deriveFont(scaleInstance));
     		double h = r.getHeight();
     		Font myFont = font.deriveFont(
     				(float) (h * FConstant.FONT_HEIGHT_SCALE_FACTOR)).deriveFont(
     						scaleInstance);
     		g.setFont(myFont);
     		g.setColor(color);
     		r.y = (int) h;

| gvSIG desktop 1

Revision 9639