/ - Diff - Application: gvSIG desktop - gvSIG

Revision 2304

     	 * @param g Graphics sobre el que dibujar.
     	 */
     	public void drawSymbolTag(Graphics2D g);
     	/**
     	 * Rellena la rotaci?n del BoundingBox.
+    	 *
     	 * @param rotation rotaci?n que se quiere aplicar.
     	 */
     	public void setRotation(double rotation);
     	/**
     	 * Devuelve la rotaci?n del BoundingBox.
+    	 *
     	 * @return Rotaci?n del BoundingBox.
     	 */
     	public double getRotation();
+    }

     import java.awt.image.BufferedImage;
     import java.util.ArrayList;
     import java.util.BitSet;
     /**
-...
     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) throws com.iver.cit.gvsig.fmap.DriverException {
     		Rectangle2D.Double r = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),
     				r.y + (r.height / 2));
     		if (intersects(rv, r)) {
     			if (getFMap() == null) {
     				drawEmpty(g);
-...
+    				}
+    			}
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				r.x + (r.width / 2), r.y + (r.height / 2));
+    	}
     	/**
-...
     	 */
     	public void print(Graphics2D g, AffineTransform at) {
     		Rectangle2D.Double r = getBoundingBox(at);
     		// Dibujamos en impresora
     		Rectangle rclip = g.getClipBounds();
     		g.clipRect((int) r.getMinX(), (int) r.getMinY(), (int) r.getWidth(),
-...
     		xml.putProperty("m_bLinked", m_bLinked);
     		xml.putProperty("m_mapUnits", m_mapUnits);
     		xml.putProperty("m_Scale", m_Scale);
     		xml.putProperty("m_rotation",getRotation());
     		xml.putProperty("tag", getTag());
     		ProjectExtension pe = (ProjectExtension) PluginServices.getExtension(ProjectExtension.class);
-...
     		this.m_viewing = xml.getIntProperty("m_viewing");
     		this.m_bLinked = xml.getBooleanProperty("m_bLinked");
     		this.m_mapUnits = xml.getIntProperty("m_mapUnits");
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		ProjectExtension pe = (ProjectExtension) PluginServices.getExtension(ProjectExtension.class);
     		this.m_Scale = xml.getDoubleProperty("m_Scale");

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFramePicture.java
135	135	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
136	136	BufferedImage imgBase) {
137	137	Rectangle2D.Double r = getBoundingBox(at);
	138	g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),
	139	r.y + (r.height / 2));
138	140	double x = r.getMinX();
139	141	double y = r.getMinY();
140	142	double w = r.getWidth();
...	...
170	172	}
171	173	}
172	174	}
	175	g.rotate(Math.toRadians(-getRotation()),
	176	r.x + (r.width / 2), r.y + (r.height / 2));
