Revision 4775

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/Layout.java
114 114
import com.iver.cit.gvsig.gui.layout.commands.EditableFeatureSource;
115 115
import com.iver.cit.gvsig.gui.layout.dialogs.FConfigLayoutDialog;
116 116
import com.iver.cit.gvsig.gui.layout.fframes.FFrame;
117
import com.iver.cit.gvsig.gui.layout.fframes.FFrameBox;
117
import com.iver.cit.gvsig.gui.layout.fframes.FFrameTable;
118 118
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics;
119 119
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGroup;
120 120
import com.iver.cit.gvsig.gui.layout.fframes.FFrameLegend;
......
219 219
                                                                    .getResource("images/CircleCursor.png")).getImage();
220 220
    public static final Image iPoligon = new ImageIcon(AddLayer.class.getClassLoader()
221 221
                                                                     .getResource("images/PoligonCursor.png")).getImage();
222

  
223

  
222 224
    public static Hashtable nums = new Hashtable();
223 225
    private Point origin = new Point(50, 50);
224 226
    private Point rectOrigin = new Point(origin);
......
263 265
     * Se pone en modo debug cuando hacemos un VIEW_TAGS
264 266
     */
265 267
    private boolean bModeDebug = false;
268
	private boolean editGroup;
266 269

  
267 270
    /**
268 271
     * Creates a new Layout object.
......
634 637
                        if ((Math.abs(difx) > 3) || (Math.abs(dify) > 3)) {
635 638
                            Rectangle2D rectangle = frames[i].getMovieRect(difx,
636 639
                                    dify);
640
                            if (rectangle==null)
641
                            	return;
637 642
                            ((Graphics2D) g).rotate(Math.toRadians(
638 643
                                    frames[i].getRotation()),
639 644
                                rectangle.getX() + (rectangle.getWidth() / 2),
......
657 662
                                    -frames[i].getRotation()),
658 663
                                rectangle.getX() + (rectangle.getWidth() / 2),
659 664
                                rectangle.getY() + (rectangle.getHeight() / 2));
665

  
660 666
                        }
661 667
                    //}
662 668
                }
......
750 756
     *        FFrame que se a?ade o no.
751 757
     */
752 758
    public void addFFrame(IFFrame frame, boolean clearSelection, boolean select) {
753
        if (clearSelection) {
754
            for (int i = getFFrames().length - 1; i >= 0; i--) {
755
                IFFrame fframe1 = (IFFrame) getFFrame(i);
759
        IFFrame[] fframes=getFFrames();
760
    	if (clearSelection) {
761
            for (int i = fframes.length - 1; i >= 0; i--) {
762
                IFFrame fframe1 = fframes[i];
756 763
                fframe1.setSelected(false);
757 764
            }
758 765
        }
......
1060 1067

  
1061 1068
                break;
1062 1069
            case RECTANGLEBOX:
1063
                fframedialog = new FFrameBoxDialog(this, (FFrameBox) fframe);
1070
                fframedialog = new FFrameBoxDialog(this, (FFrameTable) fframe);
1064 1071

  
1065 1072
                break;
1066 1073
            default:
......
1618 1625
		commandRepaint();
1619 1626

  
1620 1627
	}
1628
/**
1629
 * Introduce la posibilidad de establecer que los cambios que se hacen
1630
 * a partir de ese momento hasta que se vuelva aponer a false, que todas
1631
 * las operaciones que se realices son sobre los fframes que implementen
1632
 * IFFrameGroupSelectable.
1633
 *
1634
 * @param b
1635
 */
1636
	public void setEditGroup(boolean b) {
1637
		editGroup=b;
1638
	}
1639
	/**
1640
	 * Devuelve true si se est? en modo de edici?n de los fframes que
1641
	 * implementen IFFrameGroupSelectable.
1642
	 *
1643
	 * @return
1644
	 */
1645
	public boolean isEditGroup(){
1646
		return editGroup;
1647
	}
1621 1648
}

Also available in: Unified diff