Revision 36694

View differences:

branches/v2_0_0_prep/extensions/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/FLayoutDraw.java
117 117
        IFFrame[] fframes = layoutContext.getFFrames();
118 118
        for (int i = 0; i < fframes.length; i++) {
119 119
            IFFrame f = fframes[i];
120
            // original, lento (NO MAC)
121
            f.setLayoutControl(layoutControl);
120
            // original, lento (NO MAC)          
122 121
            f.setLayoutContext(layoutContext);
123 122
            f.draw(g2, at, layoutControl.getComponent().getVisibleRect(),
124 123
                imgBase);
branches/v2_0_0_prep/extensions/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/fframes/FFrame.java
786 786
        this.layoutContext = theLayoutContext;
787 787
    }
788 788

  
789
    public LayoutControl getLayoutControl() {
790
        return layoutControl;
791
    }
792

  
793
    public void setLayoutControl(LayoutControl layoutControl) {
794
        this.layoutControl = layoutControl;
795
    }
796

  
797 789
    public void addObserver(Observer o) {
798 790
        observers.addObserver(o);        
799 791
    }
branches/v2_0_0_prep/extensions/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/fframes/IFFrame.java
312 312

  
313 313
    public LayoutContext getLayoutContext();
314 314

  
315
    public void setLayoutControl(LayoutControl layoutControl);
316

  
317
    public LayoutControl getLayoutControl();
318

  
319 315
    public void setFrameFactory(FrameFactory frameFactory);
320 316

  
321 317
    public FrameFactory getFrameFactory();
branches/v2_0_0_prep/extensions/org.gvsig.app.document.layout.app/org.gvsig.app.document.layout.app.mainplugin/src/main/java/org/gvsig/app/project/documents/layout/fframes/FFrameView.java
410 410

  
411 411
                            if (origin != null
412 412
                                && origin.equals(mapOrigin)
413
                                && getLayoutControl().getAT().getScaleX() == scaleAnt
413
                                && getLayoutContext().getAT().getScaleX() == scaleAnt
414 414
                                && m_image != null
415 415
                                && !refresh
416 416
                                && !(r.getWidth() > rv.getWidth() || r.getHeight() > rv.getHeight())) {
......
421 421
                                        viewPort.getImageHeight());
422 422
                                }
423 423
                                g.translate(r.getX(), r.getY());
424
                                g.drawImage(m_image, 0, 0, getLayoutControl()
425
                                    .getComponent());
424
                                g.drawImage(m_image, 0, 0, null);
426 425
                                g.translate(-r.getX(), -r.getY());
427 426
                                scaleAnt =
428 427
                                    getLayoutContext().getAT().getScaleX();
......
506 505
                                            viewPort.getImageHeight());
507 506
                                    }
508 507
                                    g.drawImage(m_image, (int) r.getX(),
509
                                        (int) r.getY(), getLayoutControl()
510
                                            .getComponent());
508
                                        (int) r.getY(), null);
511 509
                                }
512 510
                                scaleAnt =
513 511
                                    getLayoutContext().getAT().getScaleX();

Also available in: Unified diff