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

View differences:

ViewRasterRequestManager.java
115 115
	public void setDrawParams(BufferedImage img, Rectangle2D extBuf) {
116 116
		if(view != null) {
117 117
			if(img != null)
118
				view.setDrawParams(img, extBuf, extBuf.getWidth()/img.getWidth(), new Point2D.Double(extBuf.getCenterX(), extBuf.getCenterY()));
118
				view.setDrawParams(
119
						img, 
120
						extBuf, 
121
						extBuf.getWidth() / img.getWidth(), 
122
						new Point2D.Double(extBuf.getCenterX(), extBuf.getCenterY()));
119 123
			else
120
				view.setDrawParams(img, extBuf, extBuf.getWidth()/view.getCanvasWidth(), new Point2D.Double(extBuf.getCenterX(), extBuf.getCenterY()));
124
				view.setDrawParams(
125
						img, 
126
						extBuf, 
127
						extBuf.getWidth() / view.getCanvasWidth(), 
128
						new Point2D.Double(extBuf.getCenterX(), extBuf.getCenterY()));
121 129
		}
122 130
	}
123 131
	
......
145 153
	public void fullExtent() throws InvalidRequestException {
146 154
		this.initRequest(getRasterExtent());
147 155
	}
156
	
157
	public BufferedImage requestWithoutPrint(Rectangle2D req, Cancellable cancel)throws InvalidRequestException {
158
		return request(req, cancel, false);
159
	}
160
	
161
	public BufferedImage request(Rectangle2D req, Cancellable cancel) throws InvalidRequestException {
162
		return request(req, cancel, true);
163
	}
148 164

  
149
	public Rectangle2D request(Rectangle2D req, Cancellable cancel) throws InvalidRequestException {
165
	private BufferedImage request(Rectangle2D req, Cancellable cancel, boolean print) throws InvalidRequestException {
150 166
		if(req == null || view.getCanvasWidth() == 0 || view.getCanvasHeight() == 0)
151
			return getRasterExtent();
167
			return null;
152 168
		
153 169
		if(lyr.getDataStore().getExtent() == null) {
154 170
			GeoreferencingSwingImplLibrary.messageBoxError("error_set_view", this, null);
......
189 205
			}
190 206
			lyr.draw(initImg, g2d, vp, cancel, 1);
191 207
		
192
			if(cancel == null || (cancel != null && !cancel.isCanceled()))
208
			if(print && (cancel == null || (cancel != null && !cancel.isCanceled())))
193 209
				setDrawParams(initImg, req);
194 210
			
211
			return initImg;
212
			
195 213
			//if(graphicLayer != null)
196 214
				//graphicLayer.recalcPixelDrawCoordinates();
197 215
			
......
200 218
		} catch (CreateEnvelopeException e) {
201 219
			throw new InvalidRequestException("Error asignando el ?rea de la petici?n", e);
202 220
		}
203
		return req;
204 221
	}
205 222

  
206 223
	public void setGCPsGraphicLayer(IGraphicLayer gl) {

Also available in: Unified diff