/ - Diff - Application: gvSIG desktop - gvSIG

+    *
     * $Id$
     * $Log$
     * Revision 1.4  2007-04-02 16:34:56  jaume
     * Revision 1.5  2007-04-04 15:41:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.4  2007/04/02 16:34:56  jaume
     * Styled labeling (start commiting)
+    *
     * Revision 1.3  2007/03/29 16:02:01  jaume
-...
     */
     package com.iver.cit.gvsig.fmap.core.styles;
     import java.awt.Dimension;
     import java.awt.Rectangle;
     import java.awt.geom.Point2D;
     /**
      * Defines the style that a Label symbol can contain which typically define
-...
     	 */
     	public Rectangle[] getTextBounds();
     	/**
     	 * The complete bounds of this ILabelStyle
     	 * @return
     	 */
     	public Rectangle getBounds();
     	/**
     	 * Returns the position of the point labeled by this label in percent units relative
     	 * to the label bounds. It determines the offset to be applied to the label to be
     	 * placed and allows the user to use custom styles.
     	 */
     	public Point2D getMarkerPoint();
     	/**
     	 * Sets the position of the point labeled by this in percent units relative to the
     	 * label bounds
     	 * @param p
     	 * @throws IllegalArgumentException if the point coordinates are >0.0 or <1.0
     	 */
     	public void setMarkerPoint(Point2D p) throws IllegalArgumentException;
     	public Dimension getPreferredSize();
+    }

+    *
     * $Id$
     * $Log$
     * Revision 1.1  2007-03-09 11:20:56  jaume
     * Revision 1.2  2007-04-04 15:41:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.1  2007/03/09 11:20:56  jaume
     * Advanced symbology (start committing)
+    *
     * Revision 1.1.2.2  2007/02/15 16:23:44  jaume
-...
     	public abstract boolean isSuitableFor(ISymbol symbol);
     	/**
     	 * Used to show an outline of the style to graphically show its properties.
     	 * @param g, the Graphics2D where to draw
     	 * @param r, the bounds of the style inside such Graphics2D
     	 */
     	public abstract void drawOutline(Graphics2D g, Rectangle r);
+    }

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/styles/MarkerFillStyle.java
122	122	this.fillStyle = fillStyle;
123	123	}
124	124
	125	public void drawOutline(Graphics2D g, Rectangle r) {
	126	drawInsideRectangle(g, r);
	127	}
125	128	}

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/styles/PointLabelPositioneer.java
80	80	}
81	81	}
82	82
	83	public void drawOutline(Graphics2D g, Rectangle r) {
	84	drawInsideRectangle(g, r);
	85	}
	86
83	87	}

+    *
     * $Id$
     * $Log$
     * Revision 1.5  2007-04-02 16:34:56  jaume
     * Revision 1.6  2007-04-04 15:41:05  jaume
     * *** empty log message ***
+    *
     * Revision 1.5  2007/04/02 16:34:56  jaume
     * Styled labeling (start commiting)
+    *
     * Revision 1.4  2007/04/02 00:10:04  jaume
-...
     */
     package com.iver.cit.gvsig.fmap.core.styles;
     import java.awt.Color;
     import java.awt.Dimension;
     import java.awt.Graphics2D;
     import java.awt.Point;
     import java.awt.Rectangle;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import java.awt.geom.Rectangle2D;
     import com.iver.cit.gvsig.fmap.Messages;
     import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
     import com.iver.utiles.XMLEntity;
