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/listener/ViewDialogListener.java

View differences:

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
  
    
	}


  		












Also available in:  Unified diff