Revision 1725 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
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