-...
      */
     public class SimpleLabelStyle extends SVGStyle implements ILabelStyle{
     	private String text;
     	private Point2D markerPoint = new Point2D.Double();
     	public int getFieldCount() {
     		return 1;
-...
     	public Rectangle getBounds() {
     		return super.getBounds();
+    	}
     	public Point2D getMarkerPoint() {
     		return markerPoint;
+    	}
     	public void setMarkerPoint(Point2D p) throws IllegalArgumentException {
     		if (p.getX()<0 || p.getX()>1)
     			throw new IllegalArgumentException("X must be >=0 and <=1 ("+p.getX()+")");
     		if (p.getY()<0 || p.getY()>1)
     			throw new IllegalArgumentException("Y must be >=0 and <=1 ("+p.getY()+")");
     		// the marker represents the point labeled in relative percent units
     		this.markerPoint = p;
+    	}
     	public void drawOutline(Graphics2D g, Rectangle r) {
     		super.drawOutline(g, r);
     		Rectangle labelSz = getBounds();
     		double ratioLabel = labelSz.getWidth()/labelSz.getHeight();
     		double ratioViewPort = r.getWidth() / r.getWidth();
     		int x;
     		int y;
     		if (ratioViewPort > ratioLabel) {
     			// size is defined by the viewport height
     			y = (int) (r.height*markerPoint.getY());
     			x = (int) ((0.5*r.width) - (0.5-markerPoint.getX())*(ratioLabel*r.height));
     		} else {
     			// size is defined by the viewport width
     			x = (int) (r.width * markerPoint.getX());
     			y = (int) ((0.5 * r.height) - (0.5-markerPoint.getY())*(r.width/ratioLabel));
+    		}
     		y = r.height - y;
     		int size = 3;
     		g.setColor(Color.RED);
     		g.fillOval(x, y, size, size);
     		g.drawString(Messages.getString("labeled_point"), x + size + 5, y);
+    	}
     	public Dimension getPreferredSize() {
     		return new Dimension(getBounds().width, getBounds().height);
+    	}
+    }

     import java.awt.Graphics2D;
     import java.awt.Rectangle;
     import java.awt.RenderingHints;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Rectangle2D;
     import java.io.File;
     import java.io.IOException;
-...
     		renderer.setDoubleBuffered(true);
+    	}
     	public void drawInsideRectangle(Graphics2D g, Rectangle r) {
     		long t1, t2;
     		Graphics2D g2 = (Graphics2D) g;
     		RenderingHints renderingHints = new RenderingHints(defaultRenderingHints);
     		g2.setRenderingHints(renderingHints);
     		gvtRoot.setTransform((ViewBox.getViewTransform(null, elt, (float) r.getWidth()-1, (float) r.getHeight()-1)));
     		gvtRoot.paint(g2);
     	public void drawInsideRectangle(Graphics2D g, Rectangle rect) {
     		AffineTransform ataux = new AffineTransform();
             ataux.translate(0,0);//rect.getX(), rect.getY());
             ataux.concatenate(ViewBox.getViewTransform(null, elt,
             		(float) rect.getWidth(), (float) rect.getHeight()));
             RenderingHints renderingHints = new RenderingHints(defaultRenderingHints);
     		g.setRenderingHints(renderingHints);
     		gvtRoot.setTransform(ataux);
     		gvtRoot.paint(g);
+    	}
     	public boolean isSuitableFor(ISymbol symbol) {
-...
     				 (int) r.getHeight());
+    	}
     	public void drawOutline(Graphics2D g, Rectangle r) {
     		drawInsideRectangle(g, r);
+    	}
+    }

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/styles/SimpleLineStyle.java
43	43	*
44	44	* $Id$
45	45	* $Log$
46		* Revision 1.2 2007-03-09 11:20:56 jaume
	46	* Revision 1.3 2007-04-04 15:41:05 jaume
	47	* * empty log message *
	48	*
	49	* Revision 1.2 2007/03/09 11:20:56 jaume
47	50	* Advanced symbology (start committing)
48	51	*
49	52	* Revision 1.1.2.4 2007/02/21 07:34:09 jaume
...	...
207	210	}
208	211	}
209	212
	213	public void drawOutline(Graphics2D g, Rectangle r) {
	214	drawInsideRectangle(g, r);
	215	}
210	216
211	217	}

Application: gvSIG desktop

Revision 11051