Revision 21154

View differences:

branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameGraphics.java
54 54

  
55 55
import javax.print.attribute.PrintRequestAttributeSet;
56 56

  
57
import org.gvsig.fmap.geom.Geometry;
58

  
57 59
import org.gvsig.fmap.core.shapes.FShape;
58 60
import org.gvsig.fmap.core.shapes.adapters.CircleAdapter;
59 61
import org.gvsig.fmap.core.shapes.adapters.GeometryAdapter;
......
674 676
		return new FFrameGraphicsDialog(getLayout(),this);
675 677
	}
676 678

  
677
	public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet printingProperties) throws ReadDriverException {
679
	public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet printingProperties) throws ReadDriverException {
678 680
		 Rectangle2D.Double rect = getBoundingBox(at);
679 681
	     g.rotate(Math.toRadians(getRotation()), rect.x + (rect.width / 2),
680 682
	            rect.y + (rect.height / 2));
......
683 685
	     if (m_type == POINT) {
684 686
	         ((IMarkerSymbol)m_symbol).setSize((int) (rect.getWidth() * 0.7));
685 687
	     }
686
	     m_symbol.print(g,at,geometry.getShape(at),printingProperties);
688
	     m_symbol.print(g,at,geometry.getGeometry(at),printingProperties);
687 689
	     //geometry.print(g, at, m_symbol, printingProperties);
688 690
	     g.rotate(Math.toRadians(-getRotation()), rect.x + (rect.width / 2),
689 691
	            rect.y + (rect.height / 2));
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameBasic.java
55 55

  
56 56
import javax.print.attribute.PrintRequestAttributeSet;
57 57

  
58
import org.gvsig.fmap.geom.Geometry;
59

  
58 60
import org.gvsig.fmap.core.shapes.FShape;
59 61
import org.gvsig.fmap.core.shapes.adapters.PolygonAdapter;
60 62
import org.gvsig.fmap.mapcontext.rendering.symbols.IFillSymbol;
......
192 194
     * @see com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java.awt.Graphics2D,
193 195
     *      java.awt.geom.AffineTransform)
194 196
     */
195
    public void print(Graphics2D g, AffineTransform at,FShape shape, PrintRequestAttributeSet printingProperties)
197
    public void print(Graphics2D g, AffineTransform at,Geometry geom, PrintRequestAttributeSet printingProperties)
196 198
        throws ReadDriverException {
197 199
//    	fframeGraphics.setPrintingProperties(printingProperties);
198 200
    	fframeGraphics.print(g,at,shape, printingProperties);
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameText.java
57 57

  
58 58
import javax.print.attribute.PrintRequestAttributeSet;
59 59

  
60
import org.gvsig.fmap.geom.Geometry;
61

  
60 62
import org.gvsig.fmap.core.shapes.FShape;
61 63

  
62 64
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
......
432 434
     * @see com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java.awt.Graphics2D,
433 435
     *      java.awt.geom.AffineTransform)
434 436
     */
435
    public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet properties) throws ReadDriverException {
437
    public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet properties) throws ReadDriverException {
436 438
        draw(g, at, null, null);
437 439
    }
438 440

  
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameLegend.java
52 52

  
53 53
import javax.print.attribute.PrintRequestAttributeSet;
54 54

  
55
import org.gvsig.fmap.geom.Geometry;
56

  
55 57
import org.gvsig.fmap.core.shapes.FShape;
56 58
import org.gvsig.fmap.mapcontext.layers.FLayer;
57 59
import org.gvsig.fmap.mapcontext.layers.FLayers;
......
716 718
     * @see com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java.awt.Graphics2D,
717 719
     *      java.awt.geom.AffineTransform)
718 720
     */
719
    public void print(Graphics2D g, AffineTransform at,FShape shape, PrintRequestAttributeSet properties)
721
    public void print(Graphics2D g, AffineTransform at,Geometry geom, PrintRequestAttributeSet properties)
720 722
        throws ReadDriverException {
721 723
        draw(g, at, null, null);
722 724
    }
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameView.java
58 58
import javax.print.attribute.PrintRequestAttributeSet;
59 59

  
60 60
import org.cresques.cts.IProjection;
61
import org.gvsig.fmap.geom.Geometry;
61 62
import org.gvsig.fmap.core.shapes.FShape;
62 63
import org.gvsig.fmap.mapcontext.MapContext;
63 64
import org.gvsig.fmap.mapcontext.ViewPort;
......
457 458
		return r;
458 459
    }
459 460

  
460
    public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet prroperties)
461
    public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet prroperties)
461 462
        throws ReadDriverException {
462 463
        draw(g, at, null, null);
463 464
    }
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFramePicture.java
64 64
import org.apache.batik.bridge.ViewBox;
65 65
import org.apache.batik.gvt.GraphicsNode;
66 66
import org.apache.batik.gvt.renderer.StaticRenderer;
67
import org.gvsig.fmap.geom.Geometry;
67 68
import org.gvsig.fmap.core.shapes.FShape;
68 69
import org.w3c.dom.Document;
69 70
import org.w3c.dom.Element;
......
466 467
		return new FFramePictureDialog(getLayout(), this);
467 468
	}
468 469

  
469
	public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet properties) throws ReadDriverException {
470
	public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet properties) throws ReadDriverException {
470 471
		draw(g, at, null, null);
471 472
	}
472 473
}
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameScaleBar.java
58 58

  
59 59
import javax.print.attribute.PrintRequestAttributeSet;
60 60

  
61
import org.gvsig.fmap.geom.Geometry;
62

  
61 63
import org.gvsig.fmap.core.shapes.FShape;
62 64
import org.gvsig.fmap.mapcontext.MapContext;
63 65

  
......
1272 1274
     * @see com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java.awt.Graphics2D,
1273 1275
     *      java.awt.geom.AffineTransform)
1274 1276
     */
1275
    public void print(Graphics2D g, AffineTransform at, FShape shape, PrintRequestAttributeSet properties)
1277
    public void print(Graphics2D g, AffineTransform at, Geometry geom, PrintRequestAttributeSet properties)
1276 1278
        throws ReadDriverException {
1277 1279
        draw(g, at, null, null);
1278 1280
    }
branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameGroup.java
53 53

  
54 54
import javax.print.attribute.PrintRequestAttributeSet;
55 55

  
56
import org.gvsig.fmap.geom.Geometry;
57

  
56 58
import org.gvsig.fmap.core.shapes.FShape;
57 59

  
58 60
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
......
304 306
     * @see com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame#print(java.awt.Graphics2D,
305 307
     *      java.awt.geom.AffineTransform)
306 308
     */
307
    public void print(Graphics2D g, AffineTransform at,FShape shape, PrintRequestAttributeSet printingProperties)
309
    public void print(Graphics2D g, AffineTransform at,Geometry geom, PrintRequestAttributeSet printingProperties)
308 310
        throws ReadDriverException {
309 311
        Rectangle2D.Double r = getBoundingBox(at);
310 312
        g.rotate(Math.toRadians(getRotation()), r.x + (r.width / 2),

Also available in: Unified diff