Revision 1717 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/synchronize/GCPSynchronizationImpl.java

View differences:

GCPSynchronizationImpl.java
34 34
import org.gvsig.raster.georeferencing.swing.impl.view.ZoomPanelImpl;
35 35
import org.gvsig.raster.georeferencing.swing.view.GeoreferencingView;
36 36
import org.gvsig.raster.georeferencing.swing.view.IGraphicLayer;
37
import org.gvsig.raster.georeferencing.swing.view.IViewRequestManager;
37 38
import org.gvsig.raster.georeferencing.swing.view.ToolListener;
38 39
import org.gvsig.raster.swing.pagedtable.PagedTable;
39 40

  
......
58 59
	private GCPsGraphicLayer              viewRasterGCPsZoom             = null;
59 60
	private GCPsGraphicLayer              viewMapGCPsZoom                = null;
60 61
	
62
	//Gestores de peticiones
63
	private IViewRequestManager           viewRasterRequestManager       = null;
64
	private IViewRequestManager           viewMapRequestManager          = null;
65
	private IViewRequestManager           zoomRasterRequestManager       = null;
66
	private IViewRequestManager           zoomMapRequestManager          = null;
67
	
61 68
	//Herramientas de selecci?n
62 69
	private SelectPointTool               viewRasterSelectPointTool      = null;
63 70
	private SelectPointTool               viewMapSelectPointTool         = null;
......
102 109
	}
103 110
	
104 111
	/**
112
	 * Asigna los gestores de peticiones.
113
	 * @param vRaster
114
	 * @param vMap
115
	 * @param zRaster
116
	 * @param zMap
117
	 */
118
	public void setRequestsManager(
119
			IViewRequestManager vRaster, 
120
			IViewRequestManager vMap, 
121
			IViewRequestManager zRaster, 
122
			IViewRequestManager zMap) {
123
		viewRasterRequestManager = vRaster;
124
		viewMapRequestManager= vMap;
125
		zoomRasterRequestManager = zRaster;
126
		zoomMapRequestManager = zMap;
127
	}
128
	
129
	/**
105 130
	 * Asigna las capas de puntos
106 131
	 * @param vRaster
107 132
	 * @param vMap
......
199 224
	public long addPoint(Point2D map, Point2D raster) {
200 225
		GeoPoint gp = RasterLocator.getManager().getDataStructFactory().createGeoPoint(raster, map);
201 226
		long id = System.currentTimeMillis();
202
		System.out.println(id);
227
		
203 228
		//Esperamos al menos 5 ms para que la carga de los puntos no sea
204 229
		//tan r?pida que coincida el id de dos puntos
205 230
		try {
......
356 381
	 * a los GeoPuntos
357 382
	 * @throws NotInitializeException
358 383
	 */
359
	public void calcPointsNumeration() throws NotInitializeException {
384
	public void calcPointsNumeration() {
360 385
		List<GPGraphic> pointList = getPointList();
361 386
		
362 387
		for (int i = 0; i < table.getRowCount(); i++) { 
......
381 406
			viewRasterGCPs = new GCPsGraphicLayer(GPGraphic.PIXEL, toolListener);
382 407
			viewRasterGCPs.setCanvas(viewRaster.getCanvas());
383 408
			viewRaster.addGraphicLayer(viewRasterGCPs);
384
			//viewRasterRequestManager.setGCPsGraphicLayer(viewRasterGCPs);
409
			viewRasterRequestManager.setGCPsGraphicLayer(viewRasterGCPs);
385 410
		}
386 411
		
387 412
		if(zoomRaster != null) {
388 413
			viewRasterGCPsZoom = new GCPsGraphicLayer(GPGraphic.PIXEL, toolListener);
389 414
			viewRasterGCPsZoom.setCanvas(zoomRaster.getCanvas());
390 415
			zoomRaster.addGraphicLayer(viewRasterGCPsZoom);
391
			//zoomRasterRequestManager.setGCPsGraphicLayer(viewRasterGCPsZoom);
416
			zoomRasterRequestManager.setGCPsGraphicLayer(viewRasterGCPsZoom);
392 417
		}
393 418
		
394 419
		if(viewMap != null) {
395 420
			viewMapGCPs = new GCPsGraphicLayer(GPGraphic.MAP, toolListener);
396 421
			viewMapGCPs.setCanvas(viewMap.getCanvas());
397 422
			viewMap.addGraphicLayer(viewMapGCPs);
398
			//viewMapRequestManager.setGCPsGraphicLayer(viewMapGCPs);
423
			viewMapRequestManager.setGCPsGraphicLayer(viewMapGCPs);
399 424
		}
400 425
		
401 426
		if(zoomMap != null) {
402 427
			viewMapGCPsZoom = new GCPsGraphicLayer(GPGraphic.MAP, toolListener);
403 428
			viewMapGCPsZoom.setCanvas(zoomMap.getCanvas());
404 429
			zoomMap.addGraphicLayer(viewMapGCPsZoom);
405
			//zoomMapRequestManager.setGCPsGraphicLayer(viewMapGCPsZoom);
430
			zoomMapRequestManager.setGCPsGraphicLayer(viewMapGCPsZoom);
406 431
		}
407 432
	}
408 433
	

Also available in: Unified diff