Revision 1054 org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSProvider.java

View differences:

WCSProvider.java
77 77
import org.gvsig.raster.wcs.io.downloader.WCSTileServer;
78 78
import org.gvsig.remoteclient.wcs.WCSStatus;
79 79
import org.gvsig.tools.ToolsLocator;
80
import org.gvsig.tools.task.TaskStatus;
80 81
/**
81 82
 * Clase que representa al driver de acceso a datos de wcs.
82 83
 *
......
646 647
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(org.gvsig.fmap.dal.coverage.datastruct.Extent, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.raster.cache.tile.provider.TileListener)
647 648
	 */
648 649
	public void getWindow(Extent ex, int bufWidth, int bufHeight, 
649
			BandList bandList, TileListener listener) throws ProcessInterruptedException, RasterDriverException {
650
			BandList bandList, TileListener listener, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
650 651

  
651 652
		Buffer raster = DefaultRasterManager.getInstance().createBuffer(getDataType()[0], bufWidth, bufHeight, 3, true);
652
		getWindow(ex, bufWidth, bufHeight, bandList, raster, true);
653
		getWindow(ex, bufWidth, bufHeight, bandList, raster, true, status);
653 654
		raster.setDataExtent(ex.toRectangle2D());
654 655

  
655 656
		TileCacheManager m = TileCacheLocator.getManager();
......
674 675
	 * (non-Javadoc)
675 676
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(double, double, double, double, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer)
676 677
	 */
677
	public Buffer getWindow(Extent ex, BandList bandList, Buffer rasterBuf) 
678
	public Buffer getWindow(Extent ex, BandList bandList, Buffer rasterBuf, TaskStatus status) 
678 679
		throws ProcessInterruptedException, RasterDriverException {
679 680
		Rectangle2D bBox = ex.toRectangle2D();
680 681
		WCSStatus wcsStatus = loadWCSStatus(bBox);
......
720 721
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(double, double, double, double, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer, boolean)
721 722
	 */
722 723
	public Buffer getWindow(double ulx, double uly, double w, double h, 
723
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent) throws ProcessInterruptedException, RasterDriverException {
724
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
724 725
		Rectangle2D bBox = new Rectangle2D.Double(ulx, uly, w, h);
725 726
		WCSStatus wcsStatus = loadWCSStatus(bBox);
726 727
		
......
766 767
	 * (non-Javadoc)
767 768
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(org.gvsig.fmap.dal.coverage.datastruct.Extent, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer, boolean)
768 769
	 */
769
	public Buffer getWindow(Extent extent, 
770
			int bufWidth, int bufHeight, BandList bandList, Buffer rasterBuf, boolean adjustToExtent) throws ProcessInterruptedException, RasterDriverException {
770
	public Buffer getWindow(Extent extent, int bufWidth, int bufHeight, 
771
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
771 772
		WCSDataParametersImpl p = (WCSDataParametersImpl)parameters;
772 773
		Rectangle2D bBox = null;
773 774
		p.setWidth(bufWidth);
......
939 940
	 * (non-Javadoc)
940 941
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(int, int, int, int, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer)
941 942
	 */
942
	public Buffer getWindow(int x, int y, int w, int h, BandList bandList, Buffer rasterBuf) throws ProcessInterruptedException, RasterDriverException {
943
	public Buffer getWindow(int x, int y, int w, int h, 
944
			BandList bandList, Buffer rasterBuf, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
943 945
		Point2D p1 = rasterToWorld(new Point2D.Double(x, y));
944 946
		Point2D p2 = rasterToWorld(new Point2D.Double(x + w, y + h));
945 947
		Rectangle2D bBox = new Rectangle2D.Double(p1.getX(), p1.getY(), Math.abs(p1.getX() - p1.getX()), Math.abs(p1.getY() - p2.getY()));

Also available in: Unified diff