Revision 35116
| branches/dal_time_support/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/DummyFileFeatureStore.java | ||
|---|---|---|
| 1303 | 1303 |
// TODO Auto-generated method stub |
| 1304 | 1304 |
return null; |
| 1305 | 1305 |
} |
| 1306 |
|
|
| 1307 |
public FeatureIndex createIndex(String indexTypeName, |
|
| 1308 |
FeatureType featureType, String attributeName, String indexName) |
|
| 1309 |
throws DataException {
|
|
| 1310 |
// TODO Auto-generated method stub |
|
| 1311 |
return null; |
|
| 1312 |
} |
|
| 1313 |
|
|
| 1314 |
public FeatureIndex createIndex(String indexTypeName, |
|
| 1315 |
FeatureType featureType, String attributeName, String indexName, |
|
| 1316 |
Observer observer) throws DataException {
|
|
| 1317 |
// TODO Auto-generated method stub |
|
| 1318 |
return null; |
|
| 1319 |
} |
|
| 1306 | 1320 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/MapContextPersistenceTest.java | ||
|---|---|---|
| 81 | 81 |
assertTrue("Error while creating legend: " + e.getMessage(), false);
|
| 82 | 82 |
} |
| 83 | 83 |
lyrs.addLayer(lyr[i]); |
| 84 |
lyr[i].dispose(); |
|
| 84 | 85 |
} |
| 85 | 86 |
|
| 86 | 87 |
for (int i=0; i<lyr_count; i++) {
|
| ... | ... | |
| 92 | 93 |
assertTrue("Error while creating legend: " + e.getMessage(), false);
|
| 93 | 94 |
} |
| 94 | 95 |
lyrs.addLayer(lyr[i]); |
| 96 |
lyr[i].dispose(); |
|
| 95 | 97 |
} |
| 96 | 98 |
|
| 97 | 99 |
doTestPersist(lyrs); |
| ... | ... | |
| 142 | 144 |
try { lyr.setLegend(new DummyVectorLegend(TYPES.SOLID)); } catch (LegendLayerException e) { }
|
| 143 | 145 |
|
| 144 | 146 |
aux.addLayer(lyr); |
| 147 |
lyr.dispose(); |
|
| 145 | 148 |
|
| 146 | 149 |
fs = new DummyDBFeatureStore("A");
|
| 147 | 150 |
lyr = createLayer(fs); |
| ... | ... | |
| 149 | 152 |
try { lyr.setLegend(new DummyVectorLegend(TYPES.SOLID)); } catch (LegendLayerException e) { }
|
| 150 | 153 |
|
| 151 | 154 |
aux.addLayer(lyr); |
| 155 |
lyr.dispose(); |
|
| 152 | 156 |
|
| 153 | 157 |
fs = new DummyFileFeatureStore("2");
|
| 154 | 158 |
lyr = createLayer(fs); |
| ... | ... | |
| 156 | 160 |
try { lyr.setLegend(new DummyVectorLegend(TYPES.SOLID)); } catch (LegendLayerException e) { }
|
| 157 | 161 |
|
| 158 | 162 |
aux.addLayer(lyr); |
| 163 |
lyr.dispose(); |
|
| 159 | 164 |
|
| 160 | 165 |
fs = new DummyDBFeatureStore("B");
|
| 161 | 166 |
lyr = createLayer(fs); |
| ... | ... | |
| 164 | 169 |
|
| 165 | 170 |
resp.addLayer(lyr); |
| 166 | 171 |
resp.addLayer(aux); |
| 172 |
lyr.dispose(); |
|
| 173 |
aux.dispose(); |
|
| 167 | 174 |
|
| 168 | 175 |
mcon.getLayers().addLayer(resp); |
| 176 |
resp.dispose(); |
|
| 169 | 177 |
} |
| 170 | 178 |
|
| 171 | 179 |
private FLyrVect createLayer(FeatureStore fs) throws Exception {
|
| branches/dal_time_support/libraries/libFMap_mapcontext/src-test/org/gvsig/fmap/mapcontext/persistence/DummyDBFeatureStore.java | ||
|---|---|---|
| 576 | 576 |
// TODO Auto-generated method stub |
| 577 | 577 |
return null; |
| 578 | 578 |
} |
| 579 |
|
|
| 580 |
public FeatureIndex createIndex(String indexTypeName, |
|
| 581 |
FeatureType featureType, String attributeName, String indexName) |
|
| 582 |
throws DataException {
|
|
| 583 |
// TODO Auto-generated method stub |
|
| 584 |
return null; |
|
| 585 |
} |
|
| 586 |
|
|
| 587 |
public FeatureIndex createIndex(String indexTypeName, |
|
| 588 |
FeatureType featureType, String attributeName, String indexName, |
|
| 589 |
Observer observer) throws DataException {
|
|
| 590 |
// TODO Auto-generated method stub |
|
| 591 |
return null; |
|
| 592 |
} |
|
| 579 | 593 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLyrText.java | ||
|---|---|---|
| 440 | 440 |
* @see com.iver.cit.gvsig.fmap.layers.layerOperations.Classifiable#getShapeType() |
| 441 | 441 |
*/ |
| 442 | 442 |
public int getShapeType() {
|
| 443 |
return Geometry.TYPES.TEXT;
|
|
| 443 |
return legend.getShapeType();
|
|
| 444 | 444 |
} |
| 445 | 445 |
|
| 446 | 446 |
/* |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/operations/LayerCollection.java | ||
|---|---|---|
| 54 | 54 |
* <p>Interface with methods for a collection of layers.</p> |
| 55 | 55 |
*/ |
| 56 | 56 |
public interface LayerCollection extends LayersVisitable {
|
| 57 |
|
|
| 57 | 58 |
/** |
| 59 |
* Value used to specify the insertion at the beginning. |
|
| 60 |
*/ |
|
| 61 |
public final static int BEGIN = 0; |
|
| 62 |
/** |
|
| 63 |
* Value used to specify the insertion at the end. |
|
| 64 |
*/ |
|
| 65 |
public final static int END = 1; |
|
| 66 |
/** |
|
| 67 |
* Value used to specify the insertion before an element. |
|
| 68 |
*/ |
|
| 69 |
public final static int BEFORE = 2; |
|
| 70 |
/** |
|
| 71 |
* Value used to specify the insertion after an element. |
|
| 72 |
*/ |
|
| 73 |
public final static int AFTER = 3; |
|
| 74 |
|
|
| 75 |
/** |
|
| 58 | 76 |
* <p>Adds a listener of events produced on a collection of layers.</p> |
| 59 | 77 |
* |
| 60 | 78 |
* @param listener a <code>LayerCollectionListener</code> |
| ... | ... | |
| 87 | 105 |
public void addLayer(FLayer layer) throws CancelationException, LoadLayerException; |
| 88 | 106 |
|
| 89 | 107 |
/** |
| 108 |
* <p>Adds a new layer to this collection before or after an element if supplied, |
|
| 109 |
* and if not at the beginning or end of the collection.</p>.</p> |
|
| 110 |
* |
|
| 111 |
* @param layer a FLayer to move |
|
| 112 |
* @param group a LayerCollection in which the layer has to be moved |
|
| 113 |
* @param where the position parameter. The valid values are:<br> |
|
| 114 |
* 0 = BEGIN (first position)<br> |
|
| 115 |
* 1 = END (last position)<br> |
|
| 116 |
* 2 = BEFORE (before target layer)<br> |
|
| 117 |
* 3 = AFTER (after target layer)<br> |
|
| 118 |
* |
|
| 119 |
* @param adjoiningLayer a FLayer a layer adjacent to where to insert the layer. |
|
| 120 |
* |
|
| 121 |
* @throws CancelationException any exception produced during the cancellation of the driver. |
|
| 122 |
* @throws LoadLayerException any exception produced loading the layer. |
|
| 123 |
* |
|
| 124 |
* @see #moveTo(FLayer, LayerCollection, int, FLayer) |
|
| 125 |
*/ |
|
| 126 |
public void addLayer(FLayer layer, int where, FLayer adjoiningLayer) throws LayerNotFoundInCollectionException ; |
|
| 127 |
|
|
| 128 |
/** |
|
| 90 | 129 |
* <p>Moves a layer of the collection to another position in internal list. It doesn't consider sub-nodes of layers.</p> |
| 91 | 130 |
* |
| 92 | 131 |
* @param from origin position |
| ... | ... | |
| 203 | 242 |
|
| 204 | 243 |
|
| 205 | 244 |
public void beginDraw(Graphics2D g, ViewPort viewPort); |
| 206 |
public void endDraw(Graphics2D g, ViewPort viewPort); |
|
| 245 |
public void endDraw(Graphics2D g, ViewPort viewPort); |
|
| 246 |
|
|
| 247 |
/** |
|
| 248 |
* <p>Moves a layer from this collection to another collection |
|
| 249 |
* before or after an element if supplied, |
|
| 250 |
* and if not at the beginning or end of the collection.</p> |
|
| 251 |
* |
|
| 252 |
* @param layer a FLayer to move |
|
| 253 |
* @param group a LayerCollection in which the layer has to be moved |
|
| 254 |
* @param where the position parameter. The valid values are:<br> |
|
| 255 |
* 0 = BEGIN (first position)<br> |
|
| 256 |
* 1 = END (last position)<br> |
|
| 257 |
* 2 = BEFORE (before target layer)<br> |
|
| 258 |
* 3 = AFTER (after target layer)<br> |
|
| 259 |
* |
|
| 260 |
* @param adjoiningLayer a FLayer a layer adjacent to where to insert the layer. |
|
| 261 |
* @throws LayerNotFoundInCollectionException |
|
| 262 |
* |
|
| 263 |
* @see #addLayer(FLayer, int, FLayer) |
|
| 264 |
*/ |
|
| 265 |
public void move(FLayer layer, LayerCollection group, int where, FLayer adjoiningLayer) throws LayerNotFoundInCollectionException; |
|
| 266 |
|
|
| 267 |
/** |
|
| 268 |
* <p>Moves a layer from this collection to the end of another collection.</p> |
|
| 269 |
* |
|
| 270 |
* @param layer a FLayer to move |
|
| 271 |
* @param group a LayerCollection in which the layer has to be moved |
|
| 272 |
* @throws LayerNotFoundInCollectionException |
|
| 273 |
* |
|
| 274 |
*/ |
|
| 275 |
public void move(FLayer layer, LayerCollection group); |
|
| 207 | 276 |
|
| 277 |
|
|
| 208 | 278 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/operations/LayerNotFoundInCollectionException.java | ||
|---|---|---|
| 1 |
package org.gvsig.fmap.mapcontext.layers.operations; |
|
| 2 |
|
|
| 3 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
|
| 4 |
import org.gvsig.tools.exception.BaseException; |
|
| 5 |
|
|
| 6 |
public class LayerNotFoundInCollectionException extends BaseException {
|
|
| 7 |
|
|
| 8 |
/** |
|
| 9 |
* |
|
| 10 |
*/ |
|
| 11 |
private static final long serialVersionUID = 1936414534310013616L; |
|
| 12 |
private final static String MESSAGE_FORMAT = "Layer '%(layer)' not found in collection '%(collection)'."; |
|
| 13 |
private final static String MESSAGE_KEY = "_LayerNotFoundInCollectionException"; |
|
| 14 |
|
|
| 15 |
public LayerNotFoundInCollectionException(FLayer layer, LayerCollection collection){
|
|
| 16 |
super(MESSAGE_FORMAT, MESSAGE_KEY, serialVersionUID); |
|
| 17 |
setValue("layer", layer.getName());
|
|
| 18 |
setValue("collection", collection.toString());
|
|
| 19 |
} |
|
| 20 |
|
|
| 21 |
} |
|
| 0 | 22 | |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/FLayers.java | ||
|---|---|---|
| 60 | 60 |
import org.gvsig.fmap.dal.exception.ReadException; |
| 61 | 61 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 62 | 62 |
import org.gvsig.fmap.mapcontext.MapContext; |
| 63 |
import org.gvsig.fmap.mapcontext.MapContextRuntimeException; |
|
| 63 | 64 |
import org.gvsig.fmap.mapcontext.Messages; |
| 64 | 65 |
import org.gvsig.fmap.mapcontext.ViewPort; |
| 65 | 66 |
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException; |
| 66 | 67 |
import org.gvsig.fmap.mapcontext.layers.operations.ComposedLayer; |
| 67 | 68 |
import org.gvsig.fmap.mapcontext.layers.operations.InfoByPoint; |
| 68 | 69 |
import org.gvsig.fmap.mapcontext.layers.operations.LayerCollection; |
| 70 |
import org.gvsig.fmap.mapcontext.layers.operations.LayerNotFoundInCollectionException; |
|
| 69 | 71 |
import org.gvsig.fmap.mapcontext.layers.operations.LayersVisitable; |
| 70 | 72 |
import org.gvsig.fmap.mapcontext.layers.operations.LayersVisitor; |
| 71 | 73 |
import org.gvsig.fmap.mapcontext.rendering.legend.styling.ILabelable; |
| ... | ... | |
| 95 | 97 |
*/ |
| 96 | 98 |
public class FLayers extends FLyrDefault implements LayerCollection, |
| 97 | 99 |
InfoByPoint {
|
| 100 |
|
|
| 101 |
|
|
| 98 | 102 |
/** |
| 99 | 103 |
* List with all listeners registered for this kind of node. |
| 100 | 104 |
* |
| ... | ... | |
| 190 | 194 |
*/ |
| 191 | 195 |
private void doAddLayer(int pos,FLayer layer) {
|
| 192 | 196 |
layers.add(pos,layer); |
| 197 |
ToolsLocator.getDisposableManager().bind(layer); |
|
| 193 | 198 |
layer.setParentLayer(this); |
| 194 | 199 |
IProjection layerProj = layer.getProjection(); |
| 195 | 200 |
if(layerProj != null && fmap != null) {
|
| ... | ... | |
| 289 | 294 |
public void removeLayer(int idLayer) {
|
| 290 | 295 |
FLayer lyr = (FLayer) layers.get(idLayer); |
| 291 | 296 |
callLayerRemoving(LayerCollectionEvent.createLayerRemovingEvent(lyr)); |
| 292 |
layers.remove(idLayer); |
|
| 293 |
this.updateDrawVersion(); |
|
| 297 |
this.doRemoveLayer(lyr); |
|
| 298 |
// layers.remove(idLayer); |
|
| 299 |
// this.updateDrawVersion(); |
|
| 294 | 300 |
callLayerRemoved(LayerCollectionEvent.createLayerRemovedEvent(lyr)); |
| 295 | 301 |
} |
| 296 | 302 |
|
| ... | ... | |
| 341 | 347 |
} |
| 342 | 348 |
callLayerAdding(LayerCollectionEvent.createLayerAddingEvent(layer)); |
| 343 | 349 |
|
| 344 |
layers.add(i,layer); |
|
| 345 |
layer.setParentLayer(this); |
|
| 346 |
|
|
| 350 |
// layers.add(i,layer); |
|
| 351 |
// layer.setParentLayer(this); |
|
| 352 |
this.doAddLayer(i, layer); |
|
| 353 |
|
|
| 347 | 354 |
callLayerAdded(LayerCollectionEvent.createLayerAddedEvent(layer)); |
| 348 | 355 |
break; |
| 349 | 356 |
} |
| ... | ... | |
| 1315 | 1322 |
} |
| 1316 | 1323 |
} |
| 1317 | 1324 |
} |
| 1325 |
|
|
| 1326 |
public void move(FLayer layer, LayerCollection group, int where, FLayer adjoiningLayer) throws LayerNotFoundInCollectionException{
|
|
| 1318 | 1327 |
|
| 1328 |
callLayerRemoving(LayerCollectionEvent.createLayerRemovingEvent(layer)); |
|
| 1329 |
group.addLayer(layer, where, adjoiningLayer); |
|
| 1330 |
removeLayer(layer); |
|
| 1331 |
this.updateDrawVersion(); |
|
| 1332 |
callLayerRemoved(LayerCollectionEvent.createLayerRemovedEvent(layer)); |
|
| 1333 |
|
|
| 1334 |
} |
|
| 1335 |
|
|
| 1336 |
public void move(FLayer layer, LayerCollection group){
|
|
| 1337 |
try {
|
|
| 1338 |
move(layer, group, END, null); |
|
| 1339 |
} catch (LayerNotFoundInCollectionException e){
|
|
| 1340 |
throw new MapContextRuntimeException(e); |
|
| 1341 |
} |
|
| 1342 |
} |
|
| 1343 |
|
|
| 1344 |
public void addLayer(FLayer layer, int where, FLayer adjoiningLayer) |
|
| 1345 |
throws LayerNotFoundInCollectionException {
|
|
| 1346 |
|
|
| 1347 |
switch (where) {
|
|
| 1348 |
case BEGIN: |
|
| 1349 |
addLayer(0,layer); |
|
| 1350 |
break; |
|
| 1351 |
case BEFORE: |
|
| 1352 |
if (adjoiningLayer!=null){
|
|
| 1353 |
if (this.layers.contains(adjoiningLayer)){
|
|
| 1354 |
for(int i=0; i<this.getLayersCount(); i++){
|
|
| 1355 |
if(adjoiningLayer==this.getLayer(i)){
|
|
| 1356 |
addLayer(i, layer); |
|
| 1357 |
break; |
|
| 1358 |
} |
|
| 1359 |
} |
|
| 1360 |
} else {
|
|
| 1361 |
throw new LayerNotFoundInCollectionException(adjoiningLayer, this); |
|
| 1362 |
} |
|
| 1363 |
} else {
|
|
| 1364 |
addLayer(0,layer); |
|
| 1365 |
} |
|
| 1366 |
break; |
|
| 1367 |
case AFTER: |
|
| 1368 |
if (adjoiningLayer!=null){
|
|
| 1369 |
if (this.layers.contains(adjoiningLayer)){
|
|
| 1370 |
for(int i=0; i<this.getLayersCount(); i++){
|
|
| 1371 |
if(adjoiningLayer==this.getLayer(i)){
|
|
| 1372 |
addLayer(i+1, layer); |
|
| 1373 |
break; |
|
| 1374 |
} |
|
| 1375 |
} |
|
| 1376 |
} else {
|
|
| 1377 |
throw new LayerNotFoundInCollectionException(adjoiningLayer, this); |
|
| 1378 |
} |
|
| 1379 |
} else {
|
|
| 1380 |
this.addLayer(layer); |
|
| 1381 |
} |
|
| 1382 |
break; |
|
| 1383 |
default: // By default add layer an the end of the collection |
|
| 1384 |
this.addLayer(layer); |
|
| 1385 |
break; |
|
| 1386 |
} |
|
| 1387 |
|
|
| 1388 |
} |
|
| 1389 |
|
|
| 1319 | 1390 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/FLyrVect.java | ||
|---|---|---|
| 83 | 83 |
import org.gvsig.fmap.mapcontext.exceptions.ReloadLayerException; |
| 84 | 84 |
import org.gvsig.fmap.mapcontext.exceptions.ReprojectLayerException; |
| 85 | 85 |
import org.gvsig.fmap.mapcontext.exceptions.StartEditionLayerException; |
| 86 |
import org.gvsig.fmap.mapcontext.exceptions.StopEditionLayerException; |
|
| 86 | 87 |
import org.gvsig.fmap.mapcontext.layers.FLayer; |
| 87 | 88 |
import org.gvsig.fmap.mapcontext.layers.FLyrDefault; |
| 88 | 89 |
import org.gvsig.fmap.mapcontext.layers.LayerEvent; |
| ... | ... | |
| 868 | 869 |
* |
| 869 | 870 |
* @return if this layer has the ability to proces spatial queries without |
| 870 | 871 |
* secuential scans. |
| 872 |
* @throws StopEditionLayerException |
|
| 871 | 873 |
*/ |
| 872 | 874 |
// public boolean isSpatiallyIndexed() {
|
| 873 | 875 |
// ReadableVectorial source = getSource(); |
| ... | ... | |
| 918 | 920 |
|
| 919 | 921 |
public void setEditing(boolean b) throws StartEditionLayerException {
|
| 920 | 922 |
super.setEditing(b); |
| 923 |
FeatureStore fs = getFeatureStore(); |
|
| 921 | 924 |
if (b) {
|
| 922 | 925 |
try {
|
| 923 |
getFeatureStore().edit();
|
|
| 926 |
fs.edit();
|
|
| 924 | 927 |
} catch (ReadException e) {
|
| 925 | 928 |
throw new StartEditionLayerException(getName(), e); |
| 926 | 929 |
} catch (DataException e) {
|
| ... | ... | |
| 929 | 932 |
} |
| 930 | 933 |
setSpatialCacheEnabled(b); |
| 931 | 934 |
callEditionChanged(LayerEvent.createEditionChangedEvent(this, "edition")); |
| 932 |
|
|
| 933 | 935 |
} |
| 934 | 936 |
|
| 935 | 937 |
/** |
| ... | ... | |
| 1349 | 1351 |
|| event.getType() == FeatureStoreNotification.RESOURCE_CHANGED) {
|
| 1350 | 1352 |
this.setAvailable(false); |
| 1351 | 1353 |
|
| 1352 |
// try {
|
|
| 1353 |
// reload();
|
|
| 1354 |
// } catch (ReloadLayerException e) {
|
|
| 1355 |
// this.setAvailable(false);
|
|
| 1356 |
// }
|
|
| 1354 |
// try {
|
|
| 1355 |
// reload();
|
|
| 1356 |
// } catch (ReloadLayerException e) {
|
|
| 1357 |
// this.setAvailable(false);
|
|
| 1358 |
// }
|
|
| 1357 | 1359 |
|
| 1358 | 1360 |
} else |
| 1359 |
if (event.getType() == FeatureStoreNotification.AFTER_FINISHEDITING) {
|
|
| 1360 |
|
|
| 1361 |
}
|
|
| 1361 |
if (event.getType() == FeatureStoreNotification.AFTER_FINISHEDITING) {
|
|
| 1362 |
this.setAvailable(true); |
|
| 1363 |
}
|
|
| 1362 | 1364 |
} |
| 1363 | 1365 |
|
| 1364 | 1366 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/impl/DefaultMapContextManager.java | ||
|---|---|---|
| 510 | 510 |
legend = (IVectorLegend) dataStore.invokeDynMethod( |
| 511 | 511 |
"getLegend", null); |
| 512 | 512 |
} catch (DynMethodNotSupportedException e) {
|
| 513 |
LOG.info("Can't load the specific legend provided for the store {}.", dataStore.getName(), e);
|
|
| 513 |
LOG.info("This store {} can not provide a legend.", dataStore.getName(), e);
|
|
| 514 | 514 |
} catch (DynMethodException e) {
|
| 515 | 515 |
LOG.error("Can't load the specific legend provided for the store {}.", dataStore.getName(), e);
|
| 516 | 516 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/MapContext.java | ||
|---|---|---|
| 45 | 45 |
import java.awt.Graphics2D; |
| 46 | 46 |
import java.awt.geom.Rectangle2D; |
| 47 | 47 |
import java.awt.image.BufferedImage; |
| 48 |
import java.text.MessageFormat; |
|
| 48 | 49 |
import java.util.ArrayList; |
| 49 | 50 |
import java.util.List; |
| 50 | 51 |
|
| 51 | 52 |
import org.cresques.cts.ICoordTrans; |
| 52 | 53 |
import org.cresques.cts.IProjection; |
| 53 | 54 |
import org.cresques.geo.Projected; |
| 55 |
import org.slf4j.Logger; |
|
| 56 |
import org.slf4j.LoggerFactory; |
|
| 57 |
|
|
| 54 | 58 |
import org.gvsig.compat.CompatLocator; |
| 55 | 59 |
import org.gvsig.compat.print.PrintAttributes; |
| 56 | 60 |
import org.gvsig.fmap.dal.exception.ReadException; |
| ... | ... | |
| 60 | 64 |
import org.gvsig.fmap.geom.GeometryManager; |
| 61 | 65 |
import org.gvsig.fmap.geom.exception.CreateEnvelopeException; |
| 62 | 66 |
import org.gvsig.fmap.geom.primitive.Envelope; |
| 63 |
import org.gvsig.fmap.mapcontext.MapContext.LayerEventListener; |
|
| 64 | 67 |
import org.gvsig.fmap.mapcontext.events.ErrorEvent; |
| 65 | 68 |
import org.gvsig.fmap.mapcontext.events.listeners.AtomicEventListener; |
| 66 | 69 |
import org.gvsig.fmap.mapcontext.events.listeners.ErrorListener; |
| ... | ... | |
| 91 | 94 |
import org.gvsig.tools.persistence.exception.PersistenceException; |
| 92 | 95 |
import org.gvsig.tools.task.Cancellable; |
| 93 | 96 |
import org.gvsig.tools.visitor.Visitor; |
| 94 |
import org.slf4j.Logger; |
|
| 95 |
import org.slf4j.LoggerFactory; |
|
| 96 | 97 |
|
| 97 | 98 |
|
| 98 | 99 |
/** |
| ... | ... | |
| 107 | 108 |
* <li>an {@link EventBuffer EventButter}
|
| 108 | 109 |
* <li>some {@link com.iver.cit.gvsig.fmap.layers.LegendListener LegendListener}s
|
| 109 | 110 |
* <li>some {@link LayerDrawingListener LayerDrawingListener}s
|
| 110 |
* <li>some {@link LayerEventListener LayerEventListener}s
|
|
| 111 | 111 |
* <li>some {@link ErrorListener ErrorListener}s
|
| 112 | 112 |
* </ul> |
| 113 | 113 |
* </p> |
| ... | ... | |
| 192 | 192 |
private static final MapContextManager mapContextManager = MapContextLocator |
| 193 | 193 |
.getMapContextManager(); |
| 194 | 194 |
|
| 195 |
private static final Logger logger = LoggerFactory.getLogger(GeometryManager.class);
|
|
| 195 |
private static final Logger logger = LoggerFactory.getLogger(MapContext.class);
|
|
| 196 | 196 |
|
| 197 | 197 |
/** |
| 198 | 198 |
* <p>Determines the number of frames.</p> |
| ... | ... | |
| 376 | 376 |
* |
| 377 | 377 |
* @see #getGraphicsLayer() |
| 378 | 378 |
* @see #setGraphicsLayer(GraphicLayer) |
| 379 |
* @see #drawGraphics(BufferedImage, Graphics2D, Cancellable, double) |
|
| 380 | 379 |
* @see #print(Graphics2D, double, PrintAttributes) |
| 381 | 380 |
*/ |
| 382 | 381 |
private GraphicLayer tracLayer = null; |
| ... | ... | |
| 764 | 763 |
* @throws ReadDriverException |
| 765 | 764 |
* if fails reading with driver. |
| 766 | 765 |
* |
| 767 |
* @see FLayers#print(Graphics2D, ViewPort, Cancellable, double, |
|
| 768 |
* PrintAttributes) |
|
| 769 | 766 |
* @see GraphicLayer#draw(BufferedImage, Graphics2D, ViewPort, Cancellable, |
| 770 | 767 |
* double) |
| 771 | 768 |
*/ |
| ... | ... | |
| 831 | 828 |
{
|
| 832 | 829 |
FLayer lyr = antLayers.getLayer(i); |
| 833 | 830 |
try {
|
| 834 |
aux.addLayer(lyr.cloneLayer()); |
|
| 831 |
FLayer auxLayer = lyr.cloneLayer(); |
|
| 832 |
aux.addLayer(auxLayer); |
|
| 833 |
auxLayer.dispose(); |
|
| 835 | 834 |
} catch (Exception e) {
|
| 836 | 835 |
throw new RuntimeException(e); |
| 837 | 836 |
} |
| ... | ... | |
| 1064 | 1063 |
*/ |
| 1065 | 1064 |
public void draw(BufferedImage image, Graphics2D g, Cancellable cancel, |
| 1066 | 1065 |
double scale) throws ReadException, MapContextException {
|
| 1067 |
if (viewPort.getExtent() == null) {
|
|
| 1066 |
if (viewPort.getEnvelope() == null) {
|
|
| 1068 | 1067 |
return; |
| 1069 | 1068 |
} |
| 1070 | 1069 |
|
| 1071 | 1070 |
CompatLocator.getGraphicsUtils().setRenderingHintsForDrawing(g); |
| 1072 | 1071 |
|
| 1073 |
long t1 = System.currentTimeMillis(); |
|
| 1074 |
|
|
| 1075 | 1072 |
this.getMapContextDrawer().draw(this.layers, image, g, cancel, scale); |
| 1076 | 1073 |
|
| 1077 | 1074 |
if (tracLayer != null) {
|
| ... | ... | |
| 1086 | 1083 |
fireLayerDrawingEvent(afterTracLayerEvent); |
| 1087 | 1084 |
} |
| 1088 | 1085 |
|
| 1089 |
long t2 = System.currentTimeMillis(); |
|
| 1090 |
System.err.println("Tiempo de dibujado:" + (t2 - t1) +
|
|
| 1091 |
" mseg. Memoria libre:" + Runtime.getRuntime().freeMemory() / 1024 + " KB"); |
|
| 1092 | 1086 |
System.gc(); |
| 1093 | 1087 |
} |
| 1094 | 1088 |
|
| ... | ... | |
| 1276 | 1270 |
public void layerAdded(LayerCollectionEvent e) {
|
| 1277 | 1271 |
// Si es la primera capa, fijamos su extent al ViewPort |
| 1278 | 1272 |
// if (getLayers().getLayersCount() == 1) {
|
| 1279 |
if (getViewPort().getExtent() == null) {
|
|
| 1273 |
if (getViewPort().getEnvelope() == null) {
|
|
| 1280 | 1274 |
FLayer lyr = e.getAffectedLayer(); |
| 1281 | 1275 |
if (lyr.isAvailable()) {
|
| 1282 | 1276 |
try {
|
| 1283 | 1277 |
getViewPort().setEnvelope(lyr.getFullEnvelope()); |
| 1284 |
} catch (ReadException e1) {
|
|
| 1285 |
e1.printStackTrace(); |
|
| 1278 |
} catch (ReadException ex) {
|
|
| 1279 |
logger.error( |
|
| 1280 |
MessageFormat.format( |
|
| 1281 |
"Can't set envelope to view port from layer {0}",
|
|
| 1282 |
new Object[] {lyr.getName() }
|
|
| 1283 |
), |
|
| 1284 |
ex |
|
| 1285 |
); |
|
| 1286 | 1286 |
} |
| 1287 | 1287 |
} |
| 1288 | 1288 |
} |
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/rendering/symbols/impl/DefaultSymbolPreferences.java | ||
|---|---|---|
| 40 | 40 |
*/ |
| 41 | 41 |
public class DefaultSymbolPreferences implements SymbolPreferences {
|
| 42 | 42 |
|
| 43 |
private String symbolFileExtension = ".sym.zip";
|
|
| 43 |
private String symbolFileExtension = ".gvssym";
|
|
| 44 | 44 |
|
| 45 | 45 |
private Color defaultSymbolColor; |
| 46 | 46 |
|
| branches/dal_time_support/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/exceptions/CreateLayerException.java | ||
|---|---|---|
| 1 |
package org.gvsig.fmap.mapcontext.exceptions; |
|
| 2 |
|
|
| 3 |
import org.gvsig.fmap.mapcontext.MapContextException; |
|
| 4 |
/** |
|
| 5 |
* @author Vicente Caballero Navarro |
|
| 6 |
*/ |
|
| 7 |
public class CreateLayerException extends MapContextException {
|
|
| 8 |
/** |
|
| 9 |
* |
|
| 10 |
*/ |
|
| 11 |
private static final long serialVersionUID = 7923597739786110983L; |
|
| 12 |
|
|
| 13 |
|
|
| 14 |
protected CreateLayerException(String message, Throwable cause, String key, |
|
| 15 |
long code) {
|
|
| 16 |
super(message, cause, key, code); |
|
| 17 |
} |
|
| 18 |
|
|
| 19 |
|
|
| 20 |
public CreateLayerException(String layer,Throwable cause) {
|
|
| 21 |
super( |
|
| 22 |
"Can?t create the layer %(layer).", |
|
| 23 |
cause, |
|
| 24 |
"Cant_create_the_layer_XlayerX", |
|
| 25 |
serialVersionUID |
|
| 26 |
); |
|
| 27 |
setValue("layer", layer);
|
|
| 28 |
} |
|
| 29 |
|
|
| 30 |
|
|
| 31 |
public CreateLayerException(String layer) {
|
|
| 32 |
super( |
|
| 33 |
"Can?t create the layer %(layer).", |
|
| 34 |
"Cant_create_the_layer_XlayerX", |
|
| 35 |
serialVersionUID |
|
| 36 |
); |
|
| 37 |
setValue("layer", layer);
|
|
| 38 |
} |
|
| 39 |
|
|
| 40 |
|
|
| 41 |
} |
|
| 0 | 42 | |
| branches/dal_time_support/libraries/libFMap_mapcontext/pom.xml | ||
|---|---|---|
| 14 | 14 |
<groupId>org.gvsig</groupId> |
| 15 | 15 |
<artifactId>gvsig-base-library-pom</artifactId> |
| 16 | 16 |
<version>2.0-SNAPSHOT</version> |
| 17 |
</parent> |
|
| 18 |
<distributionManagement> |
|
| 19 |
<site> |
|
| 20 |
<id>gvsig-repository</id> |
|
| 21 |
<url>${site-repository}/</url>
|
|
| 22 |
</site> |
|
| 23 |
</distributionManagement> |
|
| 17 |
</parent>
|
|
| 18 |
<distributionManagement>
|
|
| 19 |
<site>
|
|
| 20 |
<id>gvsig-repository</id>
|
|
| 21 |
<url>${site-repository}/</url>
|
|
| 22 |
</site>
|
|
| 23 |
</distributionManagement>
|
|
| 24 | 24 |
|
| 25 | 25 |
<dependencies> |
| 26 | 26 |
<dependency> |
| 27 | 27 |
<groupId>org.gvsig</groupId> |
| 28 | 28 |
<artifactId>org.gvsig.tools.lib</artifactId> |
| 29 |
<scope>compile</scope> |
|
| 29 | 30 |
</dependency> |
| 30 |
|
|
| 31 | 31 |
<dependency> |
| 32 | 32 |
<groupId>org.gvsig</groupId> |
| 33 | 33 |
<artifactId>org.gvsig.tools.lib</artifactId> |
| 34 | 34 |
<type>test-jar</type> |
| 35 |
<scope>test</scope> |
|
| 36 | 35 |
</dependency> |
| 37 |
|
|
| 38 | 36 |
<dependency> |
| 39 | 37 |
<groupId>org.gvsig</groupId> |
| 40 | 38 |
<artifactId>org.gvsig.compat</artifactId> |
| 41 |
<version>2.0-SNAPSHOT</version>
|
|
| 39 |
<scope>compile</scope>
|
|
| 42 | 40 |
</dependency> |
| 43 | 41 |
<dependency> |
| 44 | 42 |
<groupId>org.gvsig</groupId> |
| 45 | 43 |
<artifactId>org.gvsig.projection</artifactId> |
| 46 |
<version>2.0-SNAPSHOT</version>
|
|
| 44 |
<scope>compile</scope>
|
|
| 47 | 45 |
</dependency> |
| 48 | 46 |
<dependency> |
| 49 | 47 |
<groupId>org.gvsig</groupId> |
| 50 | 48 |
<artifactId>org.gvsig.fmap.geometry</artifactId> |
| 51 |
<version>2.0-SNAPSHOT</version>
|
|
| 49 |
<scope>compile</scope>
|
|
| 52 | 50 |
</dependency> |
| 53 | 51 |
<dependency> |
| 54 | 52 |
<groupId>org.gvsig</groupId> |
| 55 | 53 |
<artifactId>org.gvsig.fmap.geometry</artifactId> |
| 56 |
<version>2.0-SNAPSHOT</version> |
|
| 57 | 54 |
<classifier>operation</classifier> |
| 55 |
<scope>compile</scope> |
|
| 58 | 56 |
</dependency> |
| 59 | 57 |
<dependency> |
| 60 | 58 |
<groupId>org.gvsig</groupId> |
| 61 | 59 |
<artifactId>org.gvsig.fmap.dal</artifactId> |
| 62 |
<version>2.0-SNAPSHOT</version>
|
|
| 60 |
<scope>compile</scope>
|
|
| 63 | 61 |
</dependency> |
| 62 |
<dependency> |
|
| 63 |
<groupId>org.gvsig</groupId> |
|
| 64 |
<artifactId>org.gvsig.metadata.lib.basic.api</artifactId> |
|
| 65 |
<scope>compile</scope> |
|
| 66 |
</dependency> |
|
| 67 |
<dependency> |
|
| 68 |
<groupId>org.slf4j</groupId> |
|
| 69 |
<artifactId>slf4j-api</artifactId> |
|
| 70 |
<scope>compile</scope> |
|
| 71 |
</dependency> |
|
| 64 | 72 |
<dependency> |
| 65 | 73 |
<groupId>com.vividsolutions</groupId> |
| 66 | 74 |
<artifactId>jts</artifactId> |
| 75 |
<scope>compile</scope> |
|
| 67 | 76 |
</dependency> |
| 68 | 77 |
<dependency> |
| 69 | 78 |
<groupId>easymock</groupId> |
Also available in: Unified diff