Revision 17604

View differences:

trunk/extensions/extRemoteSensing/src/org/gvsig/remotesensing/scatterplot/listener/ManagerROIChartPanelListener.java
20 20
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelEvent;
21 21
import org.gvsig.gui.beans.buttonspanel.ButtonsPanelListener;
22 22
import org.gvsig.gui.beans.table.exceptions.NotInitializeException;
23
import org.gvsig.raster.buffer.RasterBuffer;
23 24
import org.gvsig.raster.dataset.IBuffer;
24 25
import org.gvsig.raster.grid.Grid;
25 26
import org.gvsig.remotesensing.scatterplot.chart.ROIChart;
......
34 35
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
35 36
import com.iver.cit.gvsig.fmap.core.symbols.IMarkerSymbol;
36 37
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
38
import com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol;
37 39
import com.iver.cit.gvsig.fmap.layers.FLayer;
38 40
import com.iver.cit.gvsig.fmap.layers.GraphicLayer;
39 41
import com.iver.cit.gvsig.fmap.rendering.FGraphic;
......
84 86
				MapControl mapControl = view.getMapControl();
85 87
				// Recorrido del grid
86 88
				
89
				if(buffer.getDataType() == RasterBuffer.TYPE_BYTE)
90
				{
91
						for (int j=0; j<nY; j++){
92
							for(int i=0; i<nX; i++)
93
							
94
							{
95
								valorBandX= buffer.getElemByte(j,i,0);
96
								valorBandY=	buffer.getElemByte(j,i,1);
97
							 	
98
								Iterator iterator =rangos.iterator();
99
								while(iterator.hasNext()){
100
									rango=(Range[]) iterator.next();
101
									if(isInside(valorBandX,rango[0]) && isInside(valorBandY,rango[1])){					 
102
										double mapX = grid.getGridExtent().getMin().getX()+i*grid.getCellSize();
103
										double mapY = grid.getGridExtent().getMax().getY()-j*grid.getCellSize();
104
										IGeometry geometry = ShapeFactory.createPoint2D(mapX,mapY);
105
										newRoi.addGeometry(geometry); // Geometria						
106
									}
107
								}
108
							}
109
						}
110
				}
87 111
				
88
				// OJO AL PINTADO DEL PUNTO LO ESTA HACIENDO  MAL
89
				for (int j=0; j<nY; j++){
90
					for(int i=0; i<nX; i++)
91
					{
92
						valorBandX= buffer.getElemByte(j,i,0);
93
						valorBandY=	buffer.getElemByte(j,i,1);
112
				if(buffer.getDataType() == RasterBuffer.TYPE_SHORT)
113
				{
114
						for (int j=0; j<nY; j++){
115
							for(int i=0; i<nX; i++)
116
							
117
							{
118
								valorBandX= buffer.getElemShort(j,i,0);
119
								valorBandY=	buffer.getElemShort(j,i,1);
94 120
							 	
95
						 Iterator iterator =rangos.iterator();
96
						 while(iterator.hasNext()){
97
								 rango=(Range[]) iterator.next();
98
								 if(isInside(valorBandX,rango[0]) && isInside(valorBandY,rango[1])){
99
																	 
100
									double mapX = grid.getGridExtent().getMin().getX()+i*grid.getCellSize();
101
									double mapY = grid.getGridExtent().getMax().getY()-j*grid.getCellSize();
102
										
103
								   
104
									IGeometry geometry = ShapeFactory.createPoint2D(mapX,mapY);
105
									 newRoi.addGeometry(geometry);
106
								 }
107

  
108
						 }
109
										
110
					}
111
					
121
								Iterator iterator =rangos.iterator();
122
								while(iterator.hasNext()){
123
									rango=(Range[]) iterator.next();
124
									if(isInside(valorBandX,rango[0]) && isInside(valorBandY,rango[1])){					 
125
										double mapX = grid.getGridExtent().getMin().getX()+i*grid.getCellSize();
126
										double mapY = grid.getGridExtent().getMax().getY()-j*grid.getCellSize();
127
										IGeometry geometry = ShapeFactory.createPoint2D(mapX,mapY);
128
										newRoi.addGeometry(geometry);
129
									}
130
								}
131
							}
132
						}
112 133
				}
113
			
114
				drawRoi(newRoi);
134
				
135
				
136
				
137
			//	drawRoi(newRoi);
115 138
					
116 139
					
117 140
			}else if (e.getSource() == tablePanel.getDeleteButton()){
......
129 152
						// Se establece la roi activa.
130 153
						tablePanel.getDiagram().setActiveRoi(null);
131 154
						
132
						tablePanel.loadROIs();http://by120w.bay120.mail.live.com/mail/InboxLight.aspx?n=216200689
155
						tablePanel.loadROIs();
133 156
						tablePanel.updateTable();
134 157
						
135 158
					}
......
215 238
			}
216 239
			fGraphic = new FGraphic(geometry, graphicLayer.addSymbol(symbol));
217 240
			graphicLayer.addGraphic(fGraphic);
241
			tablePanel.getRoiGraphics(roi.getName()).add(fGraphic);
218 242
			mapControl.drawGraphics();
219 243
		
220 244
		}

Also available in: Unified diff