Revision 15778

View differences:

trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/statistics/StatisticsListManager.java
50 50
	public StatisticsListManager(RasterFilterListManager filterListManager) {
51 51
		this.filterListManager = filterListManager;
52 52
		this.filterList = filterListManager.getFilterList();
53
		stats = (IStatistics)filterListManager.getFilterList().getParam("IStatistics");
53
		stats = (IStatistics)filterListManager.getFilterList().getEnvParam("IStatistics");
54 54
	}
55 55

  
56 56
	public static void register() {
trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/RasterFilterList.java
30 30
 * @author Nacho Brodin (nachobrodin@gmail.com)
31 31
 */
32 32
public class RasterFilterList {
33
	private IBuffer   rasterBuf  = null;
34
	private int       typeFilter = -1;
35
	private TreeMap   params     = new TreeMap();
33
	private IBuffer   rasterBuf   = null;
34
	private int       typeFilter  = -1;
35
	private TreeMap   environment = new TreeMap();
36 36

  
37 37
	// Pila de objetos Filter (Contiene un RasterFilter)
38
	private ArrayList list       = new ArrayList();
39
	private Stack     status     = new Stack();
38
	private ArrayList list        = new ArrayList();
39
	private Stack     status      = new Stack();
40 40

  
41 41
	/**
42 42
	 * A?ade un par?metro a la lista de filtros. Estos par?metros luego pueden ser
......
44 44
	 * @param key Nombre del par?metro que coincide con el nombre de la clase.
45 45
	 * @param value Objeto
46 46
	 */
47
	public void addParam(String key, Object value) {
48
		params.put(key, value);
47
	public void addEnvParam(String key, Object value) {
48
		environment.put(key, value);
49 49
	}
50 50

  
51 51
	/**
52 52
	 * Obtiene un par?metro de la lista de filtros.
53 53
	 * @param key Identificador del par?metro. Coincide con el nombre de la clase del par?metro.
54 54
	 */
55
	public Object getParam(String key) {
56
		return params.get(key);
55
	public Object getEnvParam(String key) {
56
		return environment.get(key);
57 57
	}
58 58

  
59 59
	/**
......
76 76
			list.add(filter);
77 77
			controlTypes();
78 78
		}
79
		filter.setEnv(environment);
79 80
	}
80 81

  
81 82
	/**
......
85 86
	 */
86 87
	public void replace(RasterFilter filter, String name) {
87 88
		boolean changed = false;
88

  
89
		filter.setEnv(environment);
89 90
		for (int i = list.size() - 1; i >= 0; i--)
90 91
			if (((RasterFilter) list.get(i)).getName().equals(name)) {
91 92
				list.remove(i);
......
109 110
		} catch (IndexOutOfBoundsException e) {
110 111
			add(filter);
111 112
		}
113
		filter.setEnv(environment);
112 114
	}
113 115

  
114 116
	/**
......
244 246
	 * @param i
245 247
	 */
246 248
	public void replace(RasterFilter filter, int i) {
249
		filter.setEnv(environment);
247 250
		list.remove(i);
248 251
		list.add(i, filter);
249 252
	}
......
470 473
	 * Obtiene el TreeMap con los par?metros
471 474
	 * @return TreeMap
472 475
	 */
473
	public TreeMap getParams() {
474
		return params;
476
	public TreeMap getEnv() {
477
		return environment;
475 478
	}
476 479

  
477 480
	/**
478
	 * Asigna el TreeMap con los par?metros
479
	 * @param params
481
	 * Asigna el TreeMap con los par?metros del entorno
482
	 * @param env
480 483
	 */
481
	public void setParams(TreeMap params) {
482
		this.params = params;
484
	public void setEnv(TreeMap env) {
485
		this.environment = env;
483 486
	}
484 487
}
trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/enhancement/EnhancementListManager.java
48 48
	public EnhancementListManager(RasterFilterListManager filterListManager) {
49 49
		this.filterListManager = filterListManager;
50 50
		this.filterList = filterListManager.getFilterList();
51
		stats = (IStatistics)filterList.getParam("IStatistics");
51
		stats = (IStatistics)filterList.getEnvParam("IStatistics");
52 52
	}
53 53

  
54 54
	/**
......
227 227
					tailTrim = ((Double) params.getParam(i).defaultValue).doubleValue() / 100.0;
228 228
			}
229 229

  
230
			addEnhancedFilter(removeEnds, (IStatistics) filterList.getParam("IStatistics"), tailTrim, renderBands);
230
			addEnhancedFilter(removeEnds, (IStatistics) filterList.getEnvParam("IStatistics"), tailTrim, renderBands);
231 231
		}
232 232
	}
233 233
}
trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/RasterFilter.java
19 19
package org.gvsig.raster.grid.filter;
20 20

  
21 21
import java.util.Hashtable;
22
import java.util.TreeMap;
22 23

  
23 24
import org.gvsig.raster.dataset.IBuffer;
24 25
import org.gvsig.raster.dataset.Params;
......
33 34
	protected IBuffer	 	raster = null;
34 35
	protected int 			height = 0;
35 36
	protected int 			width = 0;
36
	protected Hashtable	params = new Hashtable();
37
	protected Hashtable     params = new Hashtable();
38
	protected TreeMap       environment = new TreeMap();
37 39
	protected Extent		extent = null;
38 40
	private int 				percent = 0;
39 41
	private boolean			canceled = false;
......
319 321
	public void setName(String name) {
320 322
		fName = name;
321 323
	}
324
	
325
	/**
326
	 * Obtiene el TreeMap con los par?metros del entorno
327
	 * @return TreeMap
328
	 */
329
	public TreeMap getEnv() {
330
		return environment;
331
	}
332

  
333
	/**
334
	 * Asigna el TreeMap con los par?metros del entorno
335
	 * @param env
336
	 */
337
	public void setEnv(TreeMap env) {
338
		this.environment = env;
339
	}
322 340
}
trunk/libraries/libRaster/src/org/gvsig/raster/grid/filter/bands/ColorTableListManager.java
70 70

  
71 71
    if (filter != null) {
72 72
      filter.addParam("colorTable", palette);
73
      filter.addParam("Transparency", filterListManager.getFilterList().getParam("Transparency"));
73
      filter.addParam("Transparency", filterListManager.getFilterList().getEnvParam("Transparency"));
74 74
      filterList.add(filter);
75 75
    }
76 76
  }
trunk/libraries/libRaster/src/org/gvsig/raster/grid/Grid.java
259 259
		}
260 260
		filterList = new RasterFilterList();
261 261
		if(ds != null) {
262
			filterList.addParam("IStatistics", ds.getDataSource().getStatistics());
263
			filterList.addParam("MultiRasterDataset", ds.getDataSource());
262
			filterList.addEnvParam("IStatistics", ds.getDataSource().getStatistics());
263
			filterList.addEnvParam("MultiRasterDataset", ds.getDataSource());
264 264
		}
265
		filterList.addParam("Transparency", transparency);
265
		filterList.addEnvParam("Transparency", transparency);
266 266
		filterList.setInitRasterBuf(rasterBuf);
267 267

  
268 268
		m_dDist = new double[8];
trunk/libraries/libRaster/src/org/gvsig/raster/grid/render/Rendering.java
231 231

  
232 232
		grid = new Grid(bufferFactory, true);
233 233
		grid.setTransparency(lastTransparency);
234
		filterList.addParam("Transparency", grid.getTransparency());
234
		filterList.addEnvParam("Transparency", grid.getTransparency());
235 235
		if (filterList == null)
236 236
			filterList = grid.getFilterList();
237 237
		else
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/FilterListener.java
326 326
		ArrayList listFilterUsed = new ArrayList();
327 327

  
328 328
		RasterFilterList filterList = new RasterFilterList();
329
		filterList.setParams(rendering.getRenderFilterList().getParams());
329
		filterList.setEnv(rendering.getRenderFilterList().getEnv());
330 330
		RasterFilterListManager stackManager = new RasterFilterListManager(filterList);
331 331

  
332 332
		// Conservamos filtros no visibles ya existentes
trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/raster/layers/FLyrRasterSE.java
311 311
	 */
312 312
	private void initFilters() {
313 313
		RasterFilterList filterList = new RasterFilterList();
314
		filterList.addParam("IStatistics", getDataSource().getStatistics());
315
		filterList.addParam("MultiRasterDataset", getDataSource());
314
		filterList.addEnvParam("IStatistics", getDataSource().getStatistics());
315
		filterList.addEnvParam("MultiRasterDataset", getDataSource());
316 316
		GridTransparency gridTransparency = new GridTransparency(getDataSource().getTransparencyFilesStatus());
317 317
		// Inicializo la transparencia tanto para el filtro como para el render
318
		filterList.addParam("Transparency", gridTransparency);
318
		filterList.addEnvParam("Transparency", gridTransparency);
319 319
		getRender().setLastTransparency(gridTransparency);
320 320

  
321 321
		filterList.setInitDataType(getDataType()[0]);
......
1444 1444
		ArrayList filters = getRender().getFilterList().getStatusCloned();
1445 1445
		RasterFilterList filterList = new RasterFilterList();
1446 1446
		//TODO: Los parametros deberiamos clonarlos
1447
		filterList.setParams(getRenderFilterList().getParams());
1447
		filterList.setEnv(getRenderFilterList().getEnv());
1448 1448
		filterList.setInitDataType(getDataType()[0]);
1449 1449
		filterList.setStatus(filters);
1450 1450
		newLayer.getRender().setFilterList(filterList);

Also available in: Unified diff