Revision 4269 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
82 82
	private AbstractRasterProvider      lastRequestProvider      = null;
83 83
	private static final Logger         logger                    = LoggerFactory.getLogger(WCSProvider.class);
84 84

  
85

  
86 85
	public static void register() {
87 86
		DataManagerProviderServices dataman = (DataManagerProviderServices) DALLocator.getDataManager();
88 87
		if (dataman != null && !dataman.getStoreProviders().contains(NAME)) {
......
102 101

  
103 102
	/**
104 103
	 * Constructor. Abre el dataset.
105
	 * @param proj Proyecci?n
106
	 * @param fName Nombre del fichero
107 104
	 * @throws OpenException
108 105
	 * @throws NotSupportedExtensionException
109 106
     * @deprecated use {@link #WCSProvider(URI)}, this constructor will be removed in gvSIG 2.5
110
	 */
107
     */
111 108
	public WCSProvider(String params) throws InitializeException, OpenException {
112 109
		super(params);
113 110
        logger.info("Deprecated use of WCSProvider constructor");
......
118 115
            } catch (URISyntaxException e) {
119 116
                throw new OpenException("Can't create URI from" + (String) params, e);
120 117
            }
121
			super.init(p, null, ToolsLocator.getDynObjectManager()
118
            super.init(p, null, ToolsLocator.getDynObjectManager()
122 119
					.createDynObject(
123 120
							MetadataLocator.getMetadataManager().getDefinition(
124 121
									DataStore.METADATA_DEFINITION_NAME)));
......
126 123
		}
127 124
	}
128 125

  
129

  
130
    /**
131
     * Constructor. Abre el dataset.
132
     * @param proj Proyecci?n
133
     * @param fName Nombre del fichero
134
     * @throws NotSupportedExtensionException
135
     */
136
    public WCSProvider(URI uri) throws InitializeException {
126
    public WCSProvider(URI uri) throws InitializeException, OpenException {
137 127
        super(uri);
138 128
        WCSDataParametersImpl p = new WCSDataParametersImpl();
139
        p.setURI(uri);
129
            p.setURI(uri);
140 130
        super.init(
141 131
            p,
142 132
            null,
......
237 227
		Extent e = getExtent();
238 228
		double resolutionX = e.width() / getWidth();
239 229
		double resolutionY = e.height() / getHeight();
230

  
231

  
240 232
		ownTransformation = new AffineTransform(
241
				resolutionX,
242
				0,
243
				0,
244
				-resolutionY,
245
				e.getULX() - (resolutionX / 2),
246
				e.getULY() - (resolutionY / 2));
233
				resolutionX,                        // ESCALADO en X
234
				0,                                  // CIZALLAMIENTO de la Y
235
				0,                                  // CIZALLAMIENTO de la X
236
				-resolutionY,                       // ESCALADO en Y
237
				e.getULX() - (resolutionX / 2),     // TRASLACION en X
238
				e.getULY() - (resolutionY / 2));    // TRASLACION en Y
239

  
247 240
		externalTransformation = (AffineTransform) ownTransformation.clone();
248 241
		return ownTransformation;
249 242
	}
......
658 651
				bandList.getBand(i).setFileName(lastFile.getPath());
659 652
			}*/
660 653

  
661
			AbstractRasterProvider driver = DefaultProviderServices.loadProvider(new File(lastFile.getPath()));
654
			AbstractRasterProvider driver = DefaultProviderServices.loadProvider(lastFile);
662 655

  
663 656
			RasterQuery q = RasterLocator.getManager().createQuery();
664 657
			q.setAreaOfInterest(new ExtentImpl(ulx, uly, lrx, lry));
......
698 691
		}
699 692

  
700 693
		try {
701
			AbstractRasterProvider driver = DefaultProviderServices.loadProvider(new File(lastRequest.getPath()));
694
			AbstractRasterProvider driver = DefaultProviderServices.loadProvider(lastRequest);
702 695
			DefaultRasterStore store = new DefaultRasterStore();
703 696
			store.setProvider(driver);
704 697
			query.createBuffer(store);
......
947 940
	}
948 941

  
949 942
	public File getRMFFile() {
950
		if(lastRequest != null) {
951
		    return new File(FilenameUtils.removeExtension(lastRequest.getAbsolutePath()) + ".rmf");
952
		}
943
		if(lastRequest != null)
944
			return new File(FilenameUtils.removeExtension(lastRequest.getAbsolutePath()) + ".rmf");
953 945
		return null;
954 946
	}
955 947

  

Also available in: Unified diff