Revision 20828

View differences:

trunk/libraries/libRaster/src/org/gvsig/raster/grid/GridExtent.java
21 21
import java.awt.geom.Point2D;
22 22

  
23 23
import org.gvsig.raster.datastruct.Extent;
24

  
25

  
26

  
27 24
/**
28 25
 * This class defines a grid system (coordinates and cellsize)
29 26
 * @author Victor Olaya (volaya@ya.com)
30 27
 */
31
public class GridExtent extends Extent{
32
	
33
	double cellSize = 1;
28
public class GridExtent extends Extent {
34 29
	double cellSizeX = 1;
35 30
	double cellSizeY = 1;
36
	int m_iNX;
37
	int m_iNY;
31
	int    m_iNX;
32
	int    m_iNY;
38 33
	
39 34
	public GridExtent(){}
40 35
	
......
46 41
	 * @param maxY maximun value in Y coordinate
47 42
	 * @param dCellSize cell size
48 43
	 */
49
	public GridExtent(double minX, double minY, double maxX, 
50
					double maxY, double dCellSize){
44
	public GridExtent(double minX, double minY, double maxX, double maxY, double dCellSize) {
51 45
		super(minX, minY, maxX, maxY);
52
		this.cellSize = dCellSize;
53 46
		cellSizeX = dCellSize;
54 47
		cellSizeY = dCellSize;
55 48
		recalculateNXAndNY();
......
63 56
	 * @param maxY maximun value in Y coordinate
64 57
	 * @param dCellSize cell size
65 58
	 */
66
	public GridExtent(Extent extent, double dCellSize){
59
	public GridExtent(Extent extent, double dCellSize) {
67 60
		super(extent);
68
		this.cellSize = dCellSize;
69 61
		cellSizeX = dCellSize;
70 62
		cellSizeY = dCellSize;
71 63
		recalculateNXAndNY();
......
89 81
	 * @return cell size in double value
90 82
	 */
91 83
	public double getCellSize() {
92
		return cellSize;
84
		return cellSizeX;
93 85
	}
94 86

  
95 87
	/**
......
97 89
	 * @param cellSize cell size in double value
98 90
	 */
99 91
	public void setCellSize(double cellSize) {
100
		this.cellSize = cellSize;
101 92
		this.cellSizeX = cellSize;
102 93
		this.cellSizeY = cellSize;
103 94
		recalculateNXAndNY();
......
163 154
			 	maxX() == extent.maxX() &&
164 155
			 	minY() == extent.minY() &&
165 156
			 	maxY() == extent.maxY() &&
166
			 	cellSize == extent.getCellSize() &&
167 157
			 	cellSizeX == extent.getCellSizeX() && 
168 158
			 	cellSizeY == extent.getCellSizeY());
169 159
	}
......
203 193

  
204 194
	public void setCellSizeX(double cellSizeX) {
205 195
		this.cellSizeX = cellSizeX;
206
		cellSize = cellSizeX;
207 196
		recalculateNXAndNY();
208 197
	}
209 198

  
......
215 204
		this.cellSizeY = cellSizeY;
216 205
		recalculateNXAndNY();
217 206
	}
218

  
219
}
207
}

Also available in: Unified diff