Revision 12225

View differences:

trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/dialog/PropertiesRasterRegistrableDialog.java
34 34
	private RegistrableTabPanel registrable      = null;
35 35
	private ButtonsPanel        buttons          = null;
36 36
	private TreeMap             params           = new TreeMap();
37
	/**
38
	 * Nombre de la capa. Usado para destruir la ventana al eliminar la capa
39
	 */
40
	private String				layerName		 = null;
37 41

  
38
	public PropertiesRasterRegistrableDialog() {
42
	public PropertiesRasterRegistrableDialog(String lyrName) {
43
		this.layerName = layerName;
39 44
		registrable = new RegistrableTabPanel();
40 45
		buttons = new ButtonsPanel();
41 46
		new PropertiesRasterListener(this);
......
74 79
	 */
75 80
	public WindowInfo getWindowInfo() {
76 81
		WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE);
82
		if(layerName != null)
83
			m_viewinfo.setAdditionalInfo(layerName);
77 84
		m_viewinfo.setTitle(PluginServices.getText(this, "propiedades_raster"));
78 85
		m_viewinfo.setWidth(500);
79 86
		m_viewinfo.setHeight(310);
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/properties/dialog/RasterPropertiesTocMenuEntry.java
97 97
			return;
98 98

  
99 99
		if (properties == null)
100
			properties = new PropertiesRasterRegistrableDialog();
100
			properties = new PropertiesRasterRegistrableDialog(lyr.getName());
101 101

  
102 102
		//Asigna la capa a cada panel registrado para que puedan operar
103 103
		ExtensionPoints extensionPoints = ExtensionPointsSingleton.getInstance();
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/cutting/ui/CuttingDialog.java
83 83
	 */
84 84
	public WindowInfo getWindowInfo() {
85 85
		WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODELESSDIALOG);
86
		if(cuttingPanel.getFLayer() != null)
87
			m_viewinfo.setAdditionalInfo(cuttingPanel.getFLayer().getName());
86 88
		m_viewinfo.setTitle(PluginServices.getText(this, "recorte"));
87 89
		m_viewinfo.setHeight(this.getHeight());
88 90
		m_viewinfo.setWidth(this.getWidth());
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/histogram/ui/HistogramDialog.java
30 30
import com.iver.andami.PluginServices;
31 31
import com.iver.andami.ui.mdiManager.IWindow;
32 32
import com.iver.andami.ui.mdiManager.WindowInfo;
33
import com.iver.cit.gvsig.fmap.layers.FLayer;
33 34
/**
34 35
 * <code>HistogramDialog</code>. Creaci?n de la ventana de histograma para gvSIG.
35 36
 * 
......
40 41
public class HistogramDialog extends JPanel implements IWindow, ButtonsPanelListener {
41 42
	private static final long serialVersionUID = 7362459094802955247L;
42 43
	private HistogramPanel 	histogramPanel = null;
44
	private String layerName = null;
43 45

  
44 46
	/**
45 47
	 * Crea la ventana del histograma con un ancho y alto.
......
70 72
	 */
71 73
	public WindowInfo getWindowInfo() {
72 74
		WindowInfo m_viewinfo=new WindowInfo(WindowInfo.RESIZABLE | WindowInfo.MAXIMIZABLE);
73
  	m_viewinfo.setTitle(PluginServices.getText(this, "histograma"));
74
   	m_viewinfo.setHeight(this.getHeight());
75
   	m_viewinfo.setWidth(this.getWidth());
75
		if(getLayerName() != null)
76
			m_viewinfo.setAdditionalInfo(getLayerName());
77
		m_viewinfo.setTitle(PluginServices.getText(this, "histograma"));
78
		m_viewinfo.setHeight(this.getHeight());
79
		m_viewinfo.setWidth(this.getWidth());
76 80
		return m_viewinfo;
77 81
	}
78 82

  
......
120 124
			close();
121 125
		}
122 126
	}
127

  
128
	/**
129
	 * Obtiene el nombre de la capa. Esto no es necesario para la funcionalidad de histograma.
130
	 * Solo se usa para destruir el dialogo si est? abierto cuando se destruye la capa.
131
	 * @return Nombre de la capa
132
	 */
133
	public String getLayerName() {
134
		return layerName;
135
	}
