Revision 1054 org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSProvider.java

View differences:

WMTSProvider.java
93 93
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrixSetLink;
94 94
import org.gvsig.remoteclient.wmts.struct.WMTSTileMatrix.Tile;
95 95
import org.gvsig.tools.ToolsLocator;
96
import org.gvsig.tools.task.TaskStatus;
96 97
import org.slf4j.Logger;
97 98
import org.slf4j.LoggerFactory;
98 99
/**
......
858 859
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(double, double, double, double, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer, org.gvsig.fmap.dal.coverage.grid.render.TileListener, int)
859 860
	 */
860 861
	public void getWindow(Extent ex, int bufWidth, int bufHeight, 
861
			BandList bandList, TileListener listener) throws ProcessInterruptedException, RasterDriverException {
862
			BandList bandList, TileListener listener, TaskStatus taskStatus) throws ProcessInterruptedException, RasterDriverException {
862 863
		Rectangle2D r = ex.toRectangle2D();//new Rectangle2D.Double(Math.min(minX, maxX), Math.min(minY, maxY), Math.abs(maxX - minX), Math.abs(maxY - minY));
863 864
		WMTSStatus status = buildWMTSStatus(r, bufWidth, bufHeight);
864 865
		request(status, bandList, listener, requestType);
......
868 869
	 * (non-Javadoc)
869 870
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(double, double, double, double, int, int, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer, boolean)
870 871
	 */
871
	public Buffer getWindow(Extent extent, 
872
			int bufWidth, int bufHeight, BandList bandList, Buffer rasterBuf, boolean adjustToExtent) throws ProcessInterruptedException, RasterDriverException {
872
	public Buffer getWindow(Extent extent, int bufWidth, int bufHeight, 
873
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus taskStatus) throws ProcessInterruptedException, RasterDriverException {
873 874
		Rectangle2D r = extent.toRectangle2D();//new Rectangle2D.Double(Math.min(ulx, lrx), Math.min(lry, uly), Math.abs(lrx - ulx), Math.abs(uly - lry));
874 875
		WMTSStatus status = buildWMTSStatus(r, bufWidth, bufHeight);
875 876
		org.gvsig.raster.cache.tile.Tile[] tileList = request(status, bandList, null, requestType);
......
881 882
	 * (non-Javadoc)
882 883
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#getWindowRaster(org.gvsig.fmap.dal.coverage.datastruct.Extent, org.gvsig.fmap.dal.coverage.datastruct.BandList, org.gvsig.fmap.dal.coverage.dataset.Buffer)
883 884
	 */
884
	public Buffer getWindow(Extent extent, BandList bandList, Buffer rasterBuf) 
885
	public Buffer getWindow(Extent extent, BandList bandList, Buffer rasterBuf, TaskStatus taskStatus) 
885 886
		throws ProcessInterruptedException, RasterDriverException {
886 887
		lastWidthRequest = rasterBuf.getWidth();
887 888
		lastHeightRequest = rasterBuf.getHeight();
......
897 898
	 * @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)
898 899
	 */
899 900
	public Buffer getWindow(double ulx, double uly, double w, double h, 
900
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent) throws ProcessInterruptedException, RasterDriverException {
901
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus taskStatus) throws ProcessInterruptedException, RasterDriverException {
901 902
		lastWidthRequest = rasterBuf.getWidth();
902 903
		lastHeightRequest = rasterBuf.getHeight();
903 904
		Rectangle2D r = new Rectangle2D.Double(ulx, uly - h, w, h);
......
911 912
	 * (non-Javadoc)
912 913
	 * @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)
913 914
	 */
914
	public Buffer getWindow(int x, int y, int w, int h, BandList bandList, Buffer rasterBuf) throws ProcessInterruptedException, RasterDriverException {
915
	public Buffer getWindow(int x, int y, int w, int h, BandList bandList, Buffer rasterBuf, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
915 916
		lastWidthRequest = rasterBuf.getWidth();
916 917
		lastHeightRequest = rasterBuf.getHeight();
917 918
		return null;

Also available in: Unified diff