/ - Diff - gvSIG raster - gvSIG

Revision 3200

     	 * @return true when a tile has been painted
     	 */
     	private void drawTile(Graphics2D g, ViewPort vp, SimpleTaskStatus taskStatus, double scale) throws LoadLayerException, ReadException {
     		// Compute the query geometry
     		// 1. Check if it is within borders
     		Envelope envelope = getFullEnvelope();
     		Envelope vpEnv = vp.getAdjustedExtent();
     		if (!vpEnv.intersects(envelope)) {
     		Envelope layerEnv = getFullEnvelope();
     		Envelope vpEnv = vp.getAdjustedEnvelope();
     		if (!vpEnv.intersects(layerEnv)) {
     			return;
+    		}
     		try {
     			Rectangle2D vpRect = getRectable2DFromEnvelope(vpEnv);
     			Rectangle2D layerRect = getRectable2DFromEnvelope(layerEnv);
     			// 2. Intersect layer and viewport extents to get the area of interest
     			Rectangle2D requestedRect = new Rectangle2D.Double();
     			Rectangle2D.intersect(layerRect, vpRect, requestedRect);
     		// 2. Compute extent to be requested.
     		Rectangle2D bBox = new Rectangle2D.Double();
     		Rectangle2D.intersect(getRectable2DFromEnvelope(vpEnv),
     				getRectable2DFromEnvelope(envelope), bBox);
     		// 3. Compute size in pixels
     		double scalex = vp.getAffineTransform().getScaleX();
     		double scaley = vp.getAffineTransform().getScaleY();
     		int wImg = (int) Math.ceil(Math.abs(bBox.getWidth() * scalex) + 1);
     		int hImg = (int) Math.ceil(Math.abs(bBox.getHeight() * scaley) + 1);
     		Dimension sz = new Dimension(wImg, hImg);
     		if ((wImg <= 0) || (hImg <= 0)) {
     			return;
+    		}
     		//try {
     			// 3. Compute image size in pixels from the requested Extent
     			double scalex = vp.getAffineTransform().getScaleX();
     			double scaley = vp.getAffineTransform().getScaleY();
     			int wImg = (int) Math.ceil(Math.abs(requestedRect.getWidth() * scalex));
     			int hImg = (int) Math.ceil(Math.abs(requestedRect.getHeight() * scaley));
     			if ((wImg <= 0) || (hImg <= 0)) {
     				return;
+    			}
     			Rectangle2D extent = new Rectangle2D.Double();
     			Rectangle2D.Double vpExtent = this.getRectable2DFromEnvelope(vpEnv);
     			Rectangle2D.intersect(vpExtent, bBox, extent);
     			// 4. compute exactly the requested extent (from the rounded image size)
     			// ensuring we are still within the layer extent
     			double worldWidth = Math.abs((double)wImg/scalex);
     			double worldHeigh = Math.abs((double)hImg/scaley);
     			double worldX;
     			if (requestedRect.getX()+worldWidth>layerEnv.getMaximum(0)) {
     				// we've got outside of layer extent due to rounding
     				worldX = layerEnv.getMaximum(0)-worldWidth;
+    			}
     			else {
     				worldX = requestedRect.getX();
+    			}
     			double worldY;
     			if (requestedRect.getY()+worldHeigh>layerEnv.getMaximum(1)) {  // FIXME: test with different CRSs
     				worldY = layerEnv.getMaximum(1)-worldHeigh;
+    			}
     			else {
     				worldY = requestedRect.getMinY();
+    			}
     			Extent ex = rManager.getDataStructFactory().createExtent(
     					vp.getAdjustedEnvelope().getMinimum(0),
     					vp.getAdjustedEnvelope().getMaximum(1),
     					vp.getAdjustedEnvelope().getMaximum(0),
     					vp.getAdjustedEnvelope().getMinimum(1));
     			ViewPortData vpData = rManager.getDataStructFactory().createViewPortData(vp.getProjection(), ex, sz );
     			vpData.setMat(vp.getAffineTransform());
     			vpData.setDPI((int)vp.getDPI());
     			requestedRect.setRect(worldX, worldY, worldWidth, worldHeigh);
     			Envelope requestedEnvelope = geomManager.createEnvelope(requestedRect.getMinX(),
     					requestedRect.getMinY(),
     					requestedRect.getMaxX(),
     					requestedRect.getMaxY(),
     					SUBTYPES.GEOM2D);
     			Extent requestedExtent = rManager.getDataStructFactory().createExtent(
     					requestedEnvelope.getMinimum(0),
     					requestedEnvelope.getMaximum(1),
     					requestedEnvelope.getMaximum(0),
     					requestedEnvelope.getMinimum(1));
     			try {
     				getParameters().setExtent(bBox);
     				if(getParameters().isSizeFixed()) {
     					getParameters().setWidth((int)getParameters().getFixedSize().getWidth());
     					getParameters().setHeight((int)getParameters().getFixedSize().getHeight());
     				} else {
     					getParameters().setWidth(wImg);
     					getParameters().setHeight(hImg);
+    				}
     				if(getDataStore().getParameters() instanceof WMSDataParameters) {
     					getRender().draw(g, vpData, taskStatus);
     				} else {
     					Envelope adjustedExtent = vp.getAdjustedExtent();
     					Extent e = rManager.getDataStructFactory().createExtent(adjustedExtent.getLowerCorner().getX(),
     							adjustedExtent.getUpperCorner().getY(), adjustedExtent.getUpperCorner().getX(),
     							adjustedExtent.getLowerCorner().getY());
     					ViewPortData vp2 = rManager.getDataStructFactory().createViewPortData(vp.getProjection(), e, vp.getImageSize() );
     					vp2.setMat(vp.getAffineTransform());
     					vp2.setDPI((int)vp.getDPI());
     					getParameters().setExtent(ex.toRectangle2D());
     					getRender().drawTiledService(g, vp2, vp.getImageSize(), taskStatus);
+    				}
     				//this.updateDrawVersion();
     			// 5. compute the new AffineTransform (ViewPort class can do it for us
     			// if we provide the image size, extent and offset)
     			ViewPort auxVp = (ViewPort) vp.clone();
     			Dimension sz = new Dimension(wImg, hImg);
     			auxVp.setImageSize(sz);
     			auxVp.setEnvelope(requestedEnvelope);
     			} catch (ProcessInterruptedException e) {
     			} catch (QueryException e) {
     				setAvailable(false);
     				JOptionPane.showMessageDialog(null, "Problems drawing this layer:" + e.getMessage(), Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
     				logger.info("Problems drawing this layer:" + e.getMessage(), e);
     			} finally {
     				taskStatus.terminate();
     			// 6. compute tile offeset. It is the sum of the original viewport offset
     			// plus the offset introduced by intersecting layer and viewport extents
     			double offsetX = vp.getOffset().getX();
     			if (requestedEnvelope.getMinimum(0)-vpEnv.getMinimum(0)>0) {
     				offsetX = offsetX + (requestedEnvelope.getMinimum(0)-vpEnv.getMinimum(0))*auxVp.getAffineTransform().getScaleX();
+    			}
     			double offsetY = vp.getOffset().getY(); // FIXME: test with different CRSs
     			if (requestedEnvelope.getMaximum(1)-vpEnv.getMaximum(1)<0) {
     				offsetY = offsetY + (requestedEnvelope.getMaximum(1)-vpEnv.getMaximum(1))*auxVp.getAffineTransform().getScaleY();
+    			}
     		/*} catch (RemoteServiceException e) {
     			if (!taskStatus.isCancellationRequested()) {
     				if (callCount < MAX_RETRY_TIMES) {
     					logger.warn("\n[ FLyrWMS.drawFixedSize() ]  Failed in trying " + callCount + "/" + MAX_RETRY_TIMES + ")\n"); // mess code
     					drawTile(g, vp, taskStatus, scale);
     				} else {
     					if (!isPrinting) {
     						this.setVisible(false);
+    					}
     					logger.error("Server error:" + e.getMessage(), e);
+    				}
     			// 7. Compute again the AffineTransform considering also the offset
     			auxVp.setOffset(new Point2D.Double(offsetX, offsetY));
     			auxVp.refreshExtent(); // necessary after updating the offset
     			ViewPortData vpData = rManager.getDataStructFactory().createViewPortData(auxVp.getProjection(), requestedExtent, sz);
     			vpData.setMat(auxVp.getAffineTransform());
     			vpData.setDPI((int)auxVp.getDPI());
     			getParameters().setExtent(requestedRect);
     			if(getParameters().isSizeFixed()) {
     				getParameters().setWidth((int)getParameters().getFixedSize().getWidth());
     				getParameters().setHeight((int)getParameters().getFixedSize().getHeight());
     			} else {
     				getParameters().setWidth(wImg);
     				getParameters().setHeight(hImg);
+    			}
     		}*/
     		return;
     			if(getDataStore().getParameters() instanceof WMSDataParameters) {
     				getRender().draw(g, vpData, taskStatus);
     			} else {
     				Extent vpExtent = rManager.getDataStructFactory().createExtent(
     						vpEnv.getMinimum(0),
     						vpEnv.getMaximum(1),
     						vpEnv.getMaximum(0),
     						vpEnv.getMinimum(1));
     				ViewPortData vp2 = rManager.getDataStructFactory().createViewPortData(vp.getProjection(), vpExtent, vp.getImageSize() );
     				vp2.setMat(vp.getAffineTransform());
     				vp2.setDPI((int)vp.getDPI());
     				getParameters().setExtent(vpExtent.toRectangle2D());
     				getRender().drawTiledService(g, vp2, vp.getImageSize(), taskStatus);
+    			}
     		} catch (ProcessInterruptedException e) {
     		} catch (CloneNotSupportedException e) {
     			drawingError(e);
+    		}
     		catch (QueryException e) {
     			drawingError(e);
     		} catch (CreateEnvelopeException e) {
     			drawingError(e);
     		} finally {
     			taskStatus.terminate();
+    		}
+    	}
     	private void drawingError(Exception e) {
     		setAvailable(false);
     		JOptionPane.showMessageDialog(null, "Problems drawing this layer:" + e.getMessage(), Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
     		logger.info("Problems drawing this layer:" + e.getMessage(), e);
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#print(java.awt.Graphics2D,
-...
+    	}
     	private void splitRequestCalculation(int width, int height) {
     		mustSplitRequest = (!getDataStore().isTiled() && (width > 1023 || height > 1023));
     		mustSplitRequest = (!getDataStore().isTiled() && (width > maxTileDrawWidth || height > maxTileDrawHeight));
+    	}
     	public ComposedLayer newComposedLayer() {

     import org.gvsig.fmap.dal.coverage.exception.QueryException;
     import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
     import org.gvsig.fmap.dal.coverage.exception.RemoteServiceException;
     import org.gvsig.fmap.dal.coverage.exception.RmfSerializerException;
     import org.gvsig.fmap.dal.coverage.store.RasterQuery;
     import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation;
     import org.gvsig.fmap.dal.coverage.store.props.HistogramComputer;
-...
     	//Only for fixed size. Complete extent and FIXED_SIZE in long side
     	private File                        fileLayerPixelSize       = null;
     	private File                        lastRequest              = null;
     	private AbstractRasterProvider       lastRequestProvider      = null;
     	private AbstractRasterProvider       lastRequestProvider      = null;
     	public static void register() {
     		DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager();
-...
     	public AffineTransform getAffineTransform() {
     		WMSDataParameters p = (WMSDataParameters)parameters;
     		Extent e = getExtent();
     		if(p.isSizeFixed()) {
     			Extent e = getExtent(); // FIXME: it should also be taken from parameters instead of from the full layer extent
     			double psX = e.width() / (p.getWidth() - 1);
     			double psY = -(e.height() / (p.getHeight() - 1));
     			ownTransformation = new AffineTransform(
-...
     					e.getULX() - (psX / 2),
     					e.getULY() - (psY / 2));
     		} else {
     			double psX = e.width() / (lastWidthRequest <= 0 ? p.getWidth() : lastWidthRequest);
     			double psY = -(e.height() / (lastHeightRequest <= 0 ? p.getHeight() : lastHeightRequest));
     			Rectangle2D bbox = p.getExtent();
     			double psX = bbox.getWidth() / p.getWidth();
     			double psY = -(bbox.getHeight() / p.getHeight());
     			ownTransformation = new AffineTransform(
     					psX,
 ,
 ,
     					psY,
     					e.getULX() - (psX / 2),
     					e.getULY() - (psY / 2));
     			/*ownTransformation = new AffineTransform(
     					p.getExtent().getWidth() / (lastWidthRequest <= 0 ? p.getWidth() : lastWidthRequest) ,
 ,
 ,
     					-(p.getExtent().getHeight() / (lastHeightRequest <= 0 ? p.getHeight() : lastHeightRequest)),
     					p.getExtent().getMinX(),
     					p.getExtent().getMinY());*/
     					psY,
     					bbox.getX(),
     					(bbox.getY()+bbox.getHeight())); // FIXME: check for other CRSs such as 4326
+    		}
     		externalTransformation = (AffineTransform) ownTransformation.clone();
     		return ownTransformation;
-...
     	public double getWidth() {
     		WMSDataParameters p = (WMSDataParameters)parameters;
     		if(p.isSizeFixed()) {
     			return p.getWidth();
+    		}
     		if (lastWidthRequest <= 0)
     			return p.getWidth();
     		if (lastWidthRequest < minTilePrintWidth)
     			return minTilePrintWidth;
     		return lastWidthRequest;
     		return p.getWidth();
+    	}
     	public double getHeight() {
     		WMSDataParameters p = (WMSDataParameters)parameters;
     		if(p.isSizeFixed()) {
     			return p.getHeight();
+    		}
     		if (lastHeightRequest <= 0)
     			return p.getHeight();
     		if (lastHeightRequest < minTilePrintHeight)
     			return minTilePrintHeight;
     		return lastHeightRequest;
     		return p.getHeight();
+    	}
     	/**

     	public Dimension getFixedSize();
     	/**
     	 * Sets the bounding box of the request
     	 */
     	public void setExtent(Rectangle2D bBox);
     	/**
     	 * Gets the bounding box of the request
     	 * @return
     	 */
     	public Rectangle2D getExtent();
     	public void setCancellable(ICancellable cancel);

Also available in: Unified diff

Application: gvSIG desktop » gvSIG raster

Revision 3200