136

  
137
	/**
138
	 * Asigna el nombre de la capa. Esto no es necesario para la funcionalidad de histograma.
139
	 * Solo se usa para destruir el dialogo si est? abierto cuando se destruye la capa.
140
	 * @param Nombre de la capa
141
	 */
142
	public void setLayerName(String layerName) {
143
		this.layerName = layerName;
144
	}
123 145
}
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/histogram/HistogramTocMenuEntry.java
117 117
		histogramDialog = new HistogramDialog(650, 500);
118 118

  
119 119
		histogramDialog.clearSources();
120
		histogramDialog.setLayerName(fLayer.getName());
120 121
		histogramDialog.setHistogramableSource(((FLyrRasterSE) fLayer).getRender().getLastRenderBuffer(), PluginServices.getText(this, "datos_visualizados"));
121 122
		histogramDialog.setHistogramableSource(((FLyrRasterSE) fLayer).getDatasource().getMultiRasterDataset(), PluginServices.getText(this, "imagen_completa"));
122 123
		histogramDialog.setDataType(((FLyrRasterSE) fLayer).getDataType()[0]);
trunk/extensions/extRasterTools-SE/src/org/gvsig/rastertools/filter/ui/FilterDialog.java
78 78
	 */
79 79
	public WindowInfo getWindowInfo() {
80 80
		WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODELESSDIALOG | WindowInfo.RESIZABLE | WindowInfo.MAXIMIZABLE);
81
		if(getFilterPanel().getLayer() != null)
82
			m_viewinfo.setAdditionalInfo(getFilterPanel().getLayer().getName());
81 83
		m_viewinfo.setTitle(PluginServices.getText(this, "Filtros"));
82 84
		 m_viewinfo.setHeight(this.getHeight());
83 85
		 m_viewinfo.setWidth(this.getWidth());
trunk/extensions/extRasterTools-SE/src/org/gvsig/fmap/layers/FLyrRasterSE.java
64 64
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
65 65
import com.iver.andami.PluginServices;
66 66
import com.iver.andami.messages.NotificationManager;
67
import com.iver.andami.ui.mdiManager.IWindow;
67 68
import com.iver.cit.gvsig.exceptions.layers.LoadLayerException;
68 69
import com.iver.cit.gvsig.fmap.MapControl;
69 70
import com.iver.cit.gvsig.fmap.ViewPort;
......
224 225
		filterList.setInitDataType(getDataType()[0]);
225 226
		RasterFilterListManager filterManager = new RasterFilterListManager(filterList);
226 227

  
227
		if (this.getGeoRasterMultiDataset().getPalettes()[0] != null) {
228
			GridPalette p = new GridPalette(getGeoRasterMultiDataset().getPalettes()[0]);
228
		if (this.getGeoRasterMultiDataset().getColorTables()[0] != null) {
229
			GridPalette p = new GridPalette(getGeoRasterMultiDataset().getColorTables()[0]);
229 230
			ColorTableListManager ctm = new ColorTableListManager(filterManager);
230 231
			ctm.addColorTableFilter(p);
231 232
		} else {
......
517 518
	}
518 519

  
519 520
	/**
521
	 * Escribe en el proyecto la capa actual
520 522
	 * @throws XMLException
521 523
	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperties()
522 524
	 */
......
536 538
	public void setXMLEntity03(XMLEntity xml) throws XMLException {
537 539
	}
538 540

  
541
	/**
542
	 * Recupera de disco los datos de la capa.
543
	 */
539 544
	public void setXMLEntity(XMLEntity xml)throws XMLException {
540 545
		super.setXMLEntity(xml);
541 546

  
......
702 707
	 * @return True si ha sido correcto el borrado del Listener.
703 708
	 */
704 709
	public boolean removeLayerListener(LayerListener o) {
710
		IWindow[] wList = PluginServices.getMDIManager().getAllWindows();
711
		for (int i = 0; i < wList.length; i++) {
712
			String name = wList[i].getWindowInfo().getAdditionalInfo();
713
			if( name != null && name.compareTo(getName()) == 0)
714
				PluginServices.getMDIManager().closeWindow(wList[i]);
715
		}
716
		
705 717
		if (this.isRemoveRasterFlag()) {
706 718
			dataset.close();
707 719
			this.setRemoveRasterFlag(true);

Also available in: Unified diff