Revision 1169

View differences:

org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/InfoByRasterPointExtension.java
47 47
 * @author Nacho Brodin (nachobrodin@gmail.com)
48 48
 */
49 49
public class InfoByRasterPointExtension extends Extension {
50
	private InfoByPixelPointViewTool     lastTool  = null;
50
	private InfoByPixelPointViewTool     lastTool     = null;
51
	public static Behavior               oldBehavior  = null;
51 52
	
52 53
	/*
53 54
	 * (non-Javadoc)
......
82 83
					new Behavior[]{new PointBehavior(lastTool),
83 84
					new MouseMovementBehavior(sbl)});
84 85
			mapCtrl.setTool("infoByRasterPoint");
86
			oldBehavior = CompoundBehavior.getAllControlsBehavior();
85 87
			CompoundBehavior.setAllControlsBehavior(new PixelInspectorViewTool(mapCtrl, model, dialog.getPixelInspector()));
86 88
			
87 89
			model.notifyObservers();
......
113 115
			MapContext mapa = model.getMapContext();
114 116
			FLayers layers = mapa.getLayers();
115 117
			for (int i = 0; i < layers.getLayersCount(); i++)
116
				if (layers.getLayer(i) instanceof FLyrRaster)
117
					return true;
118
				if (layers.getLayer(i) instanceof FLyrRaster) {
119
					FLyrRaster lyr = (FLyrRaster)layers.getLayer(i);
120
					if(lyr.isActive())
121
						return true;
122
				}
118 123
		}
119 124
		return false;
120 125
	}
......
140 145
				"info-by-pixel",
141 146
				getClass().getClassLoader().getResource("images/infoByRasterPoint.png")
142 147
			);
148
		PluginServices.getIconTheme().registerDefault(
149
                "view-query-information",
150
                getClass().getClassLoader().getResource("images/Identify.png")
151
        );
143 152
	}
144 153
}
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/InfoByRasterPointTocMenuEntry.java
105 105
			MapContext mapa = model.getMapContext();
106 106
			FLayers layers = mapa.getLayers();
107 107
			for (int i = 0; i < layers.getLayersCount(); i++)
108
				if (layers.getLayer(i) instanceof FLyrRaster)
108
				if (layers.getLayer(i) instanceof FLyrRaster && layers.getLayer(i).isActive())
109 109
					return true;
110 110
		}
111 111
		return false;
......
116 116
	 * @see com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction#isVisible(com.iver.cit.gvsig.project.documents.view.toc.ITocItem, com.iver.cit.gvsig.fmap.layers.FLayer[])
117 117
	 */
118 118
	public boolean isVisible(ITocItem item, FLayer[] selectedItems) {
119
		return isEnabled(item, selectedItems);
119
		return true;
120 120
	}
121 121

  
122 122
	/*
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/MainInfoByPointDialog.java
29 29
import org.gvsig.andami.PluginServices;
30 30
import org.gvsig.andami.ui.mdiManager.IWindow;
31 31
import org.gvsig.andami.ui.mdiManager.WindowInfo;
32
import org.gvsig.fmap.mapcontrol.tools.CompoundBehavior;
32 33
import org.gvsig.raster.tools.app.basic.tool.infobypoint.gui.InfoByPointDataModel;
33 34
import org.gvsig.raster.tools.app.basic.tool.infobypoint.gui.MainInfoByPointPanel;
34 35
import org.gvsig.raster.tools.app.basic.tool.pixelincrease.PixelInspector;
......
77 78
		return m_viewinfo;
78 79
	}
79 80
	
81
	/*
82
	 * (non-Javadoc)
83
	 * @see com.iver.andami.ui.mdiManager.IWindowListener#windowClosed()
84
	 */
85
	public void windowClosed() {
86
		CompoundBehavior.setAllControlsBehavior(InfoByRasterPointExtension.oldBehavior);
87
	}
88
	
80 89
	public Object getWindowProfile() {
81 90
		return WindowInfo.PROPERTIES_PROFILE;
82 91
	}
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/viewtool/PixelInspectorViewTool.java
96 96
		BufferedImage image = mapCtrl.getImage();
97 97
		
98 98
		//Actualiza los datos del panel
99
		if(e.getX() >= image.getWidth() || e.getY() >= image.getHeight())
100
			return;
99 101
		int value = image.getRGB((int) point2D.getX(), (int) point2D.getY());
100 102
		int r = (value >> 16) & 0xff;
101 103
		int g = (value >> 8) & 0xff;
......
122 124
			Point2D rasterPoint = raster.getDataStore().worldToRaster(mapPoint);
123 125
			model.setNumberOfBands(raster.getDataStore().getBandCount());
124 126
			model.setPixelPoint(rasterPoint.getX(), rasterPoint.getY());
125
		} else {
127
		} /*else {
126 128
			model.setNumberOfBands(0);
127 129
			model.setBandValues(new double[]{Double.NaN});
128 130
			model.setPixelPoint(-1, -1);
129
		}
131
		}*/
130 132
		
131 133
		model.notifyObservers();
132 134
		
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/infobypoint/viewtool/InfoByPixelPointViewTool.java
108 108
				FLyrRaster raster = (FLyrRaster)lyr;
109 109
				if(raster.isInside(mapPoint)) {
110 110
					list.add(raster.getName());
111
					if(selected == null)
111
					if(raster.isActive())
112 112
						selected = raster;
113 113
				}
114 114
			}
......
120 120
			model.setBandValues(getBandValues(selected.getDataStore(), rasterPoint));
121 121
			model.setPixelPoint(rasterPoint.getX(), rasterPoint.getY());
122 122
		} else {
123
			list.clear();
123 124
			list.add("...");
124 125
			model.setNumberOfBands(0);
125 126
			model.setBandValues(new double[]{Double.NaN});
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java
1020 1020
		Point2D lr = new Point2D.Double(maxx, miny);
1021 1021
		return rManager.getDataStructFactory().createExtent(ul, lr, ur, ll);
1022 1022
	}
1023
	
1024
	public DynObjectSet getInfo(org.gvsig.fmap.geom.primitive.Point p, double tolerance) throws LoadLayerException, DataException {
1025
		Point p1 = new Point((int)p.getX(), (int)p.getY());
1026
		return getInfo(p1, tolerance, null, false);
1027
	}
1023 1028

  
1024 1029
	@Override
1025 1030
	public DynObjectSet getInfo(Point p, double tolerance, Cancellable cancel,

Also available in: Unified diff