Revision 22023

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/raster/util/RasterToolsUtil.java
60 60
	 * @return ArrayList con la lista de capas raster agrupadas o no. El orden en que aparecen
61 61
	 * en la lista es de abajo a arriba las que aparecen en el TOC.
62 62
	 */
63
	public static ArrayList getLayerList(FLayers srcLyrs, ArrayList destLyrs) {
63
	public static ArrayList getRasterLayerList(FLayers srcLyrs, ArrayList destLyrs) {
64
		if(destLyrs == null)
65
			destLyrs = new ArrayList();
64 66
		for (int i = 0; i < srcLyrs.getLayersCount(); i++) {
65 67
			if(srcLyrs.getLayer(i) instanceof FLyrRasterSE)
66 68
				destLyrs.add(srcLyrs.getLayer(i));
......
71 73
	}
72 74
	
73 75
	/**
76
	 * Obtiene la lista de capas del TOC y devuelve las raster. Si hay capas agrupadas lo tiene en cuenta y mira
77
	 * dentro de la agrupaci?n.
78
	 * @param srcLyrs FLayers de la vista
79
	 * @param destLyrs Lista de capas 
80
	 * @return ArrayList con la lista de capas raster agrupadas o no. El orden en que aparecen
81
	 * en la lista es de abajo a arriba las que aparecen en el TOC.
82
	 */
83
	public static ArrayList getLayerList(FLayers srcLyrs, ArrayList destLyrs) {
84
		if(destLyrs == null)
85
			destLyrs = new ArrayList();
86
		for (int i = 0; i < srcLyrs.getLayersCount(); i++) {
87
			if(srcLyrs.getLayer(i) instanceof FLayers)
88
				destLyrs = getLayerList((FLayers)srcLyrs.getLayer(i), destLyrs);
89
			else 
90
				destLyrs.add(srcLyrs.getLayer(i));
91
		}
92
		return destLyrs;
93
	}
94
	
95
	/**
74 96
	 * Obtiene el nombre de la vista donde est? cargada la capa que se pasa por par?metro
75 97
	 * @param layer Capa cargada en una vista
76 98
	 * @return Nombre de la vista donde est? cargada la capa.
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/generictoolbar/GenericToolBarPanel.java
25 25
import java.awt.event.ItemListener;
26 26
import java.awt.event.MouseEvent;
27 27
import java.awt.event.MouseListener;
28
import java.util.ArrayList;
28 29
import java.util.Iterator;
29 30

  
30 31
import javax.swing.JToolBar;
......
33 34
import org.gvsig.gui.beans.comboboxconfigurablelookup.JComboBoxConfigurableLookUp;
34 35
import org.gvsig.gui.beans.controls.combobutton.ComboButton;
35 36
import org.gvsig.raster.gui.IGenericToolBarMenuItem;
37
import org.gvsig.raster.util.RasterToolsUtil;
36 38

  
37 39
import com.iver.cit.gvsig.fmap.layers.FLayer;
38 40
import com.iver.cit.gvsig.fmap.layers.FLayers;
......
58 60
		initialize();
59 61
	}
60 62
	
61
	/**
63
	/**	
62 64
	 * Especifica que las capas de la vista han cambiado.
63 65
	 * @param layers
64 66
	 */
65 67
	public void setLayers(FLayers layers) {
66 68
		lastLayers = layers;
67 69

  
68

  
69 70
		getComboBoxConfigurableLookUp().setBlockPopupHided(true);
70 71
		getComboBoxConfigurableLookUp().removeAllItems();
71
		for (int i = 0; i < layers.getLayersCount(); i++) {
72
			getComboBoxConfigurableLookUp().addItem(layers.getLayer(i).getName());
73
		}
72
		
73
		ArrayList lyrs = RasterToolsUtil.getLayerList(layers, null);
74
		for (int i = 0; i < lyrs.size(); i++) 
75
			getComboBoxConfigurableLookUp().addItem(((FLayer)lyrs.get(i)).getName());
74 76

  
75 77
		if (layers.getActives().length > 0) {
76 78
			getComboBoxConfigurableLookUp().setSelectedItem(layers.getActives()[0].getName());
......
179 181
	public FLayer getLayerSelected() {
180 182
		if (lastLayers == null)
181 183
			return null;
182
		for (int i = 0; i < lastLayers.getLayersCount(); i++) {
183
			if (lastLayers.getLayer(i).getName().equals(getComboBoxConfigurableLookUp().getEditor().getItem())) {
184
				return lastLayers.getLayer(i);
185
			}
184
		ArrayList lyrs = RasterToolsUtil.getLayerList(lastLayers, null);
185
		for (int i = 0; i < lyrs.size(); i++) {
186
			if (((FLayer)lyrs.get(i)).getName().equals(getComboBoxConfigurableLookUp().getEditor().getItem())) 
187
				return (FLayer)lyrs.get(i);
186 188
		}
187 189
		return null;
188 190
	}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/RasterModule.java
18 18
 */
19 19
package org.gvsig.rastertools;
20 20

  
21
import java.util.ArrayList;
21 22
import java.util.prefs.Preferences;
22 23

  
23 24
import javax.swing.Icon;
......
472 473
					IProjectView model = vista.getModel();
473 474
					MapContext map = model.getMapContext();
474 475
					FLayers lyrs = map.getLayers();
475
					for (int j = 0; j < lyrs.getLayersCount(); j++) {
476
						if(lyrs.getLayer(j) instanceof FLyrRasterSE)
477
							((FLyrRasterSE)lyrs.getLayer(j)).getDataSource().getTransparencyFilesStatus().activeNoData(noDataTransparent);
476
					
477
					ArrayList list = RasterToolsUtil.getRasterLayerList(lyrs, null);
478
					for (int j = 0; j < list.size(); j++) {
479
						if(list.get(j) instanceof FLyrRasterSE)
480
							((FLyrRasterSE)list.get(j)).getDataSource().getTransparencyFilesStatus().activeNoData(noDataTransparent);
478 481
					}
479 482
				}	
480 483
			}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/overviews/OverviewsTocMenuEntry.java
181 181
			((FLyrRasterSE) param).reload();
182 182
		} catch (ReloadLayerException e) {
183 183
		}
184
//		try {
185
//			FLyrRasterSE layer = (FLyrRasterSE) param;
186
//			MapContext context = layer.getMapContext();
187
//			context.getLayers().removeLayer(layer);
188
//			layer = FLyrRasterSE.createLayer(layer.getName(), layer.getLoadParams(), layer.getProjection());
189
//			context.getLayers().addLayer(layer);
190
//		} catch (Exception e) {
191
//		}
192 184
	}
193 185

  
194 186
	public void propertyChange(PropertyChangeEvent evt) {}

Also available in: Unified diff