Revision 1725
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/view/CanvasZone.java | ||
|---|---|---|
| 362 | 362 |
g.setColor(textColor); |
| 363 | 363 |
g.drawString("X: " + clipDecimals(realCoord.getX(), 3), 12, 18);
|
| 364 | 364 |
g.drawString("Y: " + clipDecimals(realCoord.getY(), 3), 12, 32);
|
| 365 |
//g.drawString("X': " + MathUtils.tailDecimals(viewCoord.getX(), 3), 12, 46);
|
|
| 366 |
//g.drawString("Y': " + MathUtils.tailDecimals(viewCoord.getY(), 3), 12, 60);
|
|
| 367 | 365 |
} |
| 368 | 366 |
|
| 369 | 367 |
public double clipDecimals(double num, int n) {
|
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/view/ViewPanelImpl.java | ||
|---|---|---|
| 235 | 235 |
LoggerFactory.getLogger(ViewPanelImpl.class).debug("Redimensi?n de las ventanas. La altura de estas es menor que cero", this, ex);
|
| 236 | 236 |
return r; |
| 237 | 237 |
} |
| 238 |
//if(zoomPixelControl.getCanvas().getMinxMaxyUL())
|
|
| 238 |
if(zoomPixelControl.getCanvas().getMinxMaxyUL()) |
|
| 239 | 239 |
r = new Rectangle2D.Double(x, y + h, w, h); |
| 240 |
//else
|
|
| 241 |
//r = new Rectangle2D.Double(x, y - h, w, h);
|
|
| 240 |
else |
|
| 241 |
r = new Rectangle2D.Double(x, y - h, w, h); |
|
| 242 | 242 |
Point2D p1 = zoomPixelControl.getCanvas().viewCoordsToWorld(new Point2D.Double(r.getX(), r.getY())); |
| 243 | 243 |
Point2D p2 = zoomPixelControl.getCanvas().viewCoordsToWorld(new Point2D.Double(r.getX() + r.getWidth(), r.getY() + r.getHeight())); |
| 244 | 244 |
return new Rectangle2D.Double( Math.min(p1.getX(), p2.getX()), |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/layer/GCPsGraphicLayer.java | ||
|---|---|---|
| 301 | 301 |
GPGraphic gp = ((GPGraphic)pointList.getGraphicPoint(i)); |
| 302 | 302 |
int pxLeft = 0, pxRight = 0, pyUp = 0, pyDown = 0; |
| 303 | 303 |
|
| 304 |
/*if(type == GPGraphic.PIXEL) {
|
|
| 305 |
pxLeft = (int)gp.getDrawCoordsForPixelViews().getX() - 4;
|
|
| 306 |
pxRight = (int)gp.getDrawCoordsForPixelViews().getX() + 4;
|
|
| 307 |
pyUp = (int)gp.getDrawCoordsForPixelViews().getY() - 4;
|
|
| 308 |
pyDown = (int)gp.getDrawCoordsForPixelViews().getY() + 4;
|
|
| 304 |
if(type == GPGraphic.PIXEL) {
|
|
| 305 |
pxLeft = (int)gp.getGeoPoint().getPixelPoint().getX() - 4;
|
|
| 306 |
pxRight = (int)gp.getGeoPoint().getPixelPoint().getX() + 4;
|
|
| 307 |
pyUp = (int)gp.getGeoPoint().getPixelPoint().getY() - 4;
|
|
| 308 |
pyDown = (int)gp.getGeoPoint().getPixelPoint().getY() + 4;
|
|
| 309 | 309 |
} |
| 310 | 310 |
|
| 311 | 311 |
if(type == GPGraphic.MAP) {
|
| 312 |
pxLeft = (int)gp.getDrawCoordsForMapViews().getX() - 4;
|
|
| 313 |
pxRight = (int)gp.getDrawCoordsForMapViews().getX() + 4;
|
|
| 314 |
pyUp = (int)gp.getDrawCoordsForMapViews().getY() - 4;
|
|
| 315 |
pyDown = (int)gp.getDrawCoordsForMapViews().getY() + 4;
|
|
| 316 |
}*/
|
|
| 312 |
pxLeft = (int)gp.getGeoPoint().getMapPoint().getX() - 4;
|
|
| 313 |
pxRight = (int)gp.getGeoPoint().getMapPoint().getX() + 4;
|
|
| 314 |
pyUp = (int)gp.getGeoPoint().getMapPoint().getY() - 4;
|
|
| 315 |
pyDown = (int)gp.getGeoPoint().getMapPoint().getY() + 4;
|
|
| 316 |
} |
|
| 317 | 317 |
|
| 318 | 318 |
if(e.getX() >= pxLeft && e.getX() <= pxRight && e.getY() >= pyUp && e.getY() <= pyDown) {
|
| 319 | 319 |
lastGP = operanteGP = gp; |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/option/GeorefOptionsDataModelImpl.java | ||
|---|---|---|
| 19 | 19 |
package org.gvsig.raster.georeferencing.swing.impl.option; |
| 20 | 20 |
|
| 21 | 21 |
import java.awt.Color; |
| 22 |
import java.awt.geom.Rectangle2D; |
|
| 22 | 23 |
|
| 23 | 24 |
import org.gvsig.fmap.dal.coverage.dataset.Buffer; |
| 25 |
import org.gvsig.fmap.dal.coverage.datastruct.Extent; |
|
| 24 | 26 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 25 | 27 |
import org.gvsig.raster.georeferencing.swing.GCPList; |
| 26 | 28 |
import org.gvsig.raster.georeferencing.swing.GeoreferencingOptionsDataModel; |
| ... | ... | |
| 292 | 294 |
public RasterDataStore getDataStore() {
|
| 293 | 295 |
return store; |
| 294 | 296 |
} |
| 297 |
|
|
| 298 |
public Rectangle2D getRasterExtent() {
|
|
| 299 |
Extent ex = store.getExtent(); |
|
| 300 |
return ex.toRectangle2D();//new Rectangle2D.Double(0, 0, ex.width(), ex.height()); |
|
| 301 |
} |
|
| 295 | 302 |
|
| 296 | 303 |
public String getSelectedView() {
|
| 297 | 304 |
return selectedView; |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.impl/src/main/java/org/gvsig/raster/georeferencing/swing/impl/option/GCPListImpl.java | ||
|---|---|---|
| 24 | 24 |
pList.clear(); |
| 25 | 25 |
for (int i = 0; i < geoPointList.size(); i++) {
|
| 26 | 26 |
GPGraphic graphicGCP = new GPGraphic(geoPointList.get(i)); |
| 27 |
graphicGCP.setId(id); |
|
| 27 |
graphicGCP.setId(id); |
|
| 28 |
geoPointList.get(i).setNumber(i); |
|
| 28 | 29 |
pList.add(graphicGCP); |
| 29 | 30 |
id += 1; |
| 30 | 31 |
} |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.swing/org.gvsig.raster.georeferencing.swing.api/src/main/java/org/gvsig/raster/georeferencing/swing/GeoreferencingOptionsDataModel.java | ||
|---|---|---|
| 22 | 22 |
package org.gvsig.raster.georeferencing.swing; |
| 23 | 23 |
|
| 24 | 24 |
import java.awt.Color; |
| 25 |
import java.awt.geom.Rectangle2D; |
|
| 25 | 26 |
|
| 26 | 27 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 27 | 28 |
|
| ... | ... | |
| 42 | 43 |
public RasterDataStore getDataStore(); |
| 43 | 44 |
|
| 44 | 45 |
/** |
| 46 |
* Gets the extent in pixel coordinates, that means (0, 0, width, height) |
|
| 47 |
* @return |
|
| 48 |
*/ |
|
| 49 |
public Rectangle2D getRasterExtent(); |
|
| 50 |
|
|
| 51 |
/** |
|
| 45 | 52 |
* Obtiene la vista seleccionada |
| 46 | 53 |
* @return |
| 47 | 54 |
*/ |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.framework/org.gvsig.raster.georeferencing.framework.andami/src/main/java/org/gvsig/raster/georeferencing/framework/andami/GeorefViewWindow.java | ||
|---|---|---|
| 79 | 79 |
* @see com.iver.andami.ui.mdiManager.IWindow#getWindowInfo() |
| 80 | 80 |
*/ |
| 81 | 81 |
public WindowInfo getWindowInfo() {
|
| 82 |
WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODELESSDIALOG | WindowInfo.RESIZABLE /*| WindowInfo.NOTCLOSABLE*/);
|
|
| 82 |
WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODELESSDIALOG | WindowInfo.RESIZABLE | WindowInfo.NOTCLOSABLE | WindowInfo.MAXIMIZABLE);
|
|
| 83 | 83 |
//if (getClippingPanel().getFLayer() != null) |
| 84 | 84 |
//m_viewinfo.setAdditionalInfo(getClippingPanel().getFLayer().getName()); |
| 85 | 85 |
m_viewinfo.setTitle(Messages.getText("view_panel"));
|
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/listener/ViewMapRequestManager.java | ||
|---|---|---|
| 56 | 56 |
|
| 57 | 57 |
public ViewMapRequestManager(GeoreferencingView view, MapControl mapControl) {
|
| 58 | 58 |
this.mapControl = mapControl; |
| 59 |
this.lyrs = mapControl.getMapContext().getLayers(); |
|
| 59 |
if(mapControl != null) |
|
| 60 |
this.lyrs = mapControl.getMapContext().getLayers(); |
|
| 60 | 61 |
this.view = view; |
| 61 | 62 |
} |
| 62 | 63 |
/** |
| ... | ... | |
| 134 | 135 |
* (non-Javadoc) |
| 135 | 136 |
* @see org.gvsig.rastertools.georeferencing.ui.zoom.IExtensionRequest#request(java.awt.geom.Rectangle2D) |
| 136 | 137 |
*/ |
| 137 |
public Rectangle2D request(Rectangle2D extent) throws InvalidRequestException {
|
|
| 138 |
if(extent == null) {
|
|
| 138 |
public Rectangle2D request(Rectangle2D req) throws InvalidRequestException {
|
|
| 139 |
if(view.getCanvasWidth() == 0 || view.getCanvasHeight() == 0) |
|
| 140 |
return req; |
|
| 141 |
|
|
| 142 |
if(req == null) {
|
|
| 139 | 143 |
Envelope e = lyrs.getFullEnvelope(); |
| 140 | 144 |
Rectangle2D r = new Rectangle2D.Double(e.getMinimum(0), e.getMinimum(1), e.getLength(0), e.getLength(1)); |
| 141 | 145 |
return r; |
| ... | ... | |
| 145 | 149 |
//Obtenemos el viewport y calculamos la matriz de transformaci?n |
| 146 | 150 |
ViewPort vp = new ViewPort(null); |
| 147 | 151 |
vp.setImageSize(new Dimension(view.getCanvasWidth(), view.getCanvasHeight())); |
| 148 |
Envelope e = GeometryLocator.getGeometryManager().createEnvelope(extent.getMinX(), extent.getMinY(), extent.getMaxX(), extent.getMaxY(), SUBTYPES.GEOM2D);
|
|
| 152 |
Envelope e = GeometryLocator.getGeometryManager().createEnvelope(req.getMinX(), req.getMinY(), req.getMaxX(), req.getMaxY(), SUBTYPES.GEOM2D);
|
|
| 149 | 153 |
vp.setEnvelope(e); |
| 150 | 154 |
vp.setProjection(mapControl.getMapContext().getProjection()); |
| 151 | 155 |
|
| ... | ... | |
| 171 | 175 |
mapContextDrawer.draw(lyrs, initImg, img, c, mapControl.getMapContext().getScaleView()); |
| 172 | 176 |
//lyrs.draw(initImg, img, vp, new CancellableClass(), mapControl.getMapContext().getScaleView()); |
| 173 | 177 |
|
| 174 |
setDrawParams(initImg, extent);
|
|
| 178 |
setDrawParams(initImg, req);
|
|
| 175 | 179 |
|
| 176 | 180 |
//if(graphicLayer != null) |
| 177 | 181 |
//graphicLayer.recalcMapDrawCoordinates(); |
| ... | ... | |
| 179 | 183 |
} catch (Exception ex) {
|
| 180 | 184 |
throw new InvalidRequestException("Error en al acceso al fichero", ex);
|
| 181 | 185 |
} |
| 182 |
return extent;
|
|
| 186 |
return req;
|
|
| 183 | 187 |
} |
| 184 | 188 |
|
| 185 | 189 |
/* |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/listener/ApplicationControlsListener.java | ||
|---|---|---|
| 138 | 138 |
optionsDialog.setXCellSize(getDataModel().getXCellSize()); |
| 139 | 139 |
optionsDialog.setYCellSize(getDataModel().getYCellSize()); |
| 140 | 140 |
fManager.showWindow(optionsDialog, 410, 440, Messages.getText("georeferencing"));
|
| 141 |
System.out.println("----Open");
|
|
| 142 | 141 |
} |
| 143 | 142 |
|
| 144 | 143 |
//------------------------------ |
| ... | ... | |
| 374 | 373 |
} |
| 375 | 374 |
tableWrapper.updateErrors(); |
| 376 | 375 |
} |
| 376 |
|
|
| 377 |
if(e.getEvent() == PagedTableEvent.EVENT_SELECTED_ROWS) {
|
|
| 378 |
if(getDataModel().isCenterView()) |
|
| 379 |
getSyncViews().centerToPoint(tableWrapper.getTable().getSelectedRows()[0]); |
|
| 380 |
} |
|
| 377 | 381 |
|
| 378 | 382 |
} finally {
|
| 379 | 383 |
Georeferencing.enableTableEvent = true; |
| ... | ... | |
| 427 | 431 |
// Bot?n de Cerrar y Aceptar en el cuadro de opciones |
| 428 | 432 |
if (e.getButton() == ButtonsPanel.BUTTON_CANCEL || e.getButton() == ButtonsPanel.BUTTON_ACCEPT) {
|
| 429 | 433 |
if(optionsDialog != null) {
|
| 430 |
System.out.println("---Close");
|
|
| 431 | 434 |
fManager.closeWindow(optionsDialog); |
| 432 | 435 |
} |
| 433 | 436 |
} |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/listener/ViewRasterRequestManager.java | ||
|---|---|---|
| 28 | 28 |
import java.awt.geom.Rectangle2D; |
| 29 | 29 |
import java.awt.image.BufferedImage; |
| 30 | 30 |
|
| 31 |
import org.gvsig.fmap.dal.coverage.datastruct.Extent; |
|
| 31 | 32 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 32 | 33 |
import org.gvsig.fmap.dal.exception.ReadException; |
| 33 | 34 |
import org.gvsig.fmap.geom.GeometryLocator; |
| ... | ... | |
| 51 | 52 |
public class ViewRasterRequestManager implements IViewRequestManager {
|
| 52 | 53 |
private GeometryManager geomManager = GeometryLocator.getGeometryManager(); |
| 53 | 54 |
private GeoreferencingView view = null; |
| 54 |
private RasterDataStore store = null; |
|
| 55 | 55 |
private Color backGroundColor = null; |
| 56 | 56 |
private FLyrRaster lyr = null; |
| 57 | 57 |
|
| ... | ... | |
| 60 | 60 |
* @param lyr |
| 61 | 61 |
*/ |
| 62 | 62 |
public ViewRasterRequestManager(GeoreferencingView view, RasterDataStore store) {
|
| 63 |
this.store = store; |
|
| 64 | 63 |
this.view = view; |
| 65 | 64 |
lyr = new DefaultFLyrRaster(); |
| 66 | 65 |
try {
|
| ... | ... | |
| 135 | 134 |
public void setBackGroundColor(Color backGroundColor) {
|
| 136 | 135 |
this.backGroundColor = backGroundColor; |
| 137 | 136 |
} |
| 137 |
|
|
| 138 |
public Rectangle2D getRasterExtent() {
|
|
| 139 |
Extent ex = lyr.getDataStore().getExtent(); |
|
| 140 |
return ex.toRectangle2D();//new Rectangle2D.Double(0, 0, ex.width(), ex.height()); |
|
| 141 |
} |
|
| 138 | 142 |
|
| 139 | 143 |
public void fullExtent() throws InvalidRequestException {
|
| 140 |
this.initRequest(store.getExtent().toRectangle2D());
|
|
| 144 |
this.initRequest(getRasterExtent());
|
|
| 141 | 145 |
} |
| 142 | 146 |
|
| 143 |
public Rectangle2D request(Rectangle2D extent) throws InvalidRequestException {
|
|
| 144 |
if(extent == null)
|
|
| 145 |
return store.getExtent().toRectangle2D();
|
|
| 147 |
public Rectangle2D request(Rectangle2D req) throws InvalidRequestException {
|
|
| 148 |
if(req == null || view.getCanvasWidth() == 0 || view.getCanvasHeight() == 0)
|
|
| 149 |
return getRasterExtent();
|
|
| 146 | 150 |
|
| 147 |
if(store.getExtent() == null) {
|
|
| 151 |
if(lyr.getDataStore().getExtent() == null) {
|
|
| 148 | 152 |
GeoreferencingSwingImplLibrary.messageBoxError("error_set_view", this, null);
|
| 149 | 153 |
return null; |
| 150 | 154 |
} |
| ... | ... | |
| 166 | 170 |
ViewPort vp = new ViewPort(); |
| 167 | 171 |
vp.setImageSize(new Dimension(view.getCanvasWidth(), view.getCanvasHeight())); |
| 168 | 172 |
Envelope env = geomManager.createEnvelope( |
| 169 |
extent.getMinX(),
|
|
| 170 |
extent.getMinY(),
|
|
| 171 |
extent.getMaxX(),
|
|
| 172 |
extent.getMaxY(),
|
|
| 173 |
req.getMinX(),
|
|
| 174 |
getRasterExtent().getHeight() - req.getMaxY(),
|
|
| 175 |
req.getMaxX(),
|
|
| 176 |
getRasterExtent().getHeight() - req.getMinY(),
|
|
| 173 | 177 |
SUBTYPES.GEOM2D); |
| 174 | 178 |
//Envelope env = geomManager.createEnvelope(ext.getMin().getX(), ext.getMin().getY(), ext.getMax().getX(), ext.getMax().getY(), SUBTYPES.GEOM2D); |
| 175 | 179 |
vp.setEnvelope(env); |
| ... | ... | |
| 183 | 187 |
} |
| 184 | 188 |
lyr.draw(initImg, g2d, vp, null, 1); |
| 185 | 189 |
|
| 186 |
setDrawParams(initImg, extent);
|
|
| 190 |
setDrawParams(initImg, req);
|
|
| 187 | 191 |
|
| 188 | 192 |
//if(graphicLayer != null) |
| 189 | 193 |
//graphicLayer.recalcPixelDrawCoordinates(); |
| ... | ... | |
| 193 | 197 |
} catch (CreateEnvelopeException e) {
|
| 194 | 198 |
throw new InvalidRequestException("Error asignando el ?rea de la petici?n", e);
|
| 195 | 199 |
} |
| 196 |
return extent;
|
|
| 200 |
return req;
|
|
| 197 | 201 |
} |
| 198 | 202 |
|
| 199 | 203 |
public void setGCPsGraphicLayer(IGraphicLayer gl) {
|
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/listener/ViewDialogListener.java | ||
|---|---|---|
| 73 | 73 |
public void zoomViewChanged(ViewEvent ev) {
|
| 74 | 74 |
Rectangle2D ext = null; |
| 75 | 75 |
try {
|
| 76 |
if(app.getViewRaster() != null && app.getZoomRaster() != null && app.getZoomRasterRequestManager() != null) {
|
|
| 76 |
if(app.getZoomRasterRequestManager() != null) {
|
|
| 77 | 77 |
ext = app.getViewRaster().getCursorAdjustedWorldCoordinates(app.getZoomRaster().getCanvasWidth(), app.getZoomRaster().getCanvasHeight()); |
| 78 | 78 |
app.getZoomRasterRequestManager().request(ext); |
| 79 | 79 |
} |
| 80 |
if(app.getViewMap() != null && app.getZoomMap() != null && app.getZoomMapRequestManager() != null) {
|
|
| 80 |
if(app.getDataModel().getType() == Georeferencing.WITH_MAP && app.getZoomMapRequestManager() != null) {
|
|
| 81 | 81 |
ext = app.getViewMap().getCursorAdjustedWorldCoordinates(app.getZoomMap().getCanvasWidth(), app.getZoomMap().getCanvasHeight()); |
| 82 | 82 |
app.getZoomMapRequestManager().request(ext); |
| 83 | 83 |
} |
| ... | ... | |
| 239 | 239 |
//------------------ |
| 240 | 240 |
//Selecci?n de punto |
| 241 | 241 |
if(ev.getSource() instanceof SelectPointTool) {
|
| 242 |
if(app.getViewMap() != null) {
|
|
| 242 |
if(app.getDataModel().getType() == Georeferencing.WITH_MAP) {
|
|
| 243 | 243 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
| 244 | 244 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false); |
| 245 | 245 |
app.getViewMap().setSelectZoomAreaButtonSelected(false); |
| 246 | 246 |
app.getViewMap().setMoveButtonSelected(false); |
| 247 | 247 |
} |
| 248 |
if(app.getViewRaster() != null) {
|
|
| 249 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
|
| 250 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false); |
|
| 251 |
app.getViewRaster().setSelectZoomAreaButtonSelected(false); |
|
| 252 |
app.getViewRaster().setMoveButtonSelected(false); |
|
| 253 |
} |
|
| 248 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
|
| 249 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false); |
|
| 250 |
app.getViewRaster().setSelectZoomAreaButtonSelected(false); |
|
| 251 |
app.getViewRaster().setMoveButtonSelected(false); |
|
| 254 | 252 |
} |
| 255 | 253 |
|
| 256 | 254 |
//------------------------- |
| 257 | 255 |
//Selecci?n de zoom ventana |
| 258 | 256 |
if(ev.getSource() instanceof ZoomRectangleTool) {
|
| 259 |
if(app.getViewMap() != null) {
|
|
| 257 |
if(app.getDataModel().getType() == Georeferencing.WITH_MAP) {
|
|
| 260 | 258 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false); |
| 261 | 259 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false); |
| 262 | 260 |
app.getViewMap().setMoveButtonSelected(false); |
| 263 | 261 |
} |
| 264 |
if(app.getViewRaster() != null) {
|
|
| 265 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false);
|
|
| 266 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false);
|
|
| 267 |
app.getViewRaster().setMoveButtonSelected(false);
|
|
| 268 |
} |
|
| 262 |
|
|
| 263 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false); |
|
| 264 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.PAN_TOOL, false); |
|
| 265 |
app.getViewRaster().setMoveButtonSelected(false); |
|
| 266 |
|
|
| 269 | 267 |
app.getGeorefControlPanel().getToolSelectPointButton().setSelected(false); |
| 270 | 268 |
} |
| 271 | 269 |
|
| 272 | 270 |
//--------------------------- |
| 273 | 271 |
//Selecci?n de desplazamiento |
| 274 | 272 |
if(ev.getSource() instanceof PanTool) {
|
| 275 |
if(app.getViewMap() != null) {
|
|
| 273 |
if(app.getDataModel().getType() == Georeferencing.WITH_MAP) {
|
|
| 276 | 274 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false); |
| 277 | 275 |
app.getViewMap().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
| 278 | 276 |
app.getViewMap().setSelectZoomAreaButtonSelected(false); |
| 279 | 277 |
} |
| 280 |
if(app.getViewRaster() != null) {
|
|
| 281 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false); |
|
| 282 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
|
| 283 |
app.getViewRaster().setSelectZoomAreaButtonSelected(false); |
|
| 284 |
} |
|
| 278 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, false); |
|
| 279 |
app.getViewRaster().selectTool(GeoreferencingSwingLibrary.ZOOM_RECTANGLE_TOOL, false); |
|
| 280 |
app.getViewRaster().setSelectZoomAreaButtonSelected(false); |
|
| 281 |
|
|
| 285 | 282 |
app.getGeorefControlPanel().getToolSelectPointButton().setSelected(false); |
| 286 | 283 |
} |
| 287 | 284 |
} |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/listener/LauncherDialogListener.java | ||
|---|---|---|
| 78 | 78 |
if(storeToGeoref == null) |
| 79 | 79 |
RasterToolsUtil.messageBoxError("layer_not_loaded", this);
|
| 80 | 80 |
else {
|
| 81 |
storeToGeoref.setAffineTransform(new AffineTransform(1, 0, 0, -1, 0, 0)); |
|
| 81 |
storeToGeoref.setAffineTransform(new AffineTransform(1, 0, 0, -1, 0, 2340));
|
|
| 82 | 82 |
GeoreferencingFrameworkManager fManager = GeoreferencingFrameworkLocator.getManager(); |
| 83 | 83 |
fManager.closeWindow(launcherDialog.getComponent()); |
| 84 | 84 |
app.endLauncherDialog(dataModel); |
| org.gvsig.raster.georeferencing/trunk/org.gvsig.raster.georeferencing/org.gvsig.raster.georeferencing.app/org.gvsig.raster.georeferencing.app.georeferencingclient/src/main/java/org/gvsig/raster/georeferencing/app/georeferencingclient/Georeferencing.java | ||
|---|---|---|
| 34 | 34 |
import org.gvsig.app.project.documents.Document; |
| 35 | 35 |
import org.gvsig.app.project.documents.view.ViewDocument; |
| 36 | 36 |
import org.gvsig.app.project.documents.view.gui.IView; |
| 37 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
|
| 37 |
import org.gvsig.fmap.dal.coverage.datastruct.GeoPoint; |
|
| 38 |
import org.gvsig.fmap.dal.coverage.datastruct.GeoPointList; |
|
| 38 | 39 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 39 | 40 |
import org.gvsig.fmap.mapcontrol.MapControl; |
| 40 | 41 |
import org.gvsig.i18n.Messages; |
| ... | ... | |
| 54 | 55 |
import org.gvsig.raster.georeferencing.swing.control.GeorefControlPanel; |
| 55 | 56 |
import org.gvsig.raster.georeferencing.swing.exception.InvalidRequestException; |
| 56 | 57 |
import org.gvsig.raster.georeferencing.swing.impl.GeoreferencingSwingImplLibrary; |
| 58 |
import org.gvsig.raster.georeferencing.swing.impl.layer.GPGraphic; |
|
| 57 | 59 |
import org.gvsig.raster.georeferencing.swing.view.GeoreferencingView; |
| 58 | 60 |
import org.gvsig.raster.georeferencing.swing.view.IViewRequestManager; |
| 59 | 61 |
import org.gvsig.raster.georeferencing.swing.view.SynchronizedViews; |
| ... | ... | |
| 174 | 176 |
if(viewRaster == null) {
|
| 175 | 177 |
viewRaster = sManager.createView(true, false, true, listener); |
| 176 | 178 |
viewRasterRequestManager = new ViewRasterRequestManager(viewRaster, dataModel.getDataStore()); |
| 177 |
viewRaster.setMinxMaxyUL(true);
|
|
| 179 |
viewRaster.setMinxMaxyUL(false);
|
|
| 178 | 180 |
viewRaster.setViewListener(listener); |
| 179 | 181 |
viewRaster.setRequestListener(viewRasterRequestManager); |
| 180 | 182 |
viewRaster.setTool(GeoreferencingSwingLibrary.SELECT_POINT_TOOL, listener); |
| ... | ... | |
| 242 | 244 |
|
| 243 | 245 |
PagedTable pt = getTableWrapper().getTable(); |
| 244 | 246 |
|
| 245 |
getDataModel().getGCPList().buildNewList(getDataModel().getDataStore().getGeoPointList()); |
|
| 246 |
|
|
| 247 | 247 |
//Creamos el layout |
| 248 | 248 |
LayoutEnvironment layoutEnv = fManager.createLayoutEnvironment(); |
| 249 | 249 |
layoutEnv.setTable((JPanel)pt.getComponent()); |
| ... | ... | |
| 261 | 261 |
viewRaster.setCursorPosition(viewRaster.getCanvasWidth() / 2, viewRaster.getCanvasHeight() / 2); |
| 262 | 262 |
|
| 263 | 263 |
//Inicializamos la vista de raster |
| 264 |
viewRasterRequestManager.initRequest(dataModel.getDataStore().getExtent().toRectangle2D());
|
|
| 264 |
viewRasterRequestManager.initRequest(dataModel.getRasterExtent());
|
|
| 265 | 265 |
|
| 266 | 266 |
//Inicializamos el zoom de raster |
| 267 | 267 |
Rectangle2D ext = viewRaster.getCursorAdjustedWorldCoordinates(zoomRaster.getCanvasWidth(), zoomRaster.getCanvasHeight()); |
| 268 |
zoomRasterRequestManager.initRequest(dataModel.getDataStore().getExtent().toRectangle2D());
|
|
| 268 |
zoomRasterRequestManager.initRequest(dataModel.getRasterExtent());
|
|
| 269 | 269 |
zoomRasterRequestManager.request(ext); |
| 270 | 270 |
|
| 271 | 271 |
} catch (InvalidRequestException e1) {
|
| ... | ... | |
| 275 | 275 |
GeoreferencingSwingImplLibrary.messageBoxError("error_setview_preview", null, e1);
|
| 276 | 276 |
fManager.closeAllWindows(); |
| 277 | 277 |
} |
| 278 |
|
|
| 279 |
buildNewPointList(); |
|
| 278 | 280 |
} |
| 279 | 281 |
|
| 280 | 282 |
public TableWrapper getTableWrapper() {
|
| ... | ... | |
| 293 | 295 |
} |
| 294 | 296 |
} |
| 295 | 297 |
|
| 298 |
public void buildNewPointList() {
|
|
| 299 |
GeoPointList geoPointList = getDataModel().getDataStore().getGeoPointList(); |
|
| 300 |
long id = System.currentTimeMillis(); |
|
| 301 |
|
|
| 302 |
for (int i = 0; i < geoPointList.size(); i++) {
|
|
| 303 |
GeoPoint gp = geoPointList.get(i); |
|
| 304 |
gp.setNumber(i); |
|
| 305 |
|
|
| 306 |
GPGraphic graphicGCP = new GPGraphic(gp); |
|
| 307 |
graphicGCP.setId(id); |
|
| 308 |
getDataModel().getGCPList().add(graphicGCP); |
|
| 309 |
|
|
| 310 |
getTableWrapper().getTable().addRow(new Object[] {
|
|
| 311 |
true, |
|
| 312 |
gp.getNumber(), |
|
| 313 |
gp.getMapPoint().getX(), |
|
| 314 |
gp.getMapPoint().getY(), |
|
| 315 |
gp.getPixelPoint().getX(), |
|
| 316 |
gp.getPixelPoint().getY(), |
|
| 317 |
gp.getErrorX(), |
|
| 318 |
gp.getErrorY(), |
|
| 319 |
gp.getRms(), |
|
| 320 |
id}); |
|
| 321 |
|
|
| 322 |
id += 1; |
|
| 323 |
} |
|
| 324 |
|
|
| 325 |
getSyncViews().redrawPoints(); |
|
| 326 |
} |
|
| 327 |
|
|
| 296 | 328 |
/** |
| 297 | 329 |
* Colocaci?n inicial de las ventanas del espacio de trabajo. Carga la configuraci?n |
| 298 | 330 |
* de ventanas con cartograf?a de referencia. |
| 299 | 331 |
*/ |
| 300 | 332 |
private void initWindowsWithMap(GeoreferencingOptionsDataModel dataModel) {
|
| 301 |
RasterDataStore store = dataModel.getDataStore(); |
|
| 302 |
|
|
| 303 | 333 |
getDataModel().setType(WITH_MAP); |
| 304 | 334 |
|
| 305 | 335 |
viewRaster = getViewRaster(); |
| ... | ... | |
| 309 | 339 |
|
| 310 | 340 |
PagedTable pt = getTableWrapper().getTable(); |
| 311 | 341 |
|
| 312 |
getDataModel().getGCPList().buildNewList(getDataModel().getDataStore().getGeoPointList()); |
|
| 313 |
|
|
| 314 | 342 |
//Creamos el layout |
| 315 | 343 |
LayoutEnvironment layoutEnv = fManager.createLayoutEnvironment(); |
| 316 | 344 |
layoutEnv.setTable((JPanel)pt.getComponent()); |
| ... | ... | |
| 342 | 370 |
viewMapRequestManager.initRequest(r); |
| 343 | 371 |
|
| 344 | 372 |
//Inicializamos la vista de raster |
| 345 |
viewRasterRequestManager.initRequest(store.getExtent().toRectangle2D());
|
|
| 373 |
viewRasterRequestManager.initRequest(dataModel.getRasterExtent());
|
|
| 346 | 374 |
|
| 347 | 375 |
//Inicializamos el zoom de mapa |
| 348 | 376 |
Rectangle2D ext = viewMap.getCursorAdjustedWorldCoordinates(zoomMap.getCanvasWidth(), zoomMap.getCanvasHeight()); |
| ... | ... | |
| 350 | 378 |
|
| 351 | 379 |
//Inicializamos el zoom de raster |
| 352 | 380 |
ext = viewRaster.getCursorAdjustedWorldCoordinates(zoomRaster.getCanvasWidth(), zoomRaster.getCanvasHeight()); |
| 353 |
zoomRasterRequestManager.initRequest(store.getExtent().toRectangle2D());
|
|
| 381 |
zoomRasterRequestManager.initRequest(dataModel.getRasterExtent());
|
|
| 354 | 382 |
zoomRasterRequestManager.request(ext); |
| 355 | 383 |
|
| 356 | 384 |
processActions.setViewMapRequest(viewMapRequestManager); |
| ... | ... | |
| 361 | 389 |
GeoreferencingSwingImplLibrary.messageBoxError("error_setview_preview", this, e1);
|
| 362 | 390 |
fManager.closeAllWindows(); |
| 363 | 391 |
} |
| 392 |
|
|
| 393 |
buildNewPointList(); |
|
| 364 | 394 |
} |
| 365 | 395 |
|
| 366 | 396 |
public ViewRasterRequestManager getZoomRasterRequestManager() {
|
Also available in: Unified diff