Revision 11084
| trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/drivers/raster/RasterSEDriver.java | ||
|---|---|---|
| 31 | 31 |
import org.cresques.cts.ICoordTrans; |
| 32 | 32 |
import org.cresques.cts.IProjection; |
| 33 | 33 |
import org.gvsig.fmap.drivers.GeoRasterDriver; |
| 34 |
import org.gvsig.raster.dataaccess.DataSource;
|
|
| 34 |
import org.gvsig.raster.buffer.BufferFactory;
|
|
| 35 | 35 |
import org.gvsig.raster.dataset.NotSupportedExtensionException; |
| 36 | 36 |
import org.gvsig.raster.dataset.RasterDataset; |
| 37 | 37 |
import org.gvsig.raster.dataset.RasterDriverException; |
| ... | ... | |
| 49 | 49 |
private IProjection proj = null; |
| 50 | 50 |
private RasterDataset dataset = null; |
| 51 | 51 |
private Rendering render = null; |
| 52 |
private DataSource ds = null;
|
|
| 52 |
private BufferFactory bf = null;
|
|
| 53 | 53 |
|
| 54 | 54 |
int trans = 255; |
| 55 | 55 |
|
| ... | ... | |
| 95 | 95 |
//TODO: FUNCIONALIDAD: Manejar las excepciones para que informen convenientemente |
| 96 | 96 |
|
| 97 | 97 |
try {
|
| 98 |
dataset = RasterDataset.openFile(proj, fName);
|
|
| 98 |
dataset = RasterDataset.open(proj, fName); |
|
| 99 | 99 |
} catch (NotSupportedExtensionException e) {
|
| 100 | 100 |
throw new IOException("Formato no valido");
|
| 101 | 101 |
} catch (RasterDriverException e) {
|
| ... | ... | |
| 103 | 103 |
} |
| 104 | 104 |
if(dataset == null) |
| 105 | 105 |
throw new IOException("Formato no valido");
|
| 106 |
ds = new DataSource(dataset);
|
|
| 106 |
bf = new BufferFactory(dataset);
|
|
| 107 | 107 |
createRender(); |
| 108 | 108 |
} else |
| 109 | 109 |
throw new IOException("Proyecci?n no asignada");
|
| ... | ... | |
| 116 | 116 |
public void initialize(IProjection proj) throws IOException {
|
| 117 | 117 |
this.proj = proj; |
| 118 | 118 |
try{
|
| 119 |
dataset = RasterDataset.openFile(proj, file.getAbsolutePath());
|
|
| 119 |
dataset = RasterDataset.open(proj, file.getAbsolutePath()); |
|
| 120 | 120 |
} catch (NotSupportedExtensionException e) {
|
| 121 | 121 |
throw new IOException("Formato no valido");
|
| 122 | 122 |
} catch (RasterDriverException e) {
|
| ... | ... | |
| 124 | 124 |
} |
| 125 | 125 |
if(dataset == null) |
| 126 | 126 |
return; |
| 127 |
ds = new DataSource(dataset);
|
|
| 127 |
bf = new BufferFactory(dataset);
|
|
| 128 | 128 |
createRender(); |
| 129 | 129 |
} |
| 130 | 130 |
|
| 131 | 131 |
private void createRender() {
|
| 132 |
render = new Rendering(ds);
|
|
| 132 |
render = new Rendering(bf);
|
|
| 133 | 133 |
/*raster = new Rendering(rasterFile, null, rasterFile.getExtent()); |
| 134 | 134 |
raster.setTransparency(false); |
| 135 | 135 |
grid.addRenderizer(raster);*/ |
| ... | ... | |
| 143 | 143 |
public void addFile(String fileName)throws IOException{
|
| 144 | 144 |
try{
|
| 145 | 145 |
if(render != null) |
| 146 |
ds.addFile(RasterDataset.openFile(getProjection(), fileName));
|
|
| 146 |
bf.addFile(RasterDataset.open(getProjection(), fileName));
|
|
| 147 | 147 |
} catch (NotSupportedExtensionException e) {
|
| 148 | 148 |
throw new IOException("Formato no valido");
|
| 149 | 149 |
} catch (RasterDriverException e) {
|
| ... | ... | |
| 157 | 157 |
*/ |
| 158 | 158 |
public void delFile(String fileName){
|
| 159 | 159 |
if(render != null) |
| 160 |
ds.removeFile(fileName);
|
|
| 160 |
bf.removeFile(fileName);
|
|
| 161 | 161 |
} |
| 162 | 162 |
|
| 163 | 163 |
/* |
| ... | ... | |
| 236 | 236 |
* @see com.iver.cit.gvsig.fmap.drivers.RasterDriver#getRasterDataType() |
| 237 | 237 |
*/ |
| 238 | 238 |
public int getRasterDataType() {
|
| 239 |
return ds.getDataType();
|
|
| 239 |
return bf.getDataType();
|
|
| 240 | 240 |
} |
| 241 | 241 |
|
| 242 | 242 |
/* (non-Javadoc) |
| ... | ... | |
| 433 | 433 |
* Obtiene el grid asociado |
| 434 | 434 |
* @return grid |
| 435 | 435 |
*/ |
| 436 |
public DataSource getGrid(){
|
|
| 437 |
return ds;
|
|
| 436 |
public BufferFactory getGrid(){
|
|
| 437 |
return bf;
|
|
| 438 | 438 |
} |
| 439 | 439 |
|
| 440 | 440 |
/** |
| ... | ... | |
| 455 | 455 |
* Get datasource object |
| 456 | 456 |
* @return DataSource |
| 457 | 457 |
*/ |
| 458 |
public DataSource getDatasource(){
|
|
| 459 |
return this.ds;
|
|
| 458 |
public BufferFactory getDatasource(){
|
|
| 459 |
return this.bf;
|
|
| 460 | 460 |
} |
| 461 | 461 |
|
| 462 | 462 |
/* |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/drivers/GenericRasterDriver.java | ||
|---|---|---|
| 50 | 50 |
import java.util.ArrayList; |
| 51 | 51 |
|
| 52 | 52 |
import org.cresques.cts.ICoordTrans; |
| 53 |
import org.gvsig.raster.dataaccess.DataSource;
|
|
| 53 |
import org.gvsig.raster.buffer.BufferFactory;
|
|
| 54 | 54 |
import org.gvsig.raster.grid.render.Rendering; |
| 55 | 55 |
|
| 56 | 56 |
import com.hardcode.driverManager.Driver; |
| ... | ... | |
| 190 | 190 |
* Obtiene el grid asociado |
| 191 | 191 |
* @return grid |
| 192 | 192 |
*/ |
| 193 |
public DataSource getGrid();
|
|
| 193 |
public BufferFactory getGrid();
|
|
| 194 | 194 |
/** |
| 195 | 195 |
* Obtiene el flag que dice si la imagen est? o no georreferenciada |
| 196 | 196 |
* @return true si est? georreferenciada y false si no lo est?. |
| ... | ... | |
| 201 | 201 |
* Get datasource object |
| 202 | 202 |
* @return |
| 203 | 203 |
*/ |
| 204 |
public DataSource getDatasource();
|
|
| 204 |
public BufferFactory getDatasource();
|
|
| 205 | 205 |
|
| 206 | 206 |
/** |
| 207 | 207 |
* Get render object |
| trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/layers/FLyrRasterSE.java | ||
|---|---|---|
| 40 | 40 |
import org.cresques.filter.RasterFilterStack; |
| 41 | 41 |
import org.gvsig.fmap.drivers.GenericRasterDriver; |
| 42 | 42 |
import org.gvsig.fmap.drivers.GeoRasterDriver; |
| 43 |
import org.gvsig.raster.dataaccess.DataSource;
|
|
| 43 |
import org.gvsig.raster.buffer.BufferFactory;
|
|
| 44 | 44 |
import org.gvsig.raster.dataset.RasterDriverException; |
| 45 | 45 |
import org.gvsig.raster.dataset.RasterMultiDataset; |
| 46 | 46 |
import org.gvsig.raster.dataset.properties.DatasetMetadata; |
| ... | ... | |
| 749 | 749 |
* Get datasource object |
| 750 | 750 |
* @return |
| 751 | 751 |
*/ |
| 752 |
public DataSource getDatasource(){
|
|
| 752 |
public BufferFactory getDatasource(){
|
|
| 753 | 753 |
return getSource().getDatasource(); |
| 754 | 754 |
} |
| 755 | 755 |
|
| trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/layers/RasterSEAdapter.java | ||
|---|---|---|
| 53 | 53 |
|
| 54 | 54 |
import org.cresques.cts.ICoordTrans; |
| 55 | 55 |
import org.gvsig.fmap.drivers.GenericRasterDriver; |
| 56 |
import org.gvsig.raster.dataaccess.DataSource;
|
|
| 56 |
import org.gvsig.raster.buffer.BufferFactory;
|
|
| 57 | 57 |
import org.gvsig.raster.grid.render.Rendering; |
| 58 | 58 |
|
| 59 | 59 |
import com.hardcode.driverManager.Driver; |
| ... | ... | |
| 247 | 247 |
* Get datasource object |
| 248 | 248 |
* @return |
| 249 | 249 |
*/ |
| 250 |
public DataSource getDatasource(){
|
|
| 250 |
public BufferFactory getDatasource(){
|
|
| 251 | 251 |
return ((GenericRasterDriver)driver).getDatasource(); |
| 252 | 252 |
} |
| 253 | 253 |
|
| trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/panels/BandSetupListener.java | ||
|---|---|---|
| 205 | 205 |
try{
|
| 206 | 206 |
Rectangle2D extentOrigin = prop.getFullRasterExtent().toRectangle2D(); |
| 207 | 207 |
|
| 208 |
RasterDataset geoRasterDataset = RasterDataset.openFile(prop.getProjection(), files[i].getAbsolutePath());
|
|
| 208 |
RasterDataset geoRasterDataset = RasterDataset.open(prop.getProjection(), files[i].getAbsolutePath()); |
|
| 209 | 209 |
Extent extentNewFile = geoRasterDataset.getExtent(); |
| 210 | 210 |
nbands += geoRasterDataset.getBandCount(); |
| 211 | 211 |
|
| ... | ... | |
| 264 | 264 |
String pathName = bandSetupPanel.getFileList().getJList().getSelectedValue().toString(); |
| 265 | 265 |
RasterDataset geoRasterFile = null; |
| 266 | 266 |
try {
|
| 267 |
geoRasterFile = RasterDataset.openFile(prop.getProjection(), pathName);
|
|
| 267 |
geoRasterFile = RasterDataset.open(prop.getProjection(), pathName); |
|
| 268 | 268 |
} catch (NotSupportedExtensionException e) {
|
| 269 | 269 |
NotificationManager.addError(e.getMessage(), e); |
| 270 | 270 |
} catch (RasterDriverException e1) {
|
Also available in: Unified diff