Revision 469
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.app/pom.xml | ||
|---|---|---|
| 49 | 49 |
|
| 50 | 50 |
<properties> |
| 51 | 51 |
<gvsig.package.info.categories>Geoprocess</gvsig.package.info.categories> |
| 52 |
<gvsig.package.info.state>testing</gvsig.package.info.state>
|
|
| 52 |
<gvsig.package.info.state>prototype</gvsig.package.info.state>
|
|
| 53 | 53 |
</properties> |
| 54 | 54 |
</project> |
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FileTools.java | ||
|---|---|---|
| 28 | 28 |
import es.unex.sextante.core.Sextante; |
| 29 | 29 |
|
| 30 | 30 |
import org.cresques.cts.IProjection; |
| 31 |
|
|
| 32 | 31 |
import org.gvsig.app.ApplicationLocator; |
| 33 | 32 |
import org.gvsig.app.project.ProjectManager; |
| 34 | 33 |
import org.gvsig.app.project.ProjectPreferences; |
| ... | ... | |
| 37 | 36 |
import org.gvsig.fmap.dal.DALLocator; |
| 38 | 37 |
import org.gvsig.fmap.dal.DataManager; |
| 39 | 38 |
import org.gvsig.fmap.dal.DataStoreParameters; |
| 39 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterDataParameters; |
|
| 40 | 40 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 41 | 41 |
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters; |
| 42 | 42 |
import org.gvsig.fmap.dal.store.dbf.DBFStoreParameters; |
| ... | ... | |
| 91 | 91 |
final DataManager dm = DALLocator.getDataManager(); |
| 92 | 92 |
final DataStoreParameters params = |
| 93 | 93 |
dm.createStoreParameters(FileTools.LAYER_DRIVERS_IN[i]); |
| 94 |
((FilesystemStoreParameters) params).setFile(new File( |
|
| 95 |
sFilename)); |
|
| 94 |
((FilesystemStoreParameters) params).setFile(new File(sFilename)); |
|
| 96 | 95 |
|
| 97 |
params.setDynValue("crs", projection);
|
|
| 98 |
layer =
|
|
| 99 |
MapContextLocator.getMapContextManager().createLayer(
|
|
| 100 |
sName, params);
|
|
| 96 |
if(!(params instanceof RasterDataParameters)) {
|
|
| 97 |
params.setDynValue("crs", projection);
|
|
| 98 |
}
|
|
| 99 |
layer = MapContextLocator.getMapContextManager().createLayer(sName, params);
|
|
| 101 | 100 |
|
| 102 | 101 |
if ((layer != null) && layer.isAvailable()) {
|
| 103 | 102 |
return layer; |
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FLyrRasterReadOnlyIRasterLayer_deprecated.java | ||
|---|---|---|
| 29 | 29 |
import org.gvsig.fmap.dal.coverage.RasterManager; |
| 30 | 30 |
import org.gvsig.fmap.dal.coverage.dataset.Buffer; |
| 31 | 31 |
import org.gvsig.fmap.dal.coverage.datastruct.Extent; |
| 32 |
import org.gvsig.fmap.dal.coverage.datastruct.NoData; |
|
| 33 |
import org.gvsig.fmap.dal.coverage.exception.GridException; |
|
| 34 |
import org.gvsig.fmap.dal.coverage.exception.InvalidSetViewException; |
|
| 35 | 32 |
import org.gvsig.fmap.dal.coverage.exception.ProcessInterruptedException; |
| 36 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
|
|
| 33 |
import org.gvsig.fmap.dal.coverage.exception.QueryException;
|
|
| 37 | 34 |
import org.gvsig.fmap.dal.coverage.grid.Grid; |
| 38 | 35 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 39 | 36 |
import org.gvsig.fmap.dal.coverage.store.RasterQuery; |
| 40 | 37 |
import org.gvsig.raster.fmap.layers.FLyrRaster; |
| 41 | 38 |
|
| 42 | 39 |
import es.unex.sextante.core.AnalysisExtent; |
| 43 |
import es.unex.sextante.core.Sextante; |
|
| 44 | 40 |
import es.unex.sextante.dataObjects.AbstractRasterLayer; |
| 45 | 41 |
import es.unex.sextante.outputs.IOutputChannel; |
| 46 | 42 |
|
| ... | ... | |
| 124 | 120 |
} |
| 125 | 121 |
|
| 126 | 122 |
public void open() {
|
| 127 |
try {
|
|
| 123 |
/*try {
|
|
| 128 | 124 |
m_LayerGrid = m_Layer.getReadOnlyFullGrid(false); |
| 129 | 125 |
m_Buffer = m_LayerGrid.getRasterBuf(); |
| 130 | 126 |
m_iDataType = m_LayerGrid.getDataType(); |
| ... | ... | |
| 136 | 132 |
Sextante.addErrorToLog(e); |
| 137 | 133 |
} catch (InterruptedException e) {
|
| 138 | 134 |
Sextante.addErrorToLog(e); |
| 139 |
} |
|
| 135 |
}*/
|
|
| 140 | 136 |
} |
| 141 | 137 |
|
| 142 | 138 |
public void close() {
|
| ... | ... | |
| 190 | 186 |
double disty = lyrExt.maxY() - extent.getYMax(); |
| 191 | 187 |
xTranslate = (int)Math.round((distx * extent.getNX()) / (extent.getXMax() - extent.getXMin())); |
| 192 | 188 |
yTranslate = (int)Math.round((disty * extent.getNY()) / (extent.getYMax() - extent.getYMin())); |
| 193 |
} catch (RasterDriverException e) {
|
|
| 189 |
} catch (QueryException e) {
|
|
| 194 | 190 |
m_Buffer = entireBuf; |
| 195 | 191 |
} catch (ProcessInterruptedException e) {
|
| 196 |
} catch (InvalidSetViewException e) {
|
|
| 197 |
m_Buffer = entireBuf; |
|
| 198 |
} |
|
| 192 |
} |
|
| 199 | 193 |
} |
| 200 | 194 |
|
| 201 | 195 |
public double getLayerCellSize() {
|
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FLyrRasterIRasterLayer.java | ||
|---|---|---|
| 31 | 31 |
import org.gvsig.fmap.dal.coverage.RasterManager; |
| 32 | 32 |
import org.gvsig.fmap.dal.coverage.dataset.Buffer; |
| 33 | 33 |
import org.gvsig.fmap.dal.coverage.datastruct.Extent; |
| 34 |
import org.gvsig.fmap.dal.coverage.exception.InvalidSetViewException; |
|
| 35 | 34 |
import org.gvsig.fmap.dal.coverage.exception.ProcessInterruptedException; |
| 36 |
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
|
|
| 35 |
import org.gvsig.fmap.dal.coverage.exception.QueryException;
|
|
| 37 | 36 |
import org.gvsig.fmap.dal.coverage.store.RasterDataStore; |
| 38 | 37 |
import org.gvsig.fmap.dal.coverage.store.RasterQuery; |
| 39 | 38 |
import org.gvsig.fmap.dal.coverage.store.parameter.RasterFileStoreParameters; |
| ... | ... | |
| 155 | 154 |
try {
|
| 156 | 155 |
query.setAreaOfInterest(); |
| 157 | 156 |
m_Buffer = getDataStore().query(query); |
| 158 |
} catch (RasterDriverException e) {
|
|
| 157 |
} catch (QueryException e) {
|
|
| 159 | 158 |
Sextante.addErrorToLog(e); |
| 160 | 159 |
} catch (ProcessInterruptedException e) {
|
| 161 | 160 |
Sextante.addErrorToLog(e); |
| 162 |
} catch (InvalidSetViewException e) {
|
|
| 163 |
Sextante.addErrorToLog(e); |
|
| 164 |
} |
|
| 161 |
} |
|
| 165 | 162 |
} |
| 166 | 163 |
|
| 167 | 164 |
public void close() {
|
| ... | ... | |
| 215 | 212 |
double disty = bbox.getMax().getY() - extent.getYMax(); |
| 216 | 213 |
xTranslate = (int)Math.round((distx * extent.getNX()) / (extent.getXMax() - extent.getXMin())); |
| 217 | 214 |
yTranslate = (int)Math.round((disty * extent.getNY()) / (extent.getYMax() - extent.getYMin())); |
| 218 |
} catch (RasterDriverException e) {
|
|
| 215 |
} catch (QueryException e) {
|
|
| 219 | 216 |
m_Buffer = entireBuf; |
| 220 | 217 |
} catch (ProcessInterruptedException e) {
|
| 221 |
} catch (InvalidSetViewException e) {
|
|
| 222 |
m_Buffer = entireBuf; |
|
| 223 |
} |
|
| 218 |
} |
|
| 224 | 219 |
} |
| 225 | 220 |
|
| 226 | 221 |
public double getLayerCellSize() {
|
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.lib/org.gvsig.geoprocess.lib.sextante/src/main/java/org/gvsig/geoprocess/lib/sextante/dataObjects/FlyrVectIVectorLayer.java | ||
|---|---|---|
| 438 | 438 |
case IVectorLayer.SHAPE_TYPE_POLYGON: |
| 439 | 439 |
return org.gvsig.fmap.geom.Geometry.TYPES.SURFACE; |
| 440 | 440 |
case IVectorLayer.SHAPE_TYPE_LINE: |
| 441 |
return org.gvsig.fmap.geom.Geometry.TYPES.CURVE; |
|
| 442 |
case IVectorLayer.SHAPE_TYPE_POINT: |
|
| 443 |
return org.gvsig.fmap.geom.Geometry.TYPES.POINT; |
|
| 444 |
case IVectorLayer.SHAPE_TYPE_MULTIPOLYGON: |
|
| 445 |
return org.gvsig.fmap.geom.Geometry.TYPES.MULTISURFACE; |
|
| 446 |
case IVectorLayer.SHAPE_TYPE_MULTILINE: |
|
| 441 | 447 |
return org.gvsig.fmap.geom.Geometry.TYPES.MULTICURVE; |
| 442 |
case IVectorLayer.SHAPE_TYPE_POINT: |
|
| 448 |
case IVectorLayer.SHAPE_TYPE_MULTIPOINT:
|
|
| 443 | 449 |
return org.gvsig.fmap.geom.Geometry.TYPES.MULTIPOINT; |
| 444 | 450 |
default: |
| 445 | 451 |
return org.gvsig.fmap.geom.Geometry.TYPES.SURFACE; |
| org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/pom.xml | ||
|---|---|---|
| 63 | 63 |
<dependency> |
| 64 | 64 |
<groupId>org.gvsig</groupId> |
| 65 | 65 |
<artifactId>org.gvsig.raster.lib.api</artifactId> |
| 66 |
<version>2.1.0-SNAPSHOT</version>
|
|
| 66 |
<version>2.2.0-SNAPSHOT</version>
|
|
| 67 | 67 |
</dependency> |
| 68 | 68 |
<dependency> |
| 69 | 69 |
<groupId>org.gvsig</groupId> |
| 70 | 70 |
<artifactId>org.gvsig.raster.fmap</artifactId> |
| 71 |
<version>2.1.0-SNAPSHOT</version>
|
|
| 71 |
<version>2.2.0-SNAPSHOT</version>
|
|
| 72 | 72 |
</dependency> |
| 73 | 73 |
<!-- <dependency> |
| 74 | 74 |
<groupId>org.gvsig</groupId> |
| ... | ... | |
| 223 | 223 |
<goals>deploy</goals> |
| 224 | 224 |
</configuration> |
| 225 | 225 |
</plugin> |
| 226 |
|
|
| 227 |
<plugin> |
|
| 228 |
<groupId>org.apache.maven.plugins</groupId> |
|
| 229 |
<artifactId>maven-compiler-plugin</artifactId> |
|
| 230 |
<version>2.0.2</version> |
|
| 231 |
<configuration> |
|
| 232 |
<source>1.6</source> |
|
| 233 |
<target>1.6</target> |
|
| 234 |
<encoding>ISO-8859-1</encoding> |
|
| 235 |
</configuration> |
|
| 236 |
</plugin> |
|
| 237 |
|
|
| 238 |
<plugin> |
|
| 239 |
<groupId>org.codehaus.mojo</groupId> |
|
| 240 |
<artifactId>animal-sniffer-maven-plugin</artifactId> |
|
| 241 |
<executions> |
|
| 242 |
<execution> |
|
| 243 |
<id>check-java-api</id> |
|
| 244 |
<phase>test</phase> |
|
| 245 |
<goals> |
|
| 246 |
<goal>check</goal> |
|
| 247 |
</goals> |
|
| 248 |
<configuration> |
|
| 249 |
<signature> |
|
| 250 |
<groupId>org.codehaus.mojo.signature |
|
| 251 |
</groupId> |
|
| 252 |
<artifactId>java16</artifactId> |
|
| 253 |
<version>1.0</version> |
|
| 254 |
</signature> |
|
| 255 |
</configuration> |
|
| 256 |
</execution> |
|
| 257 |
</executions> |
|
| 258 |
</plugin> |
|
| 259 |
|
|
| 226 | 260 |
</plugins> |
| 227 | 261 |
</build> |
| 228 | 262 |
|
Also available in: Unified diff