Revision 3739
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/jgdal/Gdal.java | ||
|---|---|---|
| 258 | 258 |
* @throws GdalException |
| 259 | 259 |
*/ |
| 260 | 260 |
public void setGeoTransform(GeoTransform gt)throws GdalException {
|
| 261 |
if (cPtr == 0)
|
|
| 261 |
if (GdalDataset.getCPtr(this.dataset) == 0)
|
|
| 262 | 262 |
throw new GdalException("No se ha podido acceder al archivo.");
|
| 263 | 263 |
if (gt == null) |
| 264 | 264 |
throw new GdalException("el objeto " + gt.getClass().getName() + " es null");
|
| ... | ... | |
| 304 | 304 |
|
| 305 | 305 |
if (name == null) |
| 306 | 306 |
throw new GdalException("El nombre del driver es null");
|
| 307 |
|
|
| 307 |
gdal.AllRegister(); |
|
| 308 |
ogrJNI.RegisterAll(); |
|
| 308 | 309 |
Driver ptrdrv = gdal.GetDriverByName(name); |
| 309 | 310 |
|
| 310 |
return (GdalDriver)ptrdrv;
|
|
| 311 |
return new GdalDriver(ptrdrv);
|
|
| 311 | 312 |
} |
| 312 | 313 |
|
| 313 | 314 |
|
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/jgdal/GdalRasterBand.java | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
import org.gdal.gdal.Band; |
| 28 | 28 |
import org.gdal.gdal.ColorTable; |
| 29 |
import org.slf4j.Logger; |
|
| 30 |
import org.slf4j.LoggerFactory; |
|
| 29 | 31 |
|
| 30 | 32 |
/** |
| 31 | 33 |
* Representa a una banda simple de la im�gen o canal. |
| ... | ... | |
| 37 | 39 |
|
| 38 | 40 |
public class GdalRasterBand extends Band{
|
| 39 | 41 |
|
| 42 |
public static final Logger logger = LoggerFactory.getLogger(GdalRasterBand.class); |
|
| 40 | 43 |
|
| 41 | 44 |
private boolean hasNoDataValue = false; |
| 42 | 45 |
|
| ... | ... | |
| 103 | 106 |
|
| 104 | 107 |
if ((nXSize < 1) || (nXSize > getRasterBandXSize()) || (nYSize<1) || (nYSize > getRasterBandYSize())) |
| 105 | 108 |
throw new GdalException("Tama?o de ventana incorrecto.");
|
| 106 |
|
|
| 107 |
if (((nXSize + nXOff) > (getRasterBandXSize())) || ((nYSize + nYOff) > (getRasterBandYSize()))) |
|
| 109 |
|
|
| 110 |
logger.error("Posicion de la ventana incorrecta. (" + nXSize + " + " + nXOff + ") > " + getRasterBandXSize() +
|
|
| 111 |
" || (" + nYSize + " + " + nYOff + ") > " + getRasterBandYSize());
|
|
| 112 |
if (((nXSize + nXOff) > (getRasterBandXSize())) || ((nYSize + nYOff) > (getRasterBandYSize()))){
|
|
| 113 |
nYOff = 0; |
|
| 114 |
logger.error("-----------------Error---------------------");
|
|
| 108 | 115 |
throw new GdalException("Posicion de la ventana incorrecta.");
|
| 116 |
} |
|
| 109 | 117 |
|
| 110 | 118 |
if ((eBufType < 1) || (eBufType > 11)) |
| 111 | 119 |
throw new GdalException("Tipo de datos incorrecto.");
|
| ... | ... | |
| 155 | 163 |
} |
| 156 | 164 |
|
| 157 | 165 |
|
| 158 |
if(i>0) |
|
| 166 |
if(i>=0)
|
|
| 159 | 167 |
return buf; |
| 160 | 168 |
else |
| 161 | 169 |
return null; |
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/jgdal/GdalDriver.java | ||
|---|---|---|
| 22 | 22 |
package org.gvsig.jgdal; |
| 23 | 23 |
|
| 24 | 24 |
import java.io.File; |
| 25 |
import java.nio.charset.Charset; |
|
| 25 | 26 |
import java.util.StringTokenizer; |
| 27 |
import java.util.Vector; |
|
| 26 | 28 |
|
| 27 | 29 |
import org.gdal.gdal.Dataset; |
| 28 | 30 |
import org.gdal.gdal.Driver; |
| ... | ... | |
| 49 | 51 |
super(cPtr, true); |
| 50 | 52 |
} |
| 51 | 53 |
|
| 54 |
public GdalDriver(Driver ptrdrv) {
|
|
| 55 |
this(Driver.getCPtr(ptrdrv)); |
|
| 56 |
} |
|
| 57 |
|
|
| 52 | 58 |
/** |
| 53 | 59 |
* Crea una copia de una im?gen a partir de un dataset de origen especificado. |
| 54 | 60 |
* @param file Nombre del fichero sobre el cual se guardar? la copia |
| ... | ... | |
| 150 | 156 |
// if (cPtr == 0) |
| 151 | 157 |
// throw new GdalException("No se ha podido acceder al archivo.");
|
| 152 | 158 |
|
| 153 |
Dataset data = Create(filename, nXSize, nYSize, nBands, nType, params); |
|
| 159 |
Driver driver = (Driver) this; |
|
| 160 |
byte ptext[] = filename.getBytes(Charset.forName("ISO_8859_1"));
|
|
| 161 |
String value = new String(ptext, Charset.forName("UTF-8"));
|
|
| 162 |
Dataset data = driver.Create(value, nXSize, nYSize, nBands, nType, StringArrayToVector(params)); |
|
| 154 | 163 |
|
| 155 | 164 |
return new Gdal(data); |
| 156 | 165 |
} |
| 166 |
|
|
| 167 |
private static Vector StringArrayToVector(String[] options) |
|
| 168 |
{
|
|
| 169 |
if (options == null) |
|
| 170 |
return null; |
|
| 171 |
Vector v = new Vector(); |
|
| 172 |
for(int i=0;i<options.length;i++) |
|
| 173 |
v.addElement(options[i]); |
|
| 174 |
return v; |
|
| 175 |
} |
|
| 176 |
|
|
| 157 | 177 |
} |
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/raster/gdal/io/GdalProvider.java | ||
|---|---|---|
| 171 | 171 |
public String[] getFormatList() {
|
| 172 | 172 |
return formatList; |
| 173 | 173 |
} |
| 174 |
|
|
| 174 |
|
|
| 175 | 175 |
/** |
| 176 | 176 |
* Returns true if the extension is supported and false if doesn't |
| 177 | 177 |
* @param ext |
| ... | ... | |
| 521 | 521 |
DefaultRasterStore store = new DefaultRasterStore(); |
| 522 | 522 |
store.setProvider(this); |
| 523 | 523 |
tileServer = new FileTileServer(store); |
| 524 |
// tileServer.setFileSuffix("rmf");
|
|
| 524 | 525 |
} |
| 525 | 526 |
return tileServer; |
| 526 | 527 |
} |
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/raster/gdal/io/GdalWriter.java | ||
|---|---|---|
| 50 | 50 |
import org.gvsig.raster.gdal.io.features.Jpeg2000Features; |
| 51 | 51 |
import org.gvsig.raster.gdal.io.features.PNM_PgmFeatures; |
| 52 | 52 |
import org.gvsig.raster.gdal.io.features.PNM_PpmFeatures; |
| 53 |
import org.gvsig.raster.gdal.io.features.RMFFeatures; |
|
| 53 | 54 |
import org.gvsig.raster.impl.buffer.DefaultDataServerWriter; |
| 54 | 55 |
import org.gvsig.raster.impl.buffer.RasterBuffer; |
| 55 | 56 |
import org.gvsig.raster.impl.process.RasterTask; |
| ... | ... | |
| 108 | 109 |
point.append("rst", "", GdalWriter.class);
|
| 109 | 110 |
pInfo.getFileFeature().put("rst", new IDRISIFeatures());
|
| 110 | 111 |
|
| 111 |
/*point.append("jp2", "", GdalWriter.class);
|
|
| 112 |
pInfo.getFileFeature().put("jp2", new Jpeg2000Features());*/
|
|
| 112 |
point.append("jp2", "", GdalWriter.class);
|
|
| 113 |
pInfo.getFileFeature().put("jp2", new Jpeg2000Features());
|
|
| 113 | 114 |
|
| 114 | 115 |
//La exportaci?n no es correcta del todo |
| 115 |
//point.register("rmf", GdalWriter.class);
|
|
| 116 |
//fileFeature.put("rmf", new RMFFeatures());
|
|
| 116 |
// point.append("rmf", "", GdalWriter.class);
|
|
| 117 |
// pInfo.getFileFeature().put("rmf", new RMFFeatures());
|
|
| 117 | 118 |
|
| 118 | 119 |
//No salva datos. Siempre sale negra la imagen |
| 119 | 120 |
//point.register("aux", GdalWriter.class);
|
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/pom.xml | ||
|---|---|---|
| 5 | 5 |
<artifactId>org.gvsig.raster.gdal.app</artifactId> |
| 6 | 6 |
<packaging>pom</packaging> |
| 7 | 7 |
<name>${project.artifactId}</name>
|
| 8 |
<parent>
|
|
| 8 |
<parent>
|
|
| 9 | 9 |
<groupId>org.gvsig</groupId> |
| 10 | 10 |
<artifactId>org.gvsig.raster.gdal</artifactId> |
| 11 | 11 |
<version>2.2.11-SNAPSHOT</version> |
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.common/pom.xml | ||
|---|---|---|
| 6 | 6 |
<packaging>jar</packaging> |
| 7 | 7 |
<name>Formats: Gdal file formats support</name> |
| 8 | 8 |
<description>Gdal data provider for gvSIG: jpeg, tiff, png, gif.</description> |
| 9 |
<parent>
|
|
| 9 |
<parent>
|
|
| 10 | 10 |
<groupId>org.gvsig</groupId> |
| 11 | 11 |
<artifactId>org.gvsig.raster.gdal.app</artifactId> |
| 12 | 12 |
<version>2.2.11-SNAPSHOT</version> |
| org.gvsig.raster.gdal/tags/pre-remove-jgdal/org.gvsig.raster.gdal/pom.xml | ||
|---|---|---|
| 11 | 11 |
<parent> |
| 12 | 12 |
<groupId>org.gvsig</groupId> |
| 13 | 13 |
<artifactId>org.gvsig.desktop</artifactId> |
| 14 |
<version>2.0.97</version>
|
|
| 14 |
<version>2.0.102</version>
|
|
| 15 | 15 |
</parent> |
| 16 | 16 |
|
| 17 | 17 |
<properties> |
| ... | ... | |
| 23 | 23 |
|
| 24 | 24 |
<!-- El plugin versions:use-latest-versions falla con scope import --> |
| 25 | 25 |
<!-- asi que toca usar el versions:update-properties que si que funciona --> |
| 26 |
<org.gvsig.raster.version>2.2.11</org.gvsig.raster.version>
|
|
| 26 |
<org.gvsig.raster.version>2.2.16-SNAPSHOT</org.gvsig.raster.version>
|
|
| 27 | 27 |
</properties> |
| 28 | 28 |
|
| 29 | 29 |
<repositories> |
Also available in: Unified diff