Revision 5098
| trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrAnnotation.java | ||
|---|---|---|
| 114 | 114 |
try {
|
| 115 | 115 |
g.setColor(Color.black); |
| 116 | 116 |
strategy.draw(image, g, viewPort, cancel); |
| 117 |
if (getSpatialIndex()==null) {
|
|
| 117 |
if (getISpatialIndex()==null) {
|
|
| 118 | 118 |
createSpatialIndex(); |
| 119 | 119 |
} |
| 120 | 120 |
} catch (DriverException e) {
|
| trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/spatialindex/ISpatialIndex.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-05-01 18:38:41 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:44:03 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/05/01 18:38:41 azabala |
|
| 49 | 52 |
* primera version en cvs del api de indices espaciales |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 84 | 87 |
*/ |
| 85 | 88 |
public void delete(Rectangle2D rect, int index); |
| 86 | 89 |
|
| 87 |
|
|
| 90 |
//TODO Hacer un overwrite and update |
|
| 88 | 91 |
} |
| 89 | 92 |
|
| 93 |
|
|
| 94 |
|
|
| trunk/extensions/extGeoProcessing/text.properties | ||
|---|---|---|
| 19 | 19 |
Convex_Hull=Convex Hull |
| 20 | 20 |
Convex_Hull._Introduccion_de_datos=Convex Hull. Introducci?n de datos |
| 21 | 21 |
Crear_Buffer=Crear Buffer... |
| 22 |
Crear_Indice=Crear ?ndice espacial... |
|
| 23 |
Crear_Indice_Intro=La creaci?n de ?ndices espaciales puede optimizar la realizacion de consultas espaciales. |
|
| 24 |
Crear_Indice_Pregunta_1=?Desea crear un ?ndice espacial para la capa |
|
| 25 |
Crear_Indice_Pregunta_2=? |
|
| 22 | 26 |
De= de |
| 23 | 27 |
Dentro_y_fuera=dentro y fuera del poligono |
| 24 | 28 |
Dentro=dentro del pol?gono |
| ... | ... | |
| 88 | 92 |
Recortar._Introduccion_de_datos=Recortar. Introducci?n de datos |
| 89 | 93 |
Seleccionar_Directorio=Carpeta con capas... |
| 90 | 94 |
Siguiente=Siguiente |
| 95 |
Solo_disolver_adyacentes=Solo disolver adyacentes. |
|
| 91 | 96 |
Terminar=Terminar |
| 92 | 97 |
Union=Uni?n |
| 93 | 98 |
Union._Introduccion_de_datos=Uni?n. Introducci?n de datos |
| trunk/extensions/extGeoProcessing/text_en.properties | ||
|---|---|---|
| 19 | 19 |
Convex_Hull=Convex Hull |
| 20 | 20 |
Convex_Hull._Introduccion_de_datos=Convex Hull. Data input |
| 21 | 21 |
Crear_Buffer=Create Buffer... |
| 22 |
Crear_Indice=Spatial index creation... |
|
| 23 |
Crear_Indice_Intro=Spatial indexes could optimize spatial querys. |
|
| 24 |
Crear_Indice_Pregunta_1=Do you want to create an spatial index for layer |
|
| 25 |
Crear_Indice_Pregunta_2=? |
|
| 22 | 26 |
De= of |
| 23 | 27 |
Dentro_y_fuera=inside and outside de polygon |
| 24 | 28 |
Dentro=inside de polygon |
| ... | ... | |
| 88 | 92 |
Recortar._Introduccion_de_datos=Clip. Data input |
| 89 | 93 |
Seleccionar_Directorio=Path with layers... |
| 90 | 94 |
Siguiente=Next |
| 95 |
Solo_disolver_adyacentes=Only dissolve adjacents. |
|
| 91 | 96 |
Terminar=Finish |
| 92 | 97 |
Union=Union |
| 93 | 98 |
Union._Introduccion_de_datos=Union. Data input |
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/IntersectionGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 66 | 69 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 67 | 70 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 68 | 71 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 69 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 72 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 70 | 73 |
|
| 71 | 74 |
public class IntersectionGeoprocessController extends |
| 72 | 75 |
AbstractGeoprocessController {
|
| ... | ... | |
| 134 | 137 |
} |
| 135 | 138 |
AddResultLayerTask task2 = new AddResultLayerTask(intersection); |
| 136 | 139 |
task2.setLayers(layers); |
| 137 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 140 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 138 | 141 |
task2); |
| 142 |
if(overlayLayer.getISpatialIndex() == null){
|
|
| 143 |
final IMonitorableTask sptIdxTask = |
|
| 144 |
geoProcessingIntersectPanel.askForSpatialIndexCreation(overlayLayer); |
|
| 145 |
PluginServices.backgroundExecution( |
|
| 146 |
new Runnable(){
|
|
| 147 |
public void run() {
|
|
| 148 |
PluginServices. |
|
| 149 |
cancelableBackgroundExecution(sptIdxTask); |
|
| 150 |
}} |
|
| 151 |
); |
|
| 152 |
}//if |
|
| 139 | 153 |
if (globalTask.preprocess()) |
| 140 | 154 |
PluginServices.cancelableBackgroundExecution(globalTask); |
| 141 | 155 |
} catch (GeoprocessException e) {
|
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/SpatialJoinGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 62 | 65 |
import com.iver.cit.gvsig.fmap.edition.writers.shp.ShpWriter; |
| 63 | 66 |
import com.iver.cit.gvsig.fmap.layers.FLayers; |
| 64 | 67 |
import com.iver.cit.gvsig.fmap.layers.FLyrVect; |
| 68 |
import com.iver.gvsig.geoprocessing.gui.operationpanels.GeoProcessingDissolvePanel; |
|
| 65 | 69 |
import com.iver.gvsig.geoprocessing.gui.operationpanels.GeoProcessingSpatialjoinPanel; |
| 66 | 70 |
import com.iver.gvsig.geoprocessing.impl.spatialjoin.SpatialJoinGeoprocess; |
| 67 | 71 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 68 | 72 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 69 | 73 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 70 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 74 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 71 | 75 |
|
| 72 | 76 |
public class SpatialJoinGeoprocessController extends |
| 73 | 77 |
AbstractGeoprocessController {
|
| ... | ... | |
| 145 | 149 |
} |
| 146 | 150 |
AddResultLayerTask task2 = new AddResultLayerTask(join); |
| 147 | 151 |
task2.setLayers(layers); |
| 148 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 152 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 149 | 153 |
task2); |
| 154 |
if(secondLayer.getISpatialIndex() == null){
|
|
| 155 |
final IMonitorableTask sptIdxTask = |
|
| 156 |
geoProcessingSpatialjoinPanel.askForSpatialIndexCreation(secondLayer); |
|
| 157 |
PluginServices.backgroundExecution( |
|
| 158 |
new Runnable(){
|
|
| 159 |
public void run() {
|
|
| 160 |
PluginServices. |
|
| 161 |
cancelableBackgroundExecution(sptIdxTask); |
|
| 162 |
}} |
|
| 163 |
); |
|
| 164 |
}//if |
|
| 150 | 165 |
if (globalTask.preprocess()) |
| 151 | 166 |
PluginServices.cancelableBackgroundExecution(globalTask); |
| 152 | 167 |
} catch (GeoprocessException e) {
|
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/DissolveGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 67 | 70 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 68 | 71 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 69 | 72 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 70 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 73 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 71 | 74 |
|
| 72 | 75 |
public class DissolveGeoprocessController extends AbstractGeoprocessController {
|
| 73 | 76 |
private GeoProcessingDissolvePanel geoProcessingDissolvePanel; |
| ... | ... | |
| 96 | 99 |
.getDissolveFieldName(); |
| 97 | 100 |
boolean onlySelection = geoProcessingDissolvePanel |
| 98 | 101 |
.isDissolveOnlySelected(); |
| 102 |
boolean onlyAdjacents = geoProcessingDissolvePanel.onlyAdjacentSelected(); |
|
| 99 | 103 |
DissolveGeoprocess dissolve = new DissolveGeoprocess(inputLayer, |
| 100 | 104 |
dissolveField); |
| 101 | 105 |
|
| ... | ... | |
| 123 | 127 |
dissolve.setResultLayerProperties(writer, schemaManager); |
| 124 | 128 |
HashMap params = new HashMap(); |
| 125 | 129 |
params.put("layer_selection", new Boolean(onlySelection));
|
| 130 |
params.put("only_adjacents", new Boolean(onlyAdjacents));
|
|
| 126 | 131 |
try {
|
| 127 | 132 |
dissolve.setParameters(params); |
| 128 | 133 |
dissolve.checkPreconditions(); |
| 129 | 134 |
IMonitorableTask task1 = dissolve.createTask(); |
| 130 | 135 |
AddResultLayerTask task2 = new AddResultLayerTask(dissolve); |
| 131 | 136 |
task2.setLayers(layers); |
| 132 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 137 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 133 | 138 |
task2); |
| 139 |
if(inputLayer.getISpatialIndex() == null){
|
|
| 140 |
final IMonitorableTask sptIdxTask = |
|
| 141 |
geoProcessingDissolvePanel.askForSpatialIndexCreation(inputLayer); |
|
| 142 |
PluginServices.backgroundExecution( |
|
| 143 |
new Runnable(){
|
|
| 144 |
public void run() {
|
|
| 145 |
PluginServices. |
|
| 146 |
cancelableBackgroundExecution(sptIdxTask); |
|
| 147 |
}} |
|
| 148 |
); |
|
| 149 |
}//if |
|
| 134 | 150 |
if (globalTask.preprocess()) |
| 135 | 151 |
PluginServices.cancelableBackgroundExecution(globalTask); |
| 136 | 152 |
} catch (GeoprocessException e) {
|
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/UnionGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 66 | 69 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 67 | 70 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 68 | 71 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 69 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 72 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 70 | 73 |
|
| 71 | 74 |
public class UnionGeoprocessController extends AbstractGeoprocessController {
|
| 72 | 75 |
|
| ... | ... | |
| 128 | 131 |
} |
| 129 | 132 |
AddResultLayerTask task2 = new AddResultLayerTask(union); |
| 130 | 133 |
task2.setLayers(layers); |
| 131 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 134 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 132 | 135 |
task2); |
| 136 |
if(overlayLayer.getISpatialIndex() == null){
|
|
| 137 |
final IMonitorableTask sptIdxTask = |
|
| 138 |
geoProcessingUnionPanel.askForSpatialIndexCreation(overlayLayer); |
|
| 139 |
PluginServices.backgroundExecution( |
|
| 140 |
new Runnable(){
|
|
| 141 |
public void run() {
|
|
| 142 |
PluginServices. |
|
| 143 |
cancelableBackgroundExecution(sptIdxTask); |
|
| 144 |
}} |
|
| 145 |
); |
|
| 146 |
}//if |
|
| 133 | 147 |
if (globalTask.preprocess()) |
| 134 | 148 |
PluginServices.cancelableBackgroundExecution(globalTask); |
| 135 | 149 |
} catch (GeoprocessException e) {
|
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/DifferenceGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 66 | 69 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 67 | 70 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 68 | 71 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 69 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 72 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 70 | 73 |
|
| 71 | 74 |
public class DifferenceGeoprocessController extends |
| 72 | 75 |
AbstractGeoprocessController {
|
| ... | ... | |
| 132 | 135 |
} |
| 133 | 136 |
AddResultLayerTask task2 = new AddResultLayerTask(diff); |
| 134 | 137 |
task2.setLayers(layers); |
| 135 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 138 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 136 | 139 |
task2); |
| 140 |
if(overlayLayer.getISpatialIndex() == null){
|
|
| 141 |
final IMonitorableTask sptIdxTask = |
|
| 142 |
geoProcessingDifferencePanel.askForSpatialIndexCreation(overlayLayer); |
|
| 143 |
PluginServices.backgroundExecution( |
|
| 144 |
new Runnable(){
|
|
| 145 |
public void run() {
|
|
| 146 |
PluginServices. |
|
| 147 |
cancelableBackgroundExecution(sptIdxTask); |
|
| 148 |
}} |
|
| 149 |
); |
|
| 150 |
}//if |
|
| 137 | 151 |
if (globalTask.preprocess()) |
| 138 | 152 |
PluginServices.cancelableBackgroundExecution(globalTask); |
| 139 | 153 |
|
| trunk/extensions/extGeoProcessing/src/com/iver/gvsig/geoprocessing/MergeGeoprocessController.java | ||
|---|---|---|
| 45 | 45 |
* |
| 46 | 46 |
* $Id$ |
| 47 | 47 |
* $Log$ |
| 48 |
* Revision 1.1 2006-04-11 17:55:51 azabala |
|
| 48 |
* Revision 1.2 2006-05-08 15:35:32 azabala |
|
| 49 |
* *** empty log message *** |
|
| 50 |
* |
|
| 51 |
* Revision 1.1 2006/04/11 17:55:51 azabala |
|
| 49 | 52 |
* primera version en cvs |
| 50 | 53 |
* |
| 51 | 54 |
* |
| ... | ... | |
| 65 | 68 |
import com.iver.gvsig.geoprocessing.model.GeoprocessException; |
| 66 | 69 |
import com.iver.gvsig.geoprocessing.model.IGeoprocess; |
| 67 | 70 |
import com.iver.utiles.swing.threads.IMonitorableTask; |
| 68 |
import com.iver.utiles.swing.threads.MonitorableDecorator; |
|
| 71 |
import com.iver.utiles.swing.threads.MonitorableDecoratorMainFirst;
|
|
| 69 | 72 |
|
| 70 | 73 |
public class MergeGeoprocessController extends AbstractGeoprocessController {
|
| 71 | 74 |
private GeoProcessingMergePanel geoProcessingMergePanel; |
| ... | ... | |
| 123 | 126 |
IMonitorableTask task1 = merge.createTask(); |
| 124 | 127 |
AddResultLayerTask task2 = new AddResultLayerTask(merge); |
| 125 | 128 |
task2.setLayers(layers); |
| 126 |
MonitorableDecorator globalTask = new MonitorableDecorator(task1,
|
|
| 129 |
MonitorableDecoratorMainFirst globalTask = new MonitorableDecoratorMainFirst(task1,
|
|
| 127 | 130 |
task2); |
| 128 | 131 |
if (globalTask.preprocess()) |
| 129 | 132 |
PluginServices.cancelableBackgroundExecution(globalTask); |
Also available in: Unified diff