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

View differences:

FFrameLegend.java
280 280
                            }
281 281
                            ISymbol fs2d = symbols[j];
282 282
                            if (layout!=null) {
283
                            	toFFrameSymbol(layout,re,xl,yl,fs2d,sizefont, h);
283
                            	try {
284
									toFFrameSymbol(layout,re,xl,yl,fs2d,sizefont, h, cO.getShapeType());
285
								} catch (ReadException e) {
286
									e.printStackTrace();
287
								}
284 288
                            }else {
285 289
                            	drawSymbolLegend(g, re, xl, yl, fs2d, sizefont,
286 290
                            			h);
......
305 309
							ISymbol fs2d = cO.getLegend().getDefaultSymbol();
306 310

  
307 311
							if (layout != null) {
308
								toFFrameSymbol(layout, re, xl, yl, fs2d,
309
										sizefont, h);
312
								try {
313
									toFFrameSymbol(layout, re, xl, yl, fs2d,
314
											sizefont, h, cO.getShapeType());
315
								} catch (ReadException e) {
316
									e.printStackTrace();
317
								}
310 318
							} else {
311 319
								drawSymbolLegend(g, re, xl, yl, fs2d, sizefont,
312 320
										h);
......
465 473
     * @param y Posici?n Y.
466 474
     * @param fs2d S?mbolo a a?adir.
467 475
     * @param h Altura.
476
     * @param shapeType
468 477
     * @param wT Rect?ngulo del FFrame.
469 478
     * @param hT tama?o de la fuente.
470 479
     */
471 480
    private void toFFrameSymbol(LayoutContext layout, Rectangle2D re, double x,
472
            double y, ISymbol fs2d, float sizefont, double h) {
481
            double y, ISymbol fs2d, float sizefont, double h, int shapeType) {
473 482
            double pW = 5;
474 483
            double wl = (re.getWidth() / pW);
475 484
            double haux = (sizefont * 0.7);
......
486 495
            symbol.setLayout(getLayout());
487 496
            symbol.setBoundBox(FLayoutUtilities.toSheetRect(rAux3, layout.getAT()));
488 497
            symbol.setSymbol(fs2d);
498
            symbol.setShapeType(shapeType);
489 499
            layout.addFFrame(symbol, false, true);
490 500
        }
491 501

  

Also available in: Unified diff