Revision 27022
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/ProjectExtent.java | ||
|---|---|---|
| 44 | 44 |
|
| 45 | 45 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 46 | 46 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 47 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 47 | 48 |
|
| 48 | 49 |
import com.iver.utiles.XMLEntity; |
| 49 | 50 |
|
| ... | ... | |
| 72 | 73 |
* @return |
| 73 | 74 |
*/ |
| 74 | 75 |
public Envelope getExtent() {
|
| 75 |
return new DefaultEnvelope(2,new double[]{extent.getX(),extent.getY()},new double[]{extent.getMaxX(),extent.getMaxY()});
|
|
| 76 |
return UtilFunctions.createEnvelope(extent.getX(),extent.getY(),extent.getMaxX(),extent.getMaxY());
|
|
| 76 | 77 |
} |
| 77 | 78 |
|
| 78 | 79 |
/** |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/toc/actions/ZoomAlTemaTocMenuEntry.java | ||
|---|---|---|
| 3 | 3 |
import org.gvsig.fmap.dal.exception.ReadException; |
| 4 | 4 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 5 | 5 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 6 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 6 | 7 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| 7 | 8 |
|
| 8 | 9 |
import com.iver.andami.PluginServices; |
| ... | ... | |
| 162 | 163 |
if (minYVar <= minYRef) {
|
| 163 | 164 |
minYRef = minYVar; |
| 164 | 165 |
} |
| 165 |
extRef=new DefaultEnvelope(2,new double[]{minXRef, minYRef},new double[]{ maxXRef, maxYRef});
|
|
| 166 |
extRef = UtilFunctions.createEnvelope(minXRef, minYRef, maxXRef, maxYRef);
|
|
| 166 | 167 |
} |
| 167 | 168 |
} |
| 168 | 169 |
return extRef; |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/toolListeners/MapOverviewPanListener.java | ||
|---|---|---|
| 47 | 47 |
|
| 48 | 48 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 49 | 49 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 50 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 50 | 51 |
import org.gvsig.fmap.mapcontext.ViewPort; |
| 51 | 52 |
import org.gvsig.fmap.mapcontrol.MapControl; |
| 52 | 53 |
import org.gvsig.fmap.mapcontrol.tools.BehaviorException; |
| ... | ... | |
| 188 | 189 |
// teniendo en cuenta que estas sera el |
| 189 | 190 |
// centro del recuadro |
| 190 | 191 |
|
| 191 |
Envelope envelope = new DefaultEnvelope(
|
|
| 192 |
Envelope envelope = UtilFunctions.createEnvelope(
|
|
| 192 | 193 |
thePoint.getX() - diffx, |
| 193 | 194 |
thePoint.getY() - diffy, |
| 194 | 195 |
thePoint.getX() + diffx, |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/toolListeners/MapOverviewListener.java | ||
|---|---|---|
| 46 | 46 |
import java.awt.geom.Rectangle2D; |
| 47 | 47 |
|
| 48 | 48 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 49 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 49 | 50 |
import org.gvsig.fmap.mapcontext.ViewPort; |
| 50 | 51 |
import org.gvsig.fmap.mapcontrol.tools.BehaviorException; |
| 51 | 52 |
import org.gvsig.fmap.mapcontrol.tools.Events.PointEvent; |
| ... | ... | |
| 112 | 113 |
|
| 113 | 114 |
if (event.getEvent().getButton()!=MouseEvent.BUTTON1) {
|
| 114 | 115 |
(this.mapControl).getAssociatedMapContext() |
| 115 |
.getViewPort().setEnvelope(new DefaultEnvelope(2,new double[]{r.getX(),r.getY()},new double[]{r.getMaxX(),r.getMaxY()}));
|
|
| 116 |
.getViewPort().setEnvelope(UtilFunctions.createEnvelope(r.getX(),r.getY(),r.getMaxX(),r.getMaxY()));
|
|
| 116 | 117 |
PluginServices.getMainFrame().enableControls(); |
| 117 | 118 |
} |
| 118 | 119 |
} |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/toolListeners/MapOverviewChangeZoomListener.java | ||
|---|---|---|
| 11 | 11 |
|
| 12 | 12 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 13 | 13 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 14 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 14 | 15 |
import org.gvsig.fmap.mapcontext.ViewPort; |
| 15 | 16 |
import org.gvsig.fmap.mapcontrol.MapControl; |
| 16 | 17 |
import org.gvsig.fmap.mapcontrol.tools.BehaviorException; |
| ... | ... | |
| 136 | 137 |
// Rectangle2D realRectangle = new Rectangle2D.Double(); |
| 137 | 138 |
Point2D p1=vp.toMapPoint(event.getFrom()); |
| 138 | 139 |
Point2D p2=vp.toMapPoint(event.getTo()); |
| 139 |
Envelope realRectangle=new DefaultEnvelope(2,new double[]{p1.getX(),p1.getY()},new double[]{p2.getX(),p2.getY()});
|
|
| 140 |
Envelope realRectangle = UtilFunctions.createEnvelope(p1.getX(),p1.getY(),p2.getX(),p2.getY());
|
|
| 140 | 141 |
// realRectangle.setFrameFromDiagonal(vp.toMapPoint(event.getFrom()),vp.toMapPoint(event.getTo())); |
| 141 | 142 |
|
| 142 | 143 |
// Establecemos la forma |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameView.java | ||
|---|---|---|
| 62 | 62 |
import org.gvsig.fmap.geom.Geometry; |
| 63 | 63 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 64 | 64 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 65 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 65 | 66 |
import org.gvsig.fmap.mapcontext.MapContext; |
| 66 | 67 |
import org.gvsig.fmap.mapcontext.ViewPort; |
| 67 | 68 |
import org.gvsig.fmap.mapcontext.events.ColorEvent; |
| ... | ... | |
| 295 | 296 |
double wextent = (scale * wview) / 100.0; |
| 296 | 297 |
|
| 297 | 298 |
if (m_fmap.getViewPort().getExtent()==null) {
|
| 298 |
return new DefaultEnvelope(2,new double[]{0,0},new double[]{0,0});
|
|
| 299 |
return UtilFunctions.createEnvelope(0,0,0,0);
|
|
| 299 | 300 |
} |
| 300 | 301 |
double newx = m_fmap.getViewPort().getExtent().getCenterX() - |
| 301 | 302 |
(wextent / 2.0); |
| 302 | 303 |
double newy = m_fmap.getViewPort().getExtent().getCenterY() - |
| 303 | 304 |
(hextent / 2.0); |
| 304 | 305 |
IProjection proj=m_fmap.getViewPort().getProjection(); |
| 305 |
Envelope r = new DefaultEnvelope(2,new double[]{newx, newy},new double[]{newx+ wextent,newy+ hextent});
|
|
| 306 |
Envelope r = UtilFunctions.createEnvelope(newx, newy, newx+ wextent,newy+ hextent);
|
|
| 306 | 307 |
if (!proj.isProjected()){
|
| 307 | 308 |
Rectangle2D auxR=new Rectangle2D.Double(newx,newy,wextent,hextent); |
| 308 | 309 |
Rectangle2D aux = m_fmap.getViewPort().getProjection().getExtent(auxR,scale,wview,hview,1,100,2.54); |
| 309 |
r=new DefaultEnvelope(2,new double[]{aux.getX(),aux.getY()},new double[]{aux.getMaxX(),aux.getMaxY()});
|
|
| 310 |
r = UtilFunctions.createEnvelope(aux.getX(),aux.getY(), aux.getMaxX(),aux.getMaxY());
|
|
| 310 | 311 |
} |
| 311 | 312 |
return r; |
| 312 | 313 |
} |
| ... | ... | |
| 459 | 460 |
|
| 460 | 461 |
private Envelope calculateEnvelope() {
|
| 461 | 462 |
if (p1==null||p2==null) {
|
| 462 |
return new DefaultEnvelope(2,new double[]{0,0},new double[]{0,0});
|
|
| 463 |
return UtilFunctions.createEnvelope(0,0,0,0);
|
|
| 463 | 464 |
} |
| 464 |
Envelope r=new DefaultEnvelope(2,new double[]{p1.getX(),p1.getY()},new double[]{p2.getX(),p2.getY()});
|
|
| 465 |
Envelope r = UtilFunctions.createEnvelope(p1.getX(),p1.getY(),p2.getX(),p2.getY());
|
|
| 465 | 466 |
return r; |
| 466 | 467 |
} |
| 467 | 468 |
|
| ... | ... | |
| 814 | 815 |
double y=xml.getDoubleProperty("extentY");
|
| 815 | 816 |
double w=xml.getDoubleProperty("extentW");
|
| 816 | 817 |
double h=xml.getDoubleProperty("extentH");
|
| 817 |
this.getMapContext().getViewPort().setEnvelope(new DefaultEnvelope(2, |
|
| 818 |
new double[]{x,y},
|
|
| 819 |
new double[]{x+w,y+h}));
|
|
| 818 |
this.getMapContext().getViewPort().setEnvelope(UtilFunctions.createEnvelope(x,y,x+w,y+h)); |
|
| 820 | 819 |
} else if (!m_bLinked) {
|
| 821 | 820 |
this.m_fmap = MapContext.createFromXML(xml.getChild(0)); |
| 822 | 821 |
} |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/FLayoutZooms.java | ||
|---|---|---|
| 52 | 52 |
import java.util.prefs.Preferences; |
| 53 | 53 |
|
| 54 | 54 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 55 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 55 | 56 |
import org.gvsig.fmap.mapcontext.MapContext; |
| 56 | 57 |
|
| 57 | 58 |
import com.iver.cit.gvsig.project.documents.layout.fframes.IFFrame; |
| ... | ... | |
| 385 | 386 |
layout.updateFFrames(); |
| 386 | 387 |
layout.setIsReSel(true); |
| 387 | 388 |
}else {*/
|
| 388 |
fframe.setNewEnvelope(new DefaultEnvelope(2,new double[]{r.getX(),r.getY()},new double[]{r.getMaxX(),r.getMaxY()}));
|
|
| 389 |
fframe.setNewEnvelope(UtilFunctions.createEnvelope(r.getX(),r.getY(),r.getMaxX(),r.getMaxY()));
|
|
| 389 | 390 |
fframe.refresh(); |
| 390 | 391 |
///} |
| 391 | 392 |
// Fin del else |
| ... | ... | |
| 430 | 431 |
double y = nuevoY; |
| 431 | 432 |
double width = extent.getWidth() * factor; |
| 432 | 433 |
double height = extent.getHeight() * factor; |
| 433 |
fframe.setNewEnvelope(new DefaultEnvelope(2,new double[]{x,y},new double[]{x+width,y+height}));
|
|
| 434 |
fframe.setNewEnvelope(UtilFunctions.createEnvelope(x,y,x+width,y+height));
|
|
| 434 | 435 |
fframe.refresh(); |
| 435 | 436 |
} |
| 436 | 437 |
} |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/FLayoutFunctions.java | ||
|---|---|---|
| 52 | 52 |
import java.awt.geom.Rectangle2D; |
| 53 | 53 |
|
| 54 | 54 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 55 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 55 | 56 |
|
| 56 | 57 |
import com.iver.cit.gvsig.project.documents.layout.commands.FrameCommandsRecord; |
| 57 | 58 |
import com.iver.cit.gvsig.project.documents.layout.fframes.FFrameGroup; |
| ... | ... | |
| 278 | 279 |
double y = extent.getY() - (mp2.getY() - mp1.getY()); |
| 279 | 280 |
double width = extent.getWidth(); |
| 280 | 281 |
double height = extent.getHeight(); |
| 281 |
fframe.getMapContext().getViewPort().setEnvelope(new DefaultEnvelope(2,new double[]{x,y},new double[]{x+width,y+height}));
|
|
| 282 |
fframe.getMapContext().getViewPort().setEnvelope(UtilFunctions.createEnvelope(x,y,x+width,y+height));
|
|
| 282 | 283 |
fframe.refresh(); |
| 283 | 284 |
} |
| 284 | 285 |
} |
| branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/tools/behavior/LayoutRectangleBehavior.java | ||
|---|---|---|
| 53 | 53 |
|
| 54 | 54 |
import org.gvsig.fmap.geom.primitive.DefaultEnvelope; |
| 55 | 55 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 56 |
import org.gvsig.fmap.geom.util.UtilFunctions; |
|
| 56 | 57 |
import org.gvsig.fmap.mapcontrol.tools.BehaviorException; |
| 57 | 58 |
import org.gvsig.fmap.mapcontrol.tools.Events.EnvelopeEvent; |
| 58 | 59 |
|
| ... | ... | |
| 145 | 146 |
// Fijamos el nuevo extent |
| 146 | 147 |
// Rectangle2D.Double r = new Rectangle2D.Double(); |
| 147 | 148 |
// r.setFrameFromDiagonal(p1, p2); |
| 148 |
Envelope r= new DefaultEnvelope(p1.getX(),p1.getY(),p2.getX(),p2.getY());
|
|
| 149 |
Envelope r= UtilFunctions.createEnvelope(p1.getX(),p1.getY(),p2.getX(),p2.getY());
|
|
| 149 | 150 |
Rectangle2D rectPixel = new Rectangle(); |
| 150 | 151 |
rectPixel.setFrameFromDiagonal(getLayoutControl().getFirstPoint(), pScreen); |
| 151 | 152 |
|
Also available in: Unified diff