173	177	}
174	178
175	179	/**
...	...
322	326	xml.putProperty("m_quality", m_quality);
323	327	xml.putProperty("m_viewing", m_viewing);
324	328	xml.putProperty("tag", getTag());
325
	329	xml.putProperty("m_rotation",getRotation());
326	330	return xml;
327	331	}
328	332
...	...
453	457
454	458	this.m_quality = xml.getIntProperty("m_quality");
455	459	this.m_viewing = xml.getIntProperty("m_viewing");
	460	setRotation(xml.getDoubleProperty("m_rotation"));
456	461	}
457	462
458	463	/**

     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) throws DriverException {
     		Rectangle2D.Double r = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),
     				r.y + (r.height / 2));
     		m_at = at;
     		for (int i = 0; i < m_fframes.size(); i++) {
     			((IFFrame) m_fframes.get(i)).draw(g, at, rv, imgBase);
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				r.x + (r.width / 2), r.y + (r.height / 2));
+    	}
     	/**
-...
     		xml.putProperty("m_Selected", m_Selected);
     		xml.putProperty("type", Layout.RECTANGLEGROUP);
     		xml.putProperty("tag", getTag());
     		xml.putProperty("m_rotation",getRotation());
     		for (int i = 0; i < getFFrames().size(); i++) {
     			xml.addChild(((IFFrame) getFFrames().get(i)).getXMLEntity());
+    		}
-...
     		} else {
     			this.setSelected(false);
+    		}
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		IFFrame fframechild = null;
     		for (int i = 0; i < xml.getNumChild(); i++) {
-...
     	 */
     	public void print(Graphics2D g, AffineTransform at)
     		throws DriverException {
     		Rectangle2D.Double r = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),
     				r.y + (r.height / 2));
     		for (int i = 0; i < m_fframes.size(); i++) {
     			((IFFrame) m_fframes.get(i)).print(g, at);
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				r.x + (r.width / 2), r.y + (r.height / 2));
+    	}
+    }

     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) {
     		Rectangle2D.Double r = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),
     				r.y + (r.height / 2));
     		if (intersects(rv, r)) {
     			if ((fframeview == null) || (fframeview.getFMap() == null)) {
     				drawEmpty(g);
-...
+    				}
+    			}
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				r.x + (r.width / 2), r.y + (r.height / 2));
+    	}
     	/**
-...
     		xml.putProperty("fontName", m_f.getFontName());
     		xml.putProperty("fontStyle", m_f.getStyle());
     		xml.putProperty("tag", getTag());
     		xml.putProperty("m_rotation",getRotation());
     		/*                xml.addChild(fframeview.getXMLEntity());
-...
     		this.m_mapUnits = xml.getIntProperty("m_mapUnits");
     		this.m_f = new Font(xml.getStringProperty("fontName"),
     				xml.getIntProperty("fontStyle"), 9);
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		/*FFrameView fv=(FFrameView) FFrameView.createFFrame(xml.getChild(0),
     		   p);
     		   int indice = xml.getIntProperty("indice");

     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) throws DriverException {
     		Rectangle2D.Double re = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), re.x + (re.width / 2),
     				re.y + (re.height / 2));
     		if ((fframeview != null) && (fframeview.getFMap() != null)) {
     			layers = fframeview.getFMap().getLayers();
+    		}
-...
     				drawDraft(g);
+    			}
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				re.x + (re.width / 2), re.y + (re.height / 2));
+    	}
     	/**
-...
     		xml.putProperty("fontName", m_f.getFontName());
     		xml.putProperty("fontStyle", m_f.getStyle());
     		xml.putProperty("tag", getTag());
     		xml.putProperty("m_rotation",getRotation());
     		///xml.addChild(fframeview.getXMLEntity());
     		LayoutControls lc = (LayoutControls) PluginServices.getExtension(LayoutControls.class);
     		Layout layout = lc.getLayout();
-...
     		this.m_viewing = xml.getIntProperty("m_viewing");
     		this.m_f = new Font(xml.getStringProperty("fontName"),
     				xml.getIntProperty("fontStyle"), 9);
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		//this.setFFrameView((FFrameView) FFrameView.createFFrame(xml.getChild(0),
     		//		p));

     	private Rectangle no = new Rectangle();
     	private String tag = null;
     	protected int num = 0;
     	private double m_rotation=0;
     	/**
     	 * Dibuja los handlers sobre el boundingBox en el graphics que se pasa como
     	 * par?metro.
-...
     	 */
     	public void drawHandlers(Graphics2D g) {
     		int size = 10;
     		Rectangle2D.Double r = getBoundingBox(null);
     		//g.drawRect((int) r.x, (int) r.y, (int) r.width, (int) r.height);
     		g.fillRect((int) r.x - size, (int) r.y - size, size, size);
     		no.setRect((int) r.x - size, (int) r.y - size, size, size);
     		g.fillRect((int) r.getMaxX(), (int) r.y - size, size, size);
     		ne.setRect((int) r.getMaxX(), (int) r.y - size, size, size);
     		g.fillRect((int) r.x - size, (int) r.getMaxY(), size, size);
     		so.setRect((int) r.x - size, (int) r.getMaxY(), size, size);
     		Rectangle2D r = getBoundingBox(null);
     		Point2D p=new Point2D.Double();
     		g.rotate(Math.toRadians(getRotation()), r.getX() + (r.getWidth() / 2),
     				r.getY() + (r.getHeight() / 2));
     		AffineTransform atRotate=new AffineTransform();
     		atRotate.rotate(Math.toRadians(getRotation()), r.getX() + (r.getWidth() / 2),
     				r.getY() + (r.getHeight() / 2));
     		g.fillRect((int) r.getX() - size, (int) r.getY() - size, size, size);
     		atRotate.transform(new Point2D.Double(r.getX()- size,r.getY()- size),p);
     		no.setRect((int) p.getX(), (int) p.getY(), size, size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getMaxX(), (int) r.getY() - size, size, size);
     		atRotate.transform(new Point2D.Double(r.getMaxX(),r.getY()- size),p);
     		ne.setRect((int) p.getX(), (int) p.getY(), size, size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getX() - size, (int) r.getMaxY(), size, size);
     		atRotate.transform(new Point2D.Double(r.getX() - size, r.getMaxY()),p);
     		so.setRect((int) p.getX(), (int) p.getY(), size, size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getMaxX(), (int) r.getMaxY(), size, size);
     		se.setRect((int) r.getMaxX(), (int) r.getMaxY(), size, size);
     		g.fillRect((int) r.getCenterX() - (size / 2), (int) r.y - size, size,
     			size);
     		n.setRect((int) r.getCenterX() - (size / 2), (int) r.y - size, size,
     			size);
     		g.fillRect((int) r.getCenterX() - (size / 2), (int) r.getMaxY(), size,
     			size);
     		s.setRect((int) r.getCenterX() - (size / 2), (int) r.getMaxY(), size,
     			size);
     		g.fillRect((int) r.x - size, (int) r.getCenterY() - (size / 2), size,
     			size);
     		o.setRect((int) r.x - size, (int) r.getCenterY() - (size / 2), size,
     			size);
     		g.fillRect((int) r.getMaxX(), (int) r.getCenterY() - (size / 2), size,
     			size);
     		e.setRect((int) r.getMaxX(), (int) r.getCenterY() - (size / 2), size,
     			size);
     		atRotate.transform(new Point2D.Double(r.getMaxX(), r.getMaxY()),p);
     		se.setRect((int) p.getX(), (int) p.getY(), size, size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getCenterX() - (size / 2), (int) r.getY() - size, size,size);
     		atRotate.transform(new Point2D.Double(r.getCenterX() - (size/2), r.getY()-size),p);
     		n.setRect((int) p.getX(), (int) p.getY(), size,size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getCenterX() - (size / 2), (int) r.getMaxY(), size,size);
     		atRotate.transform(new Point2D.Double(r.getCenterX() - (size/2), r.getMaxY()),p);
     		s.setRect((int) p.getX(), (int) p.getY(), size,size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getX() - size, (int) r.getCenterY() - (size / 2), size,size);
     		atRotate.transform(new Point2D.Double(r.getX() - size, r.getCenterY()- (size/2)),p);
     		o.setRect((int) p.getX(), (int) p.getY(), size,size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.fillRect((int) r.getMaxX(), (int) r.getCenterY() - (size / 2), size,size);
     		atRotate.transform(new Point2D.Double(r.getMaxX(), r.getCenterY()-(size/2)),p);
     		e.setRect((int) p.getX(), (int) p.getY(), size,size);
     		//g.drawRect((int) p.getX(), (int) p.getY(), size, size);
     		g.rotate(Math.toRadians(-getRotation()),
     				r.getX() + (r.getWidth() / 2), r.getY() + (r.getHeight() / 2));
+    	}
     	/**
-...
     	 * @param g Graphics so bre el que dibujar.
     	 */
     	public void drawDraft(Graphics2D g) {
     		Rectangle2D.Double r = getBoundingBox(null);
     		Rectangle2D r = getBoundingBox(null);
     		g.rotate(Math.toRadians(getRotation()), r.getX() + (r.getWidth() / 2),
     				r.getY() + (r.getHeight() / 2));
     		g.setColor(Color.lightGray);
     		g.fillRect((int) r.x, (int) r.y, (int) r.width, (int) r.height);
     		g.fillRect((int) r.getX(), (int) r.getY(), (int) r.getWidth(), (int) r.getHeight());
     		g.setColor(Color.black);
     		int scale = (int) (r.width / 12);
     		int scale = (int) (r.getWidth() / 12);
     		Font f = new Font("SansSerif", Font.PLAIN, scale);
     		g.setFont(f);
     		g.drawString(getName(),
     			(int) (r.getCenterX() - ((getName().length() * scale) / 4)),
     			(int) (r.getCenterY()));
     		g.rotate(Math.toRadians(-getRotation()),
     				r.getX() + (r.getWidth() / 2), r.getY() + (r.getHeight() / 2));
+    	}
     	/**
-...
     	 * @param g Graphics sobre el que dibujar.
     	 */
     	public void drawEmpty(Graphics2D g) {
     		Rectangle2D.Double r = getBoundingBox(null);
     		Rectangle2D r = getBoundingBox(null);
     		g.rotate(Math.toRadians(getRotation()), r.getX() + (r.getWidth() / 2),
     				r.getY() + (r.getHeight() / 2));
     		g.setColor(Color.lightGray);
     		g.fillRect((int) r.x, (int) r.y, (int) r.width, (int) r.height);
     		g.fillRect((int) r.getX(), (int) r.getY(), (int) r.getWidth(), (int) r.getHeight());
     		g.setColor(Color.black);
     		int scale = (int) (r.width / 12);
     		int scale = (int) (r.getWidth() / 12);
     		Font f = new Font("SansSerif", Font.PLAIN, scale);
     		g.setFont(f);
-...
     		g.drawString(s, (int) (r.getCenterX() - ((s.length() * scale) / 4)),
     			(int) (r.getCenterY()));
     		g.rotate(Math.toRadians(-getRotation()),
     				r.getX() + (r.getWidth() / 2), r.getY() + (r.getHeight() / 2));
+    	}
     	/**
-...
     	 * @param g Graphics sobre el que dibujar el icono.
     	 */
     	public void drawSymbolTag(Graphics2D g) {
     		Rectangle2D.Double rec = getBoundingBox(null);
     		Rectangle2D rec = getBoundingBox(null);
     		g.rotate(Math.toRadians(getRotation()), rec.getX() + (rec.getWidth() / 2),
     				rec.getY() + (rec.getHeight() / 2));
     		try {
     			URL url = AddLayer.class.getClassLoader().getResource("images/symbolTag.gif");
     			Image image = new ImageIcon(url).getImage();
     			g.drawImage(image, (int) rec.x, (int) rec.y, 25, 30, null);
     			g.drawImage(image, (int) rec.getX(), (int) rec.getY(), 25, 30, null);
     		} catch (NullPointerException npe) {
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				rec.getX() + (rec.getWidth() / 2), rec.getY() + (rec.getHeight() / 2));
+    	}
     	/**
     	 * Rellenar la rotaci?n para aplicar al FFrame.
+    	 *
     	 * @param rotation rotaci?n que se quiere aplicar.
     	 */
     	public void setRotation(double rotation) {
     		m_rotation = rotation;
+    	}
     	/**
     	 * Devuelve la rotaci?n del FFrame.
+    	 *
     	 * @return Rotaci?n del FFrame.
     	 */
     	public double getRotation() {
     		return m_rotation;
+    	}
+    }

     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) {
     		Rectangle2D.Double rect = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), rect.x + (rect.width / 2),
     				rect.y + (rect.height / 2));
     		if (intersects(rv, rect)) {
     			g.setColor(Color.black);
-...
     					break;
+    			}
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				rect.x + (rect.width / 2), rect.y + (rect.height / 2));
+    	}
     	/**
-...
     		xml.putProperty("type", Layout.GRAPHICS);
     		xml.putProperty("m_type", m_type);
     		xml.putProperty("tag", getTag());
     		xml.putProperty("m_rotation",getRotation());
     		xml.addChild(m_symbol.getXMLEntity());
     		return xml;
+    	}
-...
     	public void setXMLEntity(XMLEntity xml, Layout p) {
     		m_Selected=xml.getIntProperty("m_Selected");
     		m_type=xml.getIntProperty("m_type");
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		m_symbol=FSymbol.createFromXML(xml.getChild(0));
+    	}

     	public static final int RIGTH = 2;
     	private ArrayList m_text = new ArrayList();
     	private boolean m_isFixed = false;
     	private double m_rotation = 0;
     	//private double m_rotation = 0;
     	private int m_pos = LEFT;
     	private Color textColor = Color.BLACK;
     	//jaume
     	private boolean surrounded = false; 	// The text field is surrounded by a rectangle
     	private int cellPadding = 0;			// The gap between the the text field and the surrounding rectangle
     	private boolean fixedFontSize = false;	// The text field font size is constant fixed to the folio's size
     	private int fontSize;					// Text field's font size
     	private boolean hasTitle;				// The text field has title
     	private String title;					// The text for the title
     	private int titleSize;					// The title's font size
     	private int frameBorderSize;			// The surrounding rectangle's border size
         private Color frameColor=Color.BLACK;	// The surrounding rectangle's color
         private Color titleColor=Color.BLACK;	// The title's color
     	private boolean surrounded = false; // The text field is surrounded by a rectangle
     	private int cellPadding = 0; // The gap between the the text field and the surrounding rectangle
     	private boolean fixedFontSize = false; // The text field font size is constant fixed to the folio's size
     	private int fontSize; // Text field's font size
     	private boolean hasTitle; // The text field has title
     	private String title; // The text for the title
     	private int titleSize; // The title's font size
     	private int frameBorderSize; // The surrounding rectangle's border size
     	private Color frameColor = Color.BLACK; // The surrounding rectangle's color
     	private Color titleColor = Color.BLACK; // The title's color
     	//private int m_space=0;
     	private Font m_f = null;
     	/**
     	 * Crea un nuevo FFrameText.
     	 */
     //	public FFrameText(Layout l) {
     //	    layout=l;
     //		m_f = new Font("SansSerif", Font.PLAIN, 9);
     //	}
     	//	public FFrameText(Layout l) {
     	//	    layout=l;
     	//		m_f = new Font("SansSerif", Font.PLAIN, 9);
     	//	}
     	public FFrameText() {
     	    m_f = new Font("SansSerif", Font.PLAIN, 9);
     		m_f = new Font("SansSerif", Font.PLAIN, 9);
+    	}
     	/**
-...
     		return textColor;
+    	}
         /**
          * Obtiene el fixedFontSize
          * @return boolean
          */
     	/**
     	 * Obtiene el fixedFontSize
+    	 *
     	 * @return boolean
     	 */
     	public boolean isFontSizeFixed() {
     		return fixedFontSize;
+    	}
         public boolean isFontSizeFixed() {
             return fixedFontSize;
+        }
         /**
          * Establece fixedFontSize
          * @param fixedFontSize
          */
         public void setFixedFontSize(boolean fixedFontSize) {
             this.fixedFontSize = fixedFontSize;
+        }
         /**
          * Obtiene el fontSize
          * @return int
          */
     	/**
     	 * Establece fixedFontSize
+    	 *
     	 * @param fixedFontSize
     	 */
     	public void setFixedFontSize(boolean fixedFontSize) {
     		this.fixedFontSize = fixedFontSize;
+    	}
         public int getFontSize() {
             return fontSize;
+        }
         /**
          * Establece fontSize
          * @param fontSize
          */
         public void setFontSize(int fontSize) {
             this.fontSize = fontSize;
+        }
         /**
          * Obtiene el cellPadding
          * @return int
          */
     	/**
     	 * Obtiene el fontSize
+    	 *
     	 * @return int
     	 */
     	public int getFontSize() {
     		return fontSize;
+    	}
         public int getCellPadding() {
             return cellPadding;
+        }
     	/**
     	 * Establece fontSize
+    	 *
     	 * @param fontSize
     	 */
     	public void setFontSize(int fontSize) {
     		this.fontSize = fontSize;
+    	}
     	/**
     	 * Obtiene el cellPadding
+    	 *
     	 * @return int
     	 */
     	public int getCellPadding() {
     		return cellPadding;
+    	}
     	/**
     	 * Inserta el color del texto a escribir.
+    	 *
     	 * @param color Color del texto.
-...
     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) {
     		g.setColor(Color.BLACK);
     	    Rectangle2D.Double rec = getBoundingBox(at);
     		Rectangle2D.Double raux = (Rectangle2D.Double)rec.clone();
     		Rectangle2D.Double rec = getBoundingBox(at);
     		Rectangle2D.Double raux = (Rectangle2D.Double) rec.clone();
     		g.rotate(Math.toRadians(getRotation()), raux.x + (raux.width / 2),
     				raux.y + (raux.height / 2));
     		int longmax = 1;
     		if (intersects(rv, raux)) { // comprueba que no cae fuera de la pantalla
     			if (m_text.isEmpty()) {
     				drawEmpty(g);
     			} else {
-...
     						longmax = ((String) m_text.get(i)).length();
+    					}
+    				}
     				FontRenderContext frc = g.getFontRenderContext();
     				int scaledFontSize;
     				// TODO myScale es la escala sobre la que se extraen todos los escalados. Esto
     				// funciona bien tal cual est? si la ratio de aspecto (alto/ancho) del folio es constante
     				// porque se toma como medidas el ancho del folio real y el ancho del folio en pantalla.
     				// No se que pasar? si la ratio cambia, por ejemplo si se usan USLetter en lugar de DIN A4
     				double myScale = at.getScaleX()*0.024;//FLayoutUtilities.fromSheetDistance(folio.getAncho(),at)/rv.getWidth();
     				double myScale = at.getScaleX() * 0.024; //FLayoutUtilities.fromSheetDistance(folio.getAncho(),at)/rv.getWidth();
     				// Distinguish when the font has fixed size or not
     				if (isFontSizeFixed()){
     			        scaledFontSize = (int)(myScale*fontSize);
     			    } else {
     			        scaledFontSize = ((int) (raux.width * 2.2)) / longmax;
     				if (isFontSizeFixed()) {
     					scaledFontSize = (int) (myScale * fontSize);
     				} else {
     					scaledFontSize = ((int) (raux.width)) / longmax;
     					if (scaledFontSize > (int) ((raux.height * 10) / 4 / (m_text.size() * 1.3))) {
     						scaledFontSize = (int) (((raux.height * 10) / 4) / (m_text.size() * 1.3));
+    					}
+    			    }
     				int ht = (int) (raux.height / m_text.size());
     					if (scaledFontSize > (int) ((raux.height) / m_text.size())) {
     						scaledFontSize = (int) ((raux.height) / m_text.size());
+    					}
+    				}
     				if (m_f != null) {
     				    // esto sirve de algo?
     					m_f = new Font(m_f.getFontName(), m_f.getStyle(), scaledFontSize);
     					// Aqu? se ajusta a partir de las caracter?sticas de la fuente, una nueva fuente con el tama?o ajustado.
     					m_f = new Font(m_f.getFontName(), m_f.getStyle(),
     							scaledFontSize);
     				} else {
     					// Aqu? pasa cuando se abre el di?logo para seleccionar un tipo de fuente y se cierra sin haber seleccionado ninguna.
     					m_f = new Font("SansSerif", Font.PLAIN, scaledFontSize);
+    				}
     				// Draw the text title if it exists
     				if (hasTitle()){
     				    int scaledTitleFontSize = (int) (myScale*titleSize);
     				    int gap = 3;
     				    if (isSurrounded()){
     				        // Para evitar que el marco se pinte sobre el t?tulo
     				        gap += (int) (frameBorderSize*myScale);
+    				    }
     				    g.setColor(titleColor);
     				    Font titleFont = new Font(m_f.getFontName(), m_f.getStyle(), scaledTitleFontSize);
     				    TextLayout titleTextLayout = new TextLayout(getTitle(), titleFont, frc);
     				    titleTextLayout.draw(g, (float) raux.getX(), (float) (raux.getY()-(gap*myScale)));
     				if (hasTitle()) {
     					int scaledTitleFontSize = (int) (myScale * titleSize);
     					int gap = 3;
     					if (isSurrounded()) {
     						// Para evitar que el marco se pinte sobre el t?tulo
     						gap += (int) (frameBorderSize * myScale);
+    					}
     					g.setColor(titleColor);
     					Font titleFont = new Font(m_f.getFontName(),
     							m_f.getStyle(), scaledTitleFontSize);
     					TextLayout titleTextLayout = new TextLayout(getTitle(),
     							titleFont, frc);
     					titleTextLayout.draw(g, (float) raux.getX(),
     						(float) (raux.getY() - (gap * myScale)));
+    				}
     				// Draw the frame involving the text if it exists
     				if (isSurrounded()){
     				    g.setColor(frameColor);
     				    g.drawRect((int) raux.x, (int) raux.y, (int)raux.width, (int)raux.height);
     				    double scaledCellPadding = cellPadding*myScale;
     				    if (frameBorderSize > 1){
     				        System.out.println("borderSize = "+frameBorderSize);
     				        int scaledBorderSize = (int) (frameBorderSize*myScale);
     				        for (int i=scaledBorderSize-1; i>0; i--)
     				            g.drawRect((int) raux.x-i, (int) raux.y-i, (int) raux.width+2*i, (int) raux.height+2*i);
+    				    }
     				    // Recalibro el rectangulo para establecer el ?rea donde se dibujan las fuentes
     				    // al ?rea marcada con el rat?n menos la distancia al marco especificada
     				    raux.setRect(raux.getX() + scaledCellPadding, raux.getY() - scaledCellPadding,
     				               raux.getWidth()- scaledCellPadding*2, raux.getHeight()- scaledCellPadding*2);
     				if (isSurrounded()) {
     					g.setColor(frameColor);
     					g.drawRect((int) raux.x, (int) raux.y, (int) raux.width,
     						(int) raux.height);
     					double scaledCellPadding = cellPadding * myScale;
     					if (frameBorderSize > 1) {
     						System.out.println("borderSize = " + frameBorderSize);
     						int scaledBorderSize = (int) (frameBorderSize * myScale);
     						for (int i = scaledBorderSize - 1; i > 0; i--)
     							g.drawRect((int) raux.x - i, (int) raux.y - i,
     								(int) raux.width + (2 * i),
     								(int) raux.height + (2 * i));
+    					}
     					// Recalibro el rectangulo para establecer el ?rea donde se dibujan las fuentes
     					// al ?rea marcada con el rat?n menos la distancia al marco especificada
     					raux.setRect(raux.getX() + scaledCellPadding,
     						raux.getY() - scaledCellPadding,
     						raux.getWidth() - (scaledCellPadding * 2),
     						raux.getHeight() - (scaledCellPadding * 2));
+    				}
     				g.setColor(textColor);
     				for (int i = 0; i < m_text.size(); i++) {
     					if (!((String) m_text.get(i)).equals("")) {
     					    TextLayout textLayout = new TextLayout((String) m_text.get(
     									i), m_f, frc);
     						g.setColor(textColor);
     						g.rotate(Math.toRadians(m_rotation),
     							raux.x + (raux.width / 2), raux.y + (raux.height / 2));
     						int l = ((String) m_text.get(i)).length();
     						switch (m_pos) {
     							case (LEFT):
     							    textLayout.draw(g, (float) raux.getX(),
     						                (float) (raux.getY() + (ht * (i +1))));
     								break;
     							case (CENTER):
     							    float pos1 = (float) ((raux.width -
     							            ((l * scaledFontSize) / 2.2)) / 2);
     							    textLayout.draw(g, (float) raux.getX() + pos1,
     							            (float) (raux.getY() + (ht * (i + 1))));
     								break;
     				drawText(raux, scaledFontSize, g);
     				g.rotate(Math.toRadians(-getRotation()),
     					raux.x + (raux.width / 2), raux.y + (raux.height / 2));
+    			}
+    		}
     							case (RIGTH):
     							    float pos2 = (float) ((raux.width -
     							            ((l * scaledFontSize) / 2.2)));
     								textLayout.draw(g, (float) raux.getX() + pos2,
     							            (float) (raux.getY() + (ht * (i + 1)))); //- (ht / 2))));
     							    break;
+    						}
     		raux = null;
+    	}
     						g.rotate(Math.toRadians(-m_rotation),
     						        raux.x + (raux.width / 2), raux.y + (raux.height / 2));
     	/**
     	 * Dibuja el texto sobre el graphics con el tama?o adecuado.
+    	 *
     	 * @param r Rect?ngulo sobre el que dibujar.
     	 * @param sfs Tama?o aproximado del texto.
     	 * @param g Graphics sobre el que dibujar el texto.
     	 */
     	private void drawText(Rectangle2D r, int sfs, Graphics2D g) {
     		int minSFS = Integer.MAX_VALUE;
     		FontRenderContext frc = g.getFontRenderContext();
     		int ht = (int) (r.getHeight() / m_text.size());
     		for (int i = 0; i < m_text.size(); i++) {
     			if (!((String) m_text.get(i)).equals("")) {
     				TextLayout textaux = new TextLayout((String) m_text.get(i),
     						m_f, frc);
     				Rectangle2D txtBound = textaux.getBounds();
     				double difW = txtBound.getWidth() / r.getWidth();
     				double difH = (txtBound.getHeight() * m_text.size()) / (r.getHeight());
     				if (difW > difH) {
     					if (minSFS > sfs) {
     						minSFS = (int) (sfs / difW);
+    					}
     				} else {
     					if (minSFS > sfs) {
     						minSFS = (int) (sfs / difH);
+    					}
+    				}
+    			}
+    		}
     		raux = null;
     		TextLayout textLayout = null;
     		for (int i = 0; i < m_text.size(); i++) {
     			if (!((String) m_text.get(i)).equals("")) {
     				m_f = new Font(m_f.getFontName(), m_f.getStyle(), minSFS);
     				textLayout = new TextLayout((String) m_text.get(i), m_f, frc);
     				Rectangle2D txtBound = textLayout.getBounds();
     				int l = ((String) m_text.get(i)).length();
     				float difW = (float) (r.getWidth() - txtBound.getWidth());
     				switch (m_pos) {
     					case (LEFT):
     						textLayout.draw(g, (float) r.getX(),
     							(float) (r.getY() + (ht * (i + 1))));
     						break;
     					case (CENTER):
     						textLayout.draw(g, (float) r.getX() + (difW / 2),
     							(float) (r.getY() + (ht * (i + 1))));
     						break;
     					case (RIGTH):
     						textLayout.draw(g, (float) r.getX() + difW,
     							(float) (r.getY() + (ht * (i + 1)))); //- (ht / 2))));
     						break;
+    				}
+    			}
+    		}
+    	}
     	/**
-...
     		return m_isFixed;
+    	}
     	/**
     	 * Rellenar la rotaci?n para aplicar al texto.
+    	 *
     	 * @param rotation rotaci?n que se quiere aplicar.
     	 */
     	public void setRotation(double rotation) {
     		m_rotation = rotation;
+    	}
     	/**
     	 * Devuelve la rotaci?n del texto.
+    	 *
     	 * @return Rotaci?n del texto.
     	 */
     	public double getRotation() {
     		return m_rotation;
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#getXMLEntity()
     	 */
     	public XMLEntity getXMLEntity() {
-...
     		String[] s = (String[]) m_text.toArray(new String[0]);
     		xml.putProperty("s", s);
     		xml.putProperty("m_isFixed", m_isFixed);
     		xml.putProperty("m_rotation",getRotation());
     		xml.putProperty("m_pos", m_pos);
     		xml.putProperty("m_rotation", m_rotation);
     		xml.putProperty("fontName", m_f.getFontName());
     		xml.putProperty("fontStyle", m_f.getStyle());
     		xml.putProperty("tag", getTag());
     		xml.putProperty("textColor",StringUtilities.color2String(textColor));
     		xml.putProperty("textColor", StringUtilities.color2String(textColor));
     		// jaume
     		xml.putProperty("cellPadding", cellPadding);
     		xml.putProperty("fontSize", fontSize);
-...
     		xml.putProperty("frameBorderSize", frameBorderSize);
     		xml.putProperty("frameColor", StringUtilities.color2String(frameColor));
     		xml.putProperty("titleColor", StringUtilities.color2String(titleColor));
     		return xml;
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#setXMLEntity(com.iver.utiles.XMLEntity,
     	 * 		com.iver.cit.gvsig.project.Project)
-...
     		this.m_isFixed = xml.getBooleanProperty("m_isFixed");
     		this.m_pos = xml.getIntProperty("m_pos");
     		this.m_rotation = xml.getDoubleProperty("m_rotation");
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		this.m_f = new Font(xml.getStringProperty("fontName"),
     				xml.getIntProperty("fontStyle"), 9);
     		if (xml.contains("textColor"))
     			this.textColor = StringUtilities.string2Color(xml.getStringProperty("textColor"));
     		if (xml.contains("textColor")) {
     			this.textColor = StringUtilities.string2Color(xml.getStringProperty(
     						"textColor"));
+    		}
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#setXMLEntity(com.iver.utiles.XMLEntity,
     	 * 		com.iver.cit.gvsig.project.Project)
