Revision 600

View differences:

org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/gui/panel/WMTSParamsPanel.java
57 57
import org.gvsig.fmap.dal.coverage.store.parameter.TileDataParameters;
58 58
import org.gvsig.fmap.dal.exception.InitializeException;
59 59
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
60
import org.gvsig.fmap.mapcontext.layers.FLayer;
61 60
import org.gvsig.gui.beans.controls.dnd.JDnDListModel;
62 61
import org.gvsig.gui.beans.listeners.BeanListener;
63 62
import org.gvsig.raster.wmts.app.wmtsclient.gui.panel.format.IFormatsPanel;
......
701 700
		return tabInfo;
702 701
	}
703 702
	
704
	public FLayer[] getLayers() throws LoadLayerException {
703
	public FLyrWMTS[] getLayers() throws LoadLayerException {
705 704
		ListModel model = getLayerPanel().getLstSelectedLayers().getModel();
706
		FLayer[] layerList = new FLayer[model.getSize()];
705
		FLyrWMTS[] layerList = new FLyrWMTS[model.getSize()];
707 706
		
708 707
		for (int i = 0; i < model.getSize(); i++) {
709 708
			WMTSTheme theme = ((LayerUI)model.getElementAt(i)).theme;
org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/gui/wizard/WMTSWizard.java
56 56
import org.gvsig.raster.wmts.app.wmtsclient.gui.panel.WMTSParamsPanel;
57 57
import org.gvsig.raster.wmts.app.wmtsclient.gui.panel.main.IServerPanel;
58 58
import org.gvsig.raster.wmts.app.wmtsclient.gui.panel.main.NextPrevPanel;
59
import org.gvsig.raster.wmts.app.wmtsclient.layer.FLyrWMTS;
59 60
import org.gvsig.raster.wmts.io.WMTSDataParameters;
60 61
import org.gvsig.raster.wmts.io.WMTSServerExplorer;
61 62
import org.gvsig.raster.wmts.io.WMTSServerExplorerParameters;
......
432 433
	@Override
433 434
	public void execute() {
434 435
		try {
435
			FLayer[] layerList = wmtsParamsPanel.getLayers();
436
			FLyrWMTS[] layerList = wmtsParamsPanel.getLayers();
436 437
			for (int i = 0; i < layerList.length; i++) {
438
				layerList[i].deleteCache(serverPanel.getChkCaching().isSelected());
437 439
				getMapCtrl().getMapContext().getLayers().addLayer(layerList[i]);
438 440
			}
439 441
		} catch (LoadLayerException e) {
org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.app/org.gvsig.raster.wmts.app.wmtsclient/src/main/java/org/gvsig/raster/wmts/app/wmtsclient/layer/FLyrWMTS.java
112 112
	private RasterManager                rManager                  = RasterLocator.getManager();
113 113
	private DataStoreParameters          params                    = null;
114 114
	private WMTSServerExplorer           explorer                  = null;
115
	private boolean                      deleteCache               = false;
115 116
	//Is useful to save the last ViewPort to know the last zoom level in the screen
116 117
	//private ViewPort                     lastViewPort              = null;
117 118

  
......
250 251
				//getParameters().setExtent(ext.toRectangle2D());
251 252
				par.setWidth((int)viewPort.getImageSize().getWidth());
252 253
				par.setHeight((int)viewPort.getImageSize().getHeight());
254
				if(getDataStore().getParameters() instanceof TileDataParameters) {
255
					((TileDataParameters)getDataStore().getParameters()).deleteCache(deleteCache);
256
				}
257
				deleteCache = false;  //Se borra la cach? solo el primer dibujado si se ha solicitado
258
				
253 259
				getRender().drawTiledService(g, vp2);
254 260
			} catch (RasterDriverException e) {
255 261
				throw new ReadException("Problems drawing this layer: " + e.getMessage(), e);
......
674 680
		
675 681
		return newLayer;
676 682
	}
683

  
684
	/**
685
	 * Assigns the flag to delete this layer from the cache
686
	 * @param selected
687
	 */
688
	public void deleteCache(boolean deleteCache) {
689
		this.deleteCache = deleteCache;
690
	}
677 691
}
org.gvsig.raster.wmts/trunk/org.gvsig.raster.wmts/org.gvsig.raster.wmts.io/src/main/java/org/gvsig/raster/wmts/io/WMTSDataParameters.java
56 56
	private static final String      FIELD_EXTENT          = "extent";
57 57
	private static final String      FIELD_WIDTH           = "width";
58 58
	private static final String      FIELD_HEIGHT          = "height";
59
	private static final String      FIELD_DELETECACHE     = "deletecache";
59 60
	
60 61
	private DelegatedDynObject       delegatedDynObject    = null;
61 62
	protected static DynClass        DYNCLASS              = null;
......
155 156
			field.setType(DataTypes.INT);
156 157
			field.setMandatory(false);
157 158
			
159
			field = dynClass.addDynField(FIELD_DELETECACHE);
160
			field.setTheTypeOfAvailableValues(DynField.ANY);
161
			field.setDescription("Flag to delete cache the next request");
162
			field.setType(DataTypes.BOOLEAN);
163
			field.setMandatory(false);
164
			
158 165
			DYNCLASS = dynClass;
159 166
		}
160 167

  
......
442 449
	public boolean isSizeFixed() {
443 450
		return true;
444 451
	}
452

  
453
	public void deleteCache(boolean deleteCache) {
454
		this.setDynValue(FIELD_DELETECACHE, new Boolean(deleteCache));
455
	}
445 456
	
457
	public boolean isDeletingCache() {
458
		return ((Boolean)getDynValue(FIELD_DELETECACHE)).booleanValue();
459
	}
460
	
446 461
}
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSDataParameters.java
59 59
	private static final String      FIELD_OVERRIDE        = "override";
60 60
	private static final String      FIELD_ONLINERESOURC   = "onlineresources";
61 61
	private static final String      FIELD_DEPTH           = "depth";
62
	private static final String      FIELD_DELETECACHE     = "deletecache";
62 63
	
63 64
	private DelegatedDynObject       delegatedDynObject    = null;
64 65
	protected static DynClass        DYNCLASS              = null;
......
170 171
			field.setType(DataTypes.STRING);
171 172
			field.setMandatory(false);
172 173
			
174
			field = dynClass.addDynField(FIELD_DELETECACHE);
175
			field.setTheTypeOfAvailableValues(DynField.ANY);
176
			field.setDescription("Flag to delete cache the next request");
177
			field.setType(DataTypes.BOOLEAN);
178
			field.setMandatory(false);
179
			
173 180
			DYNCLASS = dynClass;
174 181
		}
175 182
	}
......
472 479
	public boolean isSizeFixed() {
473 480
		return true;
474 481
	}
482
	
483
	public void deleteCache(boolean deleteCache) {
484
		this.setDynValue(FIELD_DELETECACHE, new Boolean(deleteCache));
485
	}
486
	
487
	public boolean isDeletingCache() {
488
		return ((Boolean)getDynValue(FIELD_DELETECACHE)).booleanValue();
489
	}
475 490
}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.api/src/main/java/org/gvsig/fmap/dal/coverage/store/parameter/RemoteStoreParameters.java
74 74
	public void setHeight(int h);
75 75
	
76 76
	/**
77
	 * Sets the flag to delete cache
78
	 * @param deleteCache
79
	 */
80
	public void deleteCache(boolean deleteCache);
81
	
82
	/**
83
	 * Gets true if the cache is going to be deleted
84
	 * @return
85
	 */
86
	public boolean isDeletingCache();
87
	
88
	/**
77 89
	 * Clones this RemoteStoreParameters
78 90
	 * @return
79 91
	 */
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSDataParameters.java
64 64
	private static final String      FIELD_EXTENT          = "extent";
65 65
	private static final String      FIELD_WIDTH           = "width";
66 66
	private static final String      FIELD_HEIGHT          = "height";
67
	private static final String      FIELD_DELETECACHE     = "deletecache";
67 68
	
68 69
	private DelegatedDynObject       delegatedDynObject    = null;
69 70
	protected static DynClass        DYNCLASS              = null;
......
198 199
			field.setDescription("Height");
199 200
			field.setType(DataTypes.INT);
200 201
			field.setMandatory(false);
202

  
203
			field = dynClass.addDynField(FIELD_DELETECACHE);
204
			field.setTheTypeOfAvailableValues(DynField.ANY);
205
			field.setDescription("Flag to delete cache the next request");
206
			field.setType(DataTypes.BOOLEAN);
207
			field.setMandatory(false);
201 208
			
202 209
			DYNCLASS = dynClass;
203 210
		}
......
584 591
		return delegatedDynObject;
585 592
	}
586 593
	
594
	public void deleteCache(boolean deleteCache) {
595
		this.setDynValue(FIELD_DELETECACHE, new Boolean(deleteCache));
596
	}
597
	
598
	public boolean isDeletingCache() {
599
		return ((Boolean)getDynValue(FIELD_DELETECACHE)).booleanValue();
600
	}
601
	
587 602
	/*
588 603
	 * (non-Javadoc)
589 604
	 * @see java.lang.Object#clone()

Also available in: Unified diff