Revision 2263
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/FLayoutDraw.java | ||
|---|---|---|
| 45 | 45 |
package com.iver.cit.gvsig.gui.layout; |
| 46 | 46 |
|
| 47 | 47 |
import com.iver.cit.gvsig.fmap.DriverException; |
| 48 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 49 | 48 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameView; |
| 50 | 49 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
| 51 | 50 |
|
| ... | ... | |
| 474 | 473 |
for (int i = 0; i < layout.getFFrames().size(); i++) {
|
| 475 | 474 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 476 | 475 |
|
| 477 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 476 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 478 | 477 |
fframe.drawHandlers((Graphics2D) g); |
| 479 | 478 |
} |
| 480 | 479 |
} |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/EventsHandler.java | ||
|---|---|---|
| 44 | 44 |
*/ |
| 45 | 45 |
package com.iver.cit.gvsig.gui.layout; |
| 46 | 46 |
|
| 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 48 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics; |
|
| 49 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
|
| 50 |
|
|
| 51 | 47 |
import java.awt.Cursor; |
| 52 | 48 |
import java.awt.Point; |
| 53 | 49 |
import java.awt.event.ActionEvent; |
| ... | ... | |
| 59 | 55 |
import java.awt.event.MouseMotionListener; |
| 60 | 56 |
import java.awt.geom.Point2D; |
| 61 | 57 |
import java.awt.geom.Rectangle2D; |
| 62 |
|
|
| 63 | 58 |
import java.util.ArrayList; |
| 64 | 59 |
|
| 60 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics; |
|
| 61 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
|
| 65 | 62 |
|
| 63 |
|
|
| 66 | 64 |
/** |
| 67 | 65 |
* Eventos que se realizan sobre el Layout. |
| 68 | 66 |
* |
| ... | ... | |
| 141 | 139 |
for (int i = 0; i < layout.getFFrames().size(); i++) {
|
| 142 | 140 |
IFFrame auxfframe = (IFFrame) layout.getFFrames().get(i); |
| 143 | 141 |
|
| 144 |
if ((auxfframe.getSelected() != FFrame.NOSELECT)) {
|
|
| 142 |
if ((auxfframe.getSelected() != IFFrame.NOSELECT)) {
|
|
| 145 | 143 |
cursor = auxfframe.getMapCursor(p); |
| 146 | 144 |
} |
| 147 | 145 |
|
| ... | ... | |
| 170 | 168 |
|
| 171 | 169 |
for (int j = 0; j < layout.getFFrames().size(); j++) {
|
| 172 | 170 |
if (((IFFrame) layout.getFFrames().get(j)).getContains( |
| 173 |
m_pointSelected) != FFrame.NOSELECT) {
|
|
| 171 |
m_pointSelected) != IFFrame.NOSELECT) {
|
|
| 174 | 172 |
listSelect.add((IFFrame) layout.getFFrames().get(j)); |
| 175 | 173 |
} |
| 176 | 174 |
} |
| 177 | 175 |
|
| 178 | 176 |
if (listSelect.size() > 0) {
|
| 179 | 177 |
for (int k = 0; k < listSelect.size(); k++) {
|
| 180 |
if (((IFFrame) listSelect.get(k)).getSelected() != FFrame.NOSELECT) {
|
|
| 178 |
if (((IFFrame) listSelect.get(k)).getSelected() != IFFrame.NOSELECT) {
|
|
| 181 | 179 |
index = listSelect.size() - k; |
| 182 | 180 |
|
| 183 | 181 |
break; |
| ... | ... | |
| 195 | 193 |
if (!E.isShiftDown()) {
|
| 196 | 194 |
fframe.setSelected(false); |
| 197 | 195 |
} else {
|
| 198 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 199 |
if (fframe.getContains(m_pointSelected) != FFrame.NOSELECT) {
|
|
| 196 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 197 |
if (fframe.getContains(m_pointSelected) != IFFrame.NOSELECT) {
|
|
| 200 | 198 |
fframe.setSelected(false); |
| 201 | 199 |
} |
| 202 | 200 |
} |
| ... | ... | |
| 302 | 300 |
|
| 303 | 301 |
if (m_pointSelected != null) {
|
| 304 | 302 |
if (!E.isShiftDown()) {
|
| 305 |
if ((fframe.getSelected() != FFrame.NOSELECT)) {
|
|
| 303 |
if ((fframe.getSelected() != IFFrame.NOSELECT)) {
|
|
| 306 | 304 |
fframe.setSelected(m_pointSelected); |
| 307 | 305 |
} |
| 308 | 306 |
} |
| 309 | 307 |
} |
| 310 | 308 |
|
| 311 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 309 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 312 | 310 |
layout.setIsReSel(false); |
| 313 | 311 |
} |
| 314 | 312 |
} |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/dialogs/FBorderDialog.java | ||
|---|---|---|
| 44 | 44 |
*/ |
| 45 | 45 |
package com.iver.cit.gvsig.gui.layout.dialogs; |
| 46 | 46 |
|
| 47 |
import java.awt.Color; |
|
| 48 |
import java.awt.geom.Rectangle2D; |
|
| 49 |
import java.util.ArrayList; |
|
| 50 |
|
|
| 51 |
import javax.swing.ButtonGroup; |
|
| 52 |
import javax.swing.JPanel; |
|
| 53 |
|
|
| 47 | 54 |
import com.iver.andami.PluginServices; |
| 48 | 55 |
import com.iver.andami.ui.mdiManager.View; |
| 49 | 56 |
import com.iver.andami.ui.mdiManager.ViewInfo; |
| 50 |
|
|
| 51 | 57 |
import com.iver.cit.gvsig.gui.layout.FLayoutGraphics; |
| 52 | 58 |
import com.iver.cit.gvsig.gui.layout.FLayoutUtilities; |
| 53 | 59 |
import com.iver.cit.gvsig.gui.layout.Layout; |
| 54 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 55 | 60 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics; |
| 56 | 61 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGroup; |
| 57 | 62 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
| 58 | 63 |
import com.iver.cit.gvsig.gui.layout.fframes.dialogs.FFrameGraphicsDialog; |
| 59 | 64 |
|
| 60 |
import java.awt.Color; |
|
| 61 |
import java.awt.geom.Rectangle2D; |
|
| 62 | 65 |
|
| 63 |
import java.util.ArrayList; |
|
| 64 |
|
|
| 65 |
import javax.swing.ButtonGroup; |
|
| 66 |
import javax.swing.JPanel; |
|
| 67 |
|
|
| 68 |
|
|
| 69 | 66 |
/** |
| 70 | 67 |
* Di?logo con todas las opciones para crear un borde a los fframes. |
| 71 | 68 |
* |
| ... | ... | |
| 119 | 116 |
*/ |
| 120 | 117 |
private void initialize() {
|
| 121 | 118 |
for (int i = 0; i < layout.getFFrames().size(); i++) {
|
| 122 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != FFrame.NOSELECT) {
|
|
| 119 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != IFFrame.NOSELECT) {
|
|
| 123 | 120 |
selecList.add(layout.getFFrames().get(i)); |
| 124 | 121 |
} |
| 125 | 122 |
} |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/IFFrame.java | ||
|---|---|---|
| 64 | 64 |
* @author Vicente Caballero Navarro |
| 65 | 65 |
*/ |
| 66 | 66 |
public interface IFFrame {
|
| 67 |
/** FFrame no selecccionado. */ |
|
| 68 |
public static final int NOSELECT = 0; |
|
| 69 |
|
|
| 67 | 70 |
/** |
| 68 | 71 |
* Devuelve el boundingBox del fframe en funci?n de la transformada af?n |
| 69 | 72 |
* que se pasa como par?metro. Si se pasa como par?metro null, devuelve el |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFramePicture.java | ||
|---|---|---|
| 80 | 80 |
|
| 81 | 81 |
import java.io.File; |
| 82 | 82 |
|
| 83 |
import java.net.MalformedURLException; |
|
| 84 |
|
|
| 85 | 83 |
import javax.swing.ImageIcon; |
| 86 | 84 |
|
| 87 | 85 |
|
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrame.java | ||
|---|---|---|
| 89 | 89 |
private static final int O = 7; |
| 90 | 90 |
private static final int NO = 8; |
| 91 | 91 |
private static final int RECT = 9; |
| 92 |
|
|
| 93 |
/** FFrame no selecccionado. */ |
|
| 94 |
public static final int NOSELECT = 0; |
|
| 92 |
|
|
| 95 | 93 |
protected String m_name = "FFrame"; |
| 96 | 94 |
private Rectangle2D.Double m_BoundBox = new Rectangle2D.Double(); |
| 97 | 95 |
private Rectangle2D.Double m_BoundingBox = new Rectangle2D.Double(); |
| ... | ... | |
| 491 | 489 |
if (b) {
|
| 492 | 490 |
m_Selected = RECT; |
| 493 | 491 |
} else {
|
| 494 |
m_Selected = NOSELECT; |
|
| 492 |
m_Selected = IFFrame.NOSELECT;
|
|
| 495 | 493 |
} |
| 496 | 494 |
} |
| 497 | 495 |
|
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/dialogs/FFramePictureDialog.java | ||
|---|---|---|
| 46 | 46 |
|
| 47 | 47 |
import java.awt.Component; |
| 48 | 48 |
import java.awt.Dimension; |
| 49 |
import java.awt.Image; |
|
| 50 | 49 |
import java.awt.geom.Rectangle2D; |
| 51 | 50 |
import java.io.File; |
| 52 | 51 |
|
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/FLayoutGraphics.java | ||
|---|---|---|
| 49 | 49 |
import com.iver.cit.gvsig.gui.layout.dialogs.FAlignDialog; |
| 50 | 50 |
import com.iver.cit.gvsig.gui.layout.dialogs.FBorderDialog; |
| 51 | 51 |
import com.iver.cit.gvsig.gui.layout.dialogs.FPositionDialog; |
| 52 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 53 | 52 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics; |
| 54 | 53 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGroup; |
| 55 | 54 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameLegend; |
| ... | ... | |
| 92 | 91 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 93 | 92 |
|
| 94 | 93 |
if (fframe instanceof FFrameLegend) {
|
| 95 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 94 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 96 | 95 |
((FFrameLegend) fframe).toFFrames(layout); |
| 97 | 96 |
} |
| 98 | 97 |
} |
| ... | ... | |
| 116 | 115 |
for (int i = layout.getFFrames().size() - 1; i >= 0; i--) {
|
| 117 | 116 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 118 | 117 |
|
| 119 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 118 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 120 | 119 |
selecList.add(fframe); |
| 121 | 120 |
|
| 122 | 121 |
layout.getFFrames().remove(fframe); |
| ... | ... | |
| 151 | 150 |
for (int i = layout.getFFrames().size() - 1; i >= 0; i--) {
|
| 152 | 151 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 153 | 152 |
|
| 154 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 153 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 155 | 154 |
if (fframe instanceof FFrameGroup) {
|
| 156 | 155 |
FFrameGroup fframegroup = (FFrameGroup) fframe; |
| 157 | 156 |
ArrayList selecList = new ArrayList(); |
| ... | ... | |
| 196 | 195 |
for (int i = layout.getFFrames().size() - 1; i >= 0; i--) {
|
| 197 | 196 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 198 | 197 |
|
| 199 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 198 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 200 | 199 |
auxList.add(fframe); |
| 201 | 200 |
layout.getFFrames().remove(fframe); |
| 202 | 201 |
num++; |
| ... | ... | |
| 222 | 221 |
for (int i = layout.getFFrames().size() - 1; i >= 0; i--) {
|
| 223 | 222 |
IFFrame fframe = (IFFrame) layout.getFFrames().get(i); |
| 224 | 223 |
|
| 225 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 224 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 226 | 225 |
auxList.add(fframe); |
| 227 | 226 |
layout.getFFrames().remove(fframe); |
| 228 | 227 |
num++; |
| ... | ... | |
| 247 | 246 |
for (int i = 0; i < layout.getFFrames().size(); i++) {
|
| 248 | 247 |
//Abrir el di?logo de cada uno de los fframe seleccionados o |
| 249 | 248 |
//uno que sea general como en arcView. |
| 250 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != FFrame.NOSELECT) {
|
|
| 249 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != IFFrame.NOSELECT) {
|
|
| 251 | 250 |
selecList.add(layout.getFFrames().get(i)); |
| 252 | 251 |
} |
| 253 | 252 |
} |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/FLayoutZooms.java | ||
|---|---|---|
| 44 | 44 |
*/ |
| 45 | 45 |
package com.iver.cit.gvsig.gui.layout; |
| 46 | 46 |
|
| 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 48 | 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameView; |
| 49 | 48 |
import com.iver.cit.gvsig.gui.layout.fframes.IFFrame; |
| 50 | 49 |
|
| ... | ... | |
| 296 | 295 |
Rectangle2D.Double recaux = null; |
| 297 | 296 |
|
| 298 | 297 |
for (int i = 0; i < layout.getFFrames().size(); i++) {
|
| 299 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != FFrame.NOSELECT) {
|
|
| 298 |
if (((IFFrame) layout.getFFrames().get(i)).getSelected() != IFFrame.NOSELECT) {
|
|
| 300 | 299 |
if (recaux == null) {
|
| 301 | 300 |
recaux = ((IFFrame) layout.getFFrames().get(i)).getBoundingBox(layout.getAT()); |
| 302 | 301 |
} else {
|
| ... | ... | |
| 326 | 325 |
if (layout.getFFrames().get(i) instanceof FFrameView) {
|
| 327 | 326 |
FFrameView fframe = (FFrameView) layout.getFFrames().get(i); |
| 328 | 327 |
|
| 329 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 328 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 330 | 329 |
p1 = functions.toMapPoint(p1, fframe.getAt()); |
| 331 | 330 |
p2 = functions.toMapPoint(p2, fframe.getAt()); |
| 332 | 331 |
|
| ... | ... | |
| 387 | 386 |
if (layout.getFFrames().get(i) instanceof FFrameView) {
|
| 388 | 387 |
FFrameView fframe = (FFrameView) layout.getFFrames().get(i); |
| 389 | 388 |
|
| 390 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 389 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 391 | 390 |
double nuevoX; |
| 392 | 391 |
double nuevoY; |
| 393 | 392 |
double cX; |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/FLayoutFunctions.java | ||
|---|---|---|
| 44 | 44 |
*/ |
| 45 | 45 |
package com.iver.cit.gvsig.gui.layout; |
| 46 | 46 |
|
| 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrame; |
|
| 48 | 47 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGraphics; |
| 49 | 48 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameGroup; |
| 50 | 49 |
import com.iver.cit.gvsig.gui.layout.fframes.FFrameLegend; |
| ... | ... | |
| 92 | 91 |
int dify = (layout.getLastPoint().y - layout.getFirstPoint().y); |
| 93 | 92 |
|
| 94 | 93 |
if (((Math.abs(difx) > 3) || (Math.abs(dify) > 3)) && |
| 95 |
(fframe.getSelected() != FFrame.NOSELECT)) {
|
|
| 94 |
(fframe.getSelected() != IFFrame.NOSELECT)) {
|
|
| 96 | 95 |
Rectangle2D rectangle = fframe.getMovieRect(difx, dify); |
| 97 | 96 |
|
| 98 | 97 |
if (layout.isCuadricula()) {
|
| ... | ... | |
| 198 | 197 |
if (layout.getFFrames().get(i) instanceof FFrameView) {
|
| 199 | 198 |
FFrameView fframe = (FFrameView) layout.getFFrames().get(i); |
| 200 | 199 |
|
| 201 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 200 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 202 | 201 |
Rectangle2D.Double r = new Rectangle2D.Double(); |
| 203 | 202 |
Rectangle2D extent = fframe.getFMap().getViewPort() |
| 204 | 203 |
.getExtent(); |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/Layout.java | ||
|---|---|---|
| 413 | 413 |
for (int i = getFFrames().size() - 1; i >= 0; i--) {
|
| 414 | 414 |
IFFrame fframe = (IFFrame) getFFrames().get(i); |
| 415 | 415 |
|
| 416 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 416 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 417 | 417 |
getFFrames().remove(i); |
| 418 | 418 |
} |
| 419 | 419 |
} |
| ... | ... | |
| 520 | 520 |
if (getFFrames().get(i) instanceof FFrameView) {
|
| 521 | 521 |
FFrameView fframe = (FFrameView) getFFrames().get(i); |
| 522 | 522 |
|
| 523 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 523 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 524 | 524 |
Rectangle2D.Double rec = fframe.getBoundingBox(getAT()); |
| 525 | 525 |
|
| 526 | 526 |
if (img != null) {
|
| ... | ... | |
| 580 | 580 |
for (int i = 0; i < getFFrames().size(); i++) {
|
| 581 | 581 |
IFFrame fframe = (IFFrame) getFFrames().get(i); |
| 582 | 582 |
|
| 583 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 583 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 584 | 584 |
g.setColor(Color.black); |
| 585 | 585 |
fframe.drawHandlers((Graphics2D) g); |
| 586 | 586 |
|
| ... | ... | |
| 1143 | 1143 |
if (getFFrames().get(i) instanceof FFrameView) {
|
| 1144 | 1144 |
FFrameView fframe = (FFrameView) getFFrames().get(i); |
| 1145 | 1145 |
|
| 1146 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 1146 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 1147 | 1147 |
fframe.getFMap().getViewPort().setExtent(fframe.getFMap() |
| 1148 | 1148 |
.getFullExtent()); |
| 1149 | 1149 |
} |
| ... | ... | |
| 1309 | 1309 |
for (int i = getFFrames().size() - 1; i >= 0; i--) {
|
| 1310 | 1310 |
IFFrame fframe = (IFFrame) getFFrames().get(i); |
| 1311 | 1311 |
|
| 1312 |
if (fframe.getSelected() != FFrame.NOSELECT) {
|
|
| 1312 |
if (fframe.getSelected() != IFFrame.NOSELECT) {
|
|
| 1313 | 1313 |
selecList.add(fframe); |
| 1314 | 1314 |
} |
| 1315 | 1315 |
} |
| trunk/applications/appgvSIG/src/com/iver/cit/gvsig/FFrameViewExtension.java | ||
|---|---|---|
| 41 | 41 |
package com.iver.cit.gvsig; |
| 42 | 42 |
|
| 43 | 43 |
import com.iver.andami.PluginServices; |
| 44 |
import com.iver.andami.messages.NotificationManager; |
|
| 44 | 45 |
import com.iver.andami.plugins.Extension; |
| 45 | 46 |
import com.iver.andami.ui.mdiManager.View; |
| 46 | 47 |
|
| ... | ... | |
| 82 | 83 |
try {
|
| 83 | 84 |
layout.viewFull(); |
| 84 | 85 |
} catch (DriverException e) {
|
| 85 |
//TODO Enviar a Andami |
|
| 86 |
e.printStackTrace(); |
|
| 86 |
NotificationManager.addError("Error de Driver", e);
|
|
| 87 | 87 |
} |
| 88 | 88 |
} else if (s.compareTo("VIEW_PAN") == 0) {
|
| 89 | 89 |
layout.setTool(Layout.VIEW_PAN); |
Also available in: Unified diff