-...
     		this.m_isFixed = xml.getBooleanProperty("m_isFixed");
     		this.m_pos = xml.getIntProperty("m_pos");
     		this.m_rotation = xml.getDoubleProperty("m_rotation");
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		this.m_f = new Font(xml.getStringProperty("fontName"),
     				xml.getIntProperty("fontStyle"), 9);
     		if (xml.contains("textColor")){
     			this.textColor = StringUtilities.string2Color(xml.getStringProperty("textColor"));
     		if (xml.contains("textColor")) {
     			this.textColor = StringUtilities.string2Color(xml.getStringProperty(
     						"textColor"));
+    		}
     		// jaume
     		if (xml.contains("cellPadding"))
     		    this.cellPadding = xml.getIntProperty("cellPadding");
     		if (xml.contains("fontSize"))
     		    this.fontSize = xml.getIntProperty("fontSize");
     		if (xml.contains("fixedFontSize"))
     		    this.fixedFontSize = xml.getBooleanProperty("fixedFontSize");
     		if (xml.contains("surrounded"))
     		    this.surrounded = xml.getBooleanProperty("surrounded");
     		if (xml.contains("hasTitle"))
     		    this.hasTitle = xml.getBooleanProperty("hasTitle");
     		if (xml.contains("title"))
     		    this.title = xml.getStringProperty("title");
     		if (xml.contains("titleSize"))
     		    this.titleSize = xml.getIntProperty("titleSize");
     		if (xml.contains("frameBorderSize"))
     		    this.frameBorderSize = xml.getIntProperty("frameBorderSize");
     		if (xml.contains("frameColor"))
     		    this.frameColor = StringUtilities.string2Color(xml.getStringProperty("frameColor"));
     		if (xml.contains("titleColor"))
     		    this.titleColor = StringUtilities.string2Color(xml.getStringProperty("titleColor"));
     		if (xml.contains("cellPadding")) {
     			this.cellPadding = xml.getIntProperty("cellPadding");
+    		}
     		if (xml.contains("fontSize")) {
     			this.fontSize = xml.getIntProperty("fontSize");
+    		}
     		if (xml.contains("fixedFontSize")) {
     			this.fixedFontSize = xml.getBooleanProperty("fixedFontSize");
+    		}
     		if (xml.contains("surrounded")) {
     			this.surrounded = xml.getBooleanProperty("surrounded");
+    		}
     		if (xml.contains("hasTitle")) {
     			this.hasTitle = xml.getBooleanProperty("hasTitle");
+    		}
     		if (xml.contains("title")) {
     			this.title = xml.getStringProperty("title");
+    		}
     		if (xml.contains("titleSize")) {
     			this.titleSize = xml.getIntProperty("titleSize");
+    		}
     		if (xml.contains("frameBorderSize")) {
     			this.frameBorderSize = xml.getIntProperty("frameBorderSize");
+    		}
     		if (xml.contains("frameColor")) {
     			this.frameColor = StringUtilities.string2Color(xml.getStringProperty(
     						"frameColor"));
+    		}
     		if (xml.contains("titleColor")) {
     			this.titleColor = StringUtilities.string2Color(xml.getStringProperty(
     						"titleColor"));
+    		}
+    	}
     	/**
-...
     		return PluginServices.getText(this, "texto") + num;
+    	}
         /**
          * Sets FFrameText to draw an involving rectangle
          * @param b
          */
         public void setSurrounded(boolean b) {
             surrounded = b;
+        }
         /**
          * True if the FFrameText is set to draw an involving rectangle, or false
          * if not.
          * @return boolean
          */
         public boolean isSurrounded(){
             return surrounded;
+        }
         /**
          * Sets the gap between the involving rectangle and the text
          * @param i
          */
         public void setCellPadding(int i) {
             cellPadding = i;
+        }
     	/**
     	 * Sets FFrameText to draw an involving rectangle
+    	 *
     	 * @param b
     	 */
     	public void setSurrounded(boolean b) {
     		surrounded = b;
+    	}
         /**
          * @return
          */
         public boolean hasTitle() {
             return hasTitle;
+        }
     	/**
     	 * True if the FFrameText is set to draw an involving rectangle, or false
     	 * if not.
+    	 *
     	 * @return boolean
     	 */
     	public boolean isSurrounded() {
     		return surrounded;
+    	}
         /**
          * @return
          */
         public String getTitle() {
             return title;
+        }
     	/**
     	 * Sets the gap between the involving rectangle and the text
+    	 *
     	 * @param i
     	 */
     	public void setCellPadding(int i) {
     		cellPadding = i;
+    	}
         /**
          * @param b
          */
         public void setHasTitle(boolean b) {
            hasTitle = b;
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return
     	 */
     	public boolean hasTitle() {
     		return hasTitle;
+    	}
         /**
          * @param text
          */
         public void setTitle(String text) {
             title = text;
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return
     	 */
     	public String getTitle() {
     		return title;
+    	}
         /**
          * @return
          */
         public int getTitleSize() {
             return titleSize;
+        }
         public void setTitleSize(int size) {
             titleSize = size;
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param b
     	 */
     	public void setHasTitle(boolean b) {
     		hasTitle = b;
+    	}
         /**
          * @param i
          */
         public void setFrameBorderSize(int size) {
             frameBorderSize = size;
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param text
     	 */
     	public void setTitle(String text) {
     		title = text;
+    	}
         /**
          * @return
          */
         public int getFrameBorderSize() {
             return frameBorderSize;
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return
     	 */
     	public int getTitleSize() {
     		return titleSize;
+    	}
         /**
          * @param frameColor
          */
         public void setFrameColor(Color frameColor) {
             this.frameColor = frameColor;
+        }
         public void setTitleColor(Color titleColor) {
             this.titleColor = titleColor;
+        }
         public Color getFrameColor(){
             return frameColor;
+        }
         public Color getTitleColor(){
             return titleColor;
+        }
         /**
          * Use this method if you want the text in the FFrameText to be removed.
+         *
          */
         public void clearText(){
         	m_text.clear();
+        }
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param size DOCUMENT ME!
     	 */
     	public void setTitleSize(int size) {
     		titleSize = size;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param size
     	 */
     	public void setFrameBorderSize(int size) {
     		frameBorderSize = size;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return
     	 */
     	public int getFrameBorderSize() {
     		return frameBorderSize;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param frameColor
     	 */
     	public void setFrameColor(Color frameColor) {
     		this.frameColor = frameColor;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @param titleColor DOCUMENT ME!
     	 */
     	public void setTitleColor(Color titleColor) {
     		this.titleColor = titleColor;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return DOCUMENT ME!
     	 */
     	public Color getFrameColor() {
     		return frameColor;
+    	}
     	/**
     	 * DOCUMENT ME!
+    	 *
     	 * @return DOCUMENT ME!
     	 */
     	public Color getTitleColor() {
     		return titleColor;
+    	}
     	/**
     	 * Use this method if you want the text in the FFrameText to be removed.
     	 */
     	public void clearText() {
     		m_text.clear();
+    	}
+    }

     	public void draw(Graphics2D g, AffineTransform at, Rectangle2D rv,
     		BufferedImage imgBase) {
     		Rectangle2D.Double re = getBoundingBox(at);
     		g.rotate(Math.toRadians(getRotation()), re.x + (re.width / 2),
     				re.y + (re.height / 2));
     		if (intersects(rv, re)) {
     			Rectangle r = new Rectangle((int) re.x, (int) re.y, (int) re.width,
     					(int) re.height);
-...
     			//pSD.draw(g, r, m_type);
     			FGraphicUtilities.DrawSymbol((Graphics2D) g, mT2, rec, m_Symbol);
+    		}
     		g.rotate(Math.toRadians(-getRotation()),
     				re.x + (re.width / 2), re.y + (re.height / 2));
+    	}
     	/**
-...
     		xml.putProperty("m_Selected", m_Selected);
     		xml.putProperty("type", Layout.RECTANGLESYMBOL);
     		xml.putProperty("tag", getTag());
     		xml.putProperty("m_rotation",getRotation());
     		xml.addChild(m_Symbol.getXMLEntity());
     		return xml;
-...
     		} else {
     			this.setSelected(false);
+    		}
     		setRotation(xml.getDoubleProperty("m_rotation"));
     		this.m_Symbol = FSymbol.createFromXML(xml.getChild(0));
+    	}

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/Layout.java
590	590	if ((Math.abs(difx) > 3) \|\| (Math.abs(dify) > 3)) {
591	591	Rectangle2D rectangle = fframe.getMovieRect(difx,
592	592	dify);
593
	593	((Graphics2D)g).rotate(Math.toRadians(fframe.getRotation()), rectangle.getX() + (rectangle.getWidth() / 2),
	594	rectangle.getY() + (rectangle.getHeight() / 2));
594	595	if (rectangle != null) {
595	596	if (isCuadricula) {
596	597	FLayoutUtilities.setRectGrid(rectangle,
...	...
604	605	(int) rectangle.getWidth(),
605	606	(int) rectangle.getHeight());
606	607	}
	608	((Graphics2D)g).rotate(Math.toRadians(-fframe.getRotation()),
	609	rectangle.getX() + (rectangle.getWidth() / 2), rectangle.getY() + (rectangle.getHeight() / 2));
607	610	}
608	611	}
609	612	}

Also available in: Unified diff