Revision 22021

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/enhanced/ui/SelectorsPanel.java
22 22
import java.awt.GridBagLayout;
23 23
import java.awt.Insets;
24 24
import java.awt.event.ActionListener;
25
import java.util.ArrayList;
26 25

  
27 26
import javax.swing.BorderFactory;
28 27
import javax.swing.JLabel;
......
57 56
	 * @param graphicBase Grafica donde estan los histogramas, para saber como
58 57
	 *          rellenar el combo de colores
59 58
	 */
60
	public SelectorsPanel(FLyrRasterSE lyr, ArrayList list, HistogramGraphicBase graphicBase) {
59
	public SelectorsPanel(FLyrRasterSE lyr, HistogramGraphicBase graphicBase) {
61 60
		this.graphicBase = graphicBase;
62
		init(lyr, list);
61
		init(lyr);
63 62
	}
64 63
	
65 64
	/**
66 65
	 * Inicializaci?n de los controles gr?ficos.
67 66
	 */
68
	private void init(FLyrRasterSE lyr, ArrayList list) {
67
	private void init(FLyrRasterSE lyr) {
69 68
		GridBagConstraints gridBagConstraints = null;
70 69

  
71 70
		setBorder(BorderFactory.createTitledBorder(null, null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/enhanced/ui/EnhancedDialog.java
49 49
	private FLyrRasterSE        lyr              = null;
50 50
	private PreviewFiltering    filteredPreview  = null;
51 51
	private SelectorsPanel      controlsPanel    = null;
52
	private CreateLayerPanel layerPanel       = null;
52
	private CreateLayerPanel    layerPanel       = null;
53 53
	private String              viewName         = null;
54 54
	
55 55
	/**
......
59 59
	 * @param width Ancho
60 60
	 * @param height Alto
61 61
	 */
62
	public EnhancedDialog(FLyrRasterSE lyr, ArrayList lyrs, int width, int height) {
62
	public EnhancedDialog(FLyrRasterSE lyr, int width, int height) {
63 63
		this.setPreferredSize(new Dimension(width, height));
64 64
		this.setSize(width, height);
65 65
		this.setLayout(new BorderLayout(5, 5));
......
68 68
		graphicsPanel = new GraphicsPanel(this.lyr);
69 69
		filteredPreview = new PreviewFiltering();
70 70
		filteredPreview.setFilterStatus(this.lyr.getRender().getFilterList().getStatusCloned());
71
		controlsPanel = new SelectorsPanel(this.lyr, lyrs, graphicsPanel.getInputHistogram());
71
		controlsPanel = new SelectorsPanel(this.lyr, graphicsPanel.getInputHistogram());
72 72
				
73 73
		this.add(getPreviewBasePanel(), BorderLayout.CENTER);
74 74
		
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/enhanced/EnhancedTocMenuEntry.java
18 18
 */
19 19
package org.gvsig.rastertools.enhanced;
20 20

  
21
import java.util.ArrayList;
22

  
23 21
import javax.swing.Icon;
24 22

  
25 23
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
......
32 30
import org.gvsig.rastertools.enhanced.ui.EnhancedDialog;
33 31
import org.gvsig.rastertools.statistics.StatisticsProcess;
34 32

  
35
import com.iver.andami.PluginServices;
36
import com.iver.andami.ui.mdiManager.IWindow;
37 33
import com.iver.cit.gvsig.fmap.layers.FLayer;
38
import com.iver.cit.gvsig.fmap.layers.FLayers;
39
import com.iver.cit.gvsig.project.documents.view.gui.View;
40 34
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
41 35
import com.iver.cit.gvsig.project.documents.view.toc.ITocItem;
42 36

  
......
48 42
public class EnhancedTocMenuEntry extends AbstractTocContextMenuAction implements IGenericToolBarMenuItem, IProcessActions {
49 43
	static private EnhancedTocMenuEntry   singleton   = null;
50 44
	private FLyrRasterSE                  lyr         = null;
51
	private ArrayList                     lyrsRaster  = null;
52 45

  
53 46
	/**
54 47
	 * Nadie puede crear una instancia a esta clase ?nica, hay que usar el
......
136 129
	public void execute(ITocItem item, FLayer[] selectedItems) {
137 130
		if ((selectedItems == null) || (selectedItems.length != 1) || (!(selectedItems[0] instanceof FLyrRasterSE)))
138 131
			return;
139
		
140
		IWindow activeWindow = PluginServices.getMDIManager().getActiveWindow();
141
		lyrsRaster = new ArrayList();
142
		
143
		if(activeWindow instanceof View) {
144
			FLayers lyrs = ((View)activeWindow).getMapControl().getMapContext().getLayers();
145
			for (int i = 0; i < lyrs.getLayersCount(); i++) {
146
				if(lyrs.getLayer(i) instanceof FLyrRasterSE)
147
					lyrsRaster.add(lyrs.getLayer(i));
148
			}
149
		}
150
		
132
				
151 133
		this.lyr = (FLyrRasterSE)selectedItems[0];
152 134
		if(!lyr.getDataSource().getStatistics().isCalculated()) {
153 135
			RasterProcess process = new StatisticsProcess();
......
171 153
	 * Lanzamos la ventana al final del proceso de calculo de estad?sticas.
172 154
	 */
173 155
	public void end(Object param) {
174
		EnhancedDialog enhancedDialog = new EnhancedDialog(lyr, lyrsRaster, 760, 421);
156
		EnhancedDialog enhancedDialog = new EnhancedDialog(lyr, 760, 421);
175 157
		RasterToolsUtil.addWindow(enhancedDialog);
176 158
	}
177 159

  

Also available in: Unified diff