Revision 20871 trunk/libraries/libRaster/src/org/gvsig/raster/grid/GridExtent.java

View differences:

GridExtent.java
62 62
		cellSizeY = dCellSize;
63 63
		recalculateNXAndNY();
64 64
	}
65
	
66
	/**
67
	 * Assign the extension value and cell size.
68
	 * @param minX minimun value in X coordinate
69
	 * @param minY minimun value in Y coordinate
70
	 * @param maxX maximun value in X coordinate
71
	 * @param maxY maximun value in Y coordinate
72
	 * @param dCellSizeX cell size in X coordinate
73
	 * @param dCellSizeX cell size in X coordinate
74
	 */
75
	public GridExtent(double minX, double minY, double maxX, double maxY, double dCellSizeX, double dCellSizeY) {
76
		super(minX, minY, maxX, maxY);
77
		cellSizeX = dCellSizeX;
78
		cellSizeY = dCellSizeY;
79
		recalculateNXAndNY();
80
	}
81
	
82
	/**
83
	 * Assign the extension value and cell size.
84
	 * @param minX minimun value in X coordinate
85
	 * @param minY minimun value in Y coordinate
86
	 * @param maxX maximun value in X coordinate
87
	 * @param maxY maximun value in Y coordinate
88
	 * @param dCellSizeX cell size in X coordinate
89
	 * @param dCellSizeX cell size in X coordinate
90
	 */
91
	public GridExtent(Extent extent, double dCellSizeX, double dCellSizeY) {
92
		super(extent);
93
		cellSizeX = dCellSizeX;
94
		cellSizeY = dCellSizeY;
95
		recalculateNXAndNY();
96
	}
65 97
		
66 98
	public void setXRange(double dXMin, double dXMax){
67 99
		getMin().setLocation(Math.min(dXMin, dXMax), minY());
......
129 161
		double dOffsetCols;
130 162
		double dOffsetRows;
131 163
		
132
		if (extent.getCellSize() != this.getCellSize()){
164
		if ((extent.getCellSizeX() != this.getCellSizeX())||(extent.getCellSizeY() != this.getCellSizeY())){
133 165
			return false;
134 166
		}
135 167
		dOffset = Math.abs(extent.minX() - minX());
136
		dOffsetCols = dOffset / getCellSize();
168
		dOffsetCols = dOffset / getCellSizeX();
137 169
		bFitsX = (dOffsetCols == Math.floor(dOffsetCols));
138 170

  
139 171
		dOffset = Math.abs(extent.maxY() - maxY());
140
		dOffsetRows = dOffset / getCellSize();
172
		dOffsetRows = dOffset / getCellSizeY();
141 173
		bFitsY = (dOffsetRows == Math.floor(dOffsetRows));
142 174
		
143 175
		return bFitsX && bFitsY;

Also available in: Unified diff