Revision 18321 trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/georeferencing/Georeferencing.java
Georeferencing.java | ||
---|---|---|
18 | 18 |
*/ |
19 | 19 |
package org.gvsig.rastertools.georeferencing; |
20 | 20 |
|
21 |
import java.awt.geom.AffineTransform; |
|
21 | 22 |
import java.awt.geom.Point2D; |
22 | 23 |
import java.awt.geom.Rectangle2D; |
23 | 24 |
import java.util.ArrayList; |
... | ... | |
152 | 153 |
//Inicializamos el zoom de raster |
153 | 154 |
Rectangle2D ext = viewRaster.getCursorAdjustedWorldCoordinates(zoomPixel.getCanvasWidth(), zoomPixel.getCanvasHeight()); |
154 | 155 |
zoomRasterRequestManager.initRequest(lyrToGeoref.getFullExtent()); |
155 |
zoomRasterRequestManager.request(new Rectangle2D.Double(ext.getX(), |
|
156 |
zoomRasterRequestManager.request(ext); |
|
157 |
/*zoomRasterRequestManager.request(new Rectangle2D.Double(ext.getX(), |
|
156 | 158 |
viewRaster.getViewExtent().getMaxY() - (viewRaster.getViewExtent().getMinY() - ext.getY()), |
157 | 159 |
ext.getWidth(), |
158 |
ext.getHeight())); |
|
160 |
ext.getHeight()));*/
|
|
159 | 161 |
|
160 | 162 |
} catch (InvalidRequestException e1) { |
161 | 163 |
RasterToolsUtil.messageBoxError("error_setview_preview", this); |
... | ... | |
210 | 212 |
|
211 | 213 |
//Inicializaci?n de la ventana con la vista raster |
212 | 214 |
viewRaster = new ViewDialog(wViews, 0, wViews, hViews, this); |
215 |
//viewRaster.setMinxMaxyUL(false); |
|
213 | 216 |
viewRaster.setShowInfo(true); |
214 | 217 |
viewRasterRequestManager = new ViewRasterRequestManager(viewRaster, lyrToGeoref); |
215 | 218 |
viewRaster.setExtensionRequest(viewRasterRequestManager); |
216 | 219 |
|
217 | 220 |
//Inicializaci?n de la ventana del zoom de la vista raster |
218 | 221 |
zoomPixel = new ZoomRasterDialog(smallWindowsWidth + tableWidth, posYViews, smallWindowsWidth, smallWindowsHeight); |
222 |
zoomPixel.setMinxMaxyUL(false); |
|
219 | 223 |
zoomRasterRequestManager = new ViewRasterRequestManager(zoomPixel, lyrToGeoref); |
220 | 224 |
zoomPixel.setExtensionRequest(zoomRasterRequestManager); |
221 | 225 |
|
... | ... | |
242 | 246 |
|
243 | 247 |
//Inicializamos el zoom de mapa |
244 | 248 |
Rectangle2D ext = viewMap.getCursorAdjustedWorldCoordinates(zoomMap.getCanvasWidth(), zoomMap.getCanvasHeight()); |
245 |
zoomMapRequestManager.initRequest(mapControl.getMapContext().getFullExtent()); |
|
246 |
zoomMapRequestManager.request(new Rectangle2D.Double(ext.getX(), |
|
247 |
viewMap.getViewExtent().getMaxY() - (viewMap.getViewExtent().getMinY() - ext.getY()), |
|
248 |
ext.getWidth(), |
|
249 |
ext.getHeight())); |
|
250 |
|
|
249 |
zoomMapRequestManager.initRequest(ext); |
|
250 |
|
|
251 | 251 |
//Inicializamos el zoom de raster |
252 | 252 |
ext = viewRaster.getCursorAdjustedWorldCoordinates(zoomPixel.getCanvasWidth(), zoomPixel.getCanvasHeight()); |
253 | 253 |
zoomRasterRequestManager.initRequest(lyrToGeoref.getFullExtent()); |
254 |
zoomRasterRequestManager.request(new Rectangle2D.Double(ext.getX(), |
|
255 |
viewRaster.getViewExtent().getMaxY() - (viewRaster.getViewExtent().getMinY() - ext.getY()), |
|
256 |
ext.getWidth(), |
|
257 |
ext.getHeight())); |
|
258 |
|
|
254 |
zoomRasterRequestManager.request(ext); |
|
255 |
|
|
259 | 256 |
createGCPLayer(viewRaster); |
260 | 257 |
|
261 | 258 |
} catch (InvalidRequestException e1) { |
... | ... | |
294 | 291 |
GPGraphic gpg1 = new GPGraphic(GPGraphic.PIXEL, gp1); |
295 | 292 |
GeoPoint gp2 = new GeoPoint(new Point2D.Double(150, 150), new Point2D.Double(646213, 4925620)); |
296 | 293 |
GPGraphic gpg2 = new GPGraphic(GPGraphic.PIXEL, gp2); |
297 |
viewRasterGCPs.addGeoPoint(gpg1); |
|
298 |
viewRasterGCPs.addGeoPoint(gpg2); |
|
294 |
viewRasterGCPs.addPixelGeoPoint(gpg1);
|
|
295 |
viewRasterGCPs.addPixelGeoPoint(gpg2);
|
|
299 | 296 |
} |
300 | 297 |
|
301 | 298 |
/** |
... | ... | |
321 | 318 |
if(initDialog != null) { |
322 | 319 |
selectedView = initDialog.getSelectedView(); |
323 | 320 |
lyrToGeoref = initDialog.getLayer(); |
321 |
//Inicializamos la matriz de transformaci?n en la imagen que vamos a georreferenciar para |
|
322 |
//que nos de coordenadas pixel |
|
323 |
//lyrToGeoref.setAffineTransform(new AffineTransform(1, 0, 0, -1, 0, 0)); |
|
324 | 324 |
if(lyrToGeoref == null) |
325 | 325 |
RasterToolsUtil.messageBoxError("layer_not_loaded", this); |
326 | 326 |
else { |
Also available in: Unified diff