Revision 11971 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/MapContext.java
MapContext.java | ||
---|---|---|
428 | 428 |
|
429 | 429 |
if (proj == null) { |
430 | 430 |
double w = ((viewPort.getImageSize().getWidth() / dpi) * 2.54); |
431 |
return (long) (viewPort.getAdjustedExtent().getWidth() / w * CHANGE[getViewPort() |
|
432 |
.getMapUnits()]); |
|
431 |
return (long) (viewPort.getAdjustedExtent().getWidth() / w * CHANGEM[getViewPort()
|
|
432 |
.getMapUnits()]/CHANGEM[getViewPort().getDistanceUnits()]);
|
|
433 | 433 |
} |
434 | 434 |
|
435 |
return Math.round(proj.getScale(viewPort.getAdjustedExtent().getMinX(),
|
|
436 |
viewPort.getAdjustedExtent().getMaxX(), viewPort.getImageSize()
|
|
435 |
return Math.round(proj.getScale((viewPort.getAdjustedExtent().getMinX()*CHANGEM[getViewPort().getMapUnits()])/CHANGEM[getViewPort().getDistanceUnits()],
|
|
436 |
(viewPort.getAdjustedExtent().getMaxX()*CHANGEM[getViewPort().getMapUnits()])/CHANGEM[getViewPort().getDistanceUnits()], viewPort.getImageSize()
|
|
437 | 437 |
.getWidth(), dpi)); |
438 |
|
|
438 | 439 |
} |
439 | 440 |
/** |
440 | 441 |
* Introduce un nuevo extent en la vista a partir de la escala que se pasa como par?metro. |
... | ... | |
452 | 453 |
if (viewPort.getAdjustedExtent() == null) { |
453 | 454 |
return; |
454 | 455 |
} |
455 |
Rectangle2D rec=proj.getExtent(viewPort.getExtent(),scale,viewPort.getImageWidth(),viewPort.getImageHeight(),CHANGE[getViewPort().getMapUnits()],dpi);
|
|
456 |
Rectangle2D rec=proj.getExtent(viewPort.getAdjustedExtent(),scale,viewPort.getImageWidth(),viewPort.getImageHeight(),CHANGE[getViewPort().getMapUnits()],CHANGEM[getViewPort().getDistanceUnits()],dpi);
|
|
456 | 457 |
getViewPort().setExtent(rec); |
457 | 458 |
} |
458 | 459 |
/** |
Also available in: Unified diff