Revision 1025

View differences:

org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/datastruct/ExtentImpl.java
132 132
     * @see org.gvsig.fmap.dal.coverage.datastruct.Extent#encloseBoundinBoxes(org.gvsig.fmap.dal.coverage.datastruct.Extent)
133 133
     */
134 134
    public Extent encloseBoundinBoxes(Extent ext) {
135
    	Point2D pUl = new Point2D.Double(Math.min(getULX(), ext.getULX()), Math.max(getULY(), ext.getULY()));
136
    	Point2D pLr = new Point2D.Double(Math.max(getLRX(), ext.getLRX()), Math.min(getLRY(), ext.getLRY()));
135
    	Point2D pUl = new Point2D.Double(
136
    			Math.min(getULX(), ext.getULX()), 
137
    			Math.max(getULY(), ext.getULY()));
138
    	Point2D pLr = new Point2D.Double(
139
    			Math.max(getLRX(), ext.getLRX()), 
140
    			Math.min(getLRY(), ext.getLRY()));
137 141
    	return new ExtentImpl(pUl, pLr);
138 142
    }
139 143
    
144
    /*
145
     * (non-Javadoc)
146
     * @see org.gvsig.fmap.dal.coverage.datastruct.Extent#intersection(org.gvsig.fmap.dal.coverage.datastruct.Extent)
147
     */
148
    public Extent intersection(Extent ext) {
149
    	if(intersects(ext)) {
150
    		Point2D pUl = new Point2D.Double(
151
    				Math.max(getULX(), ext.getULX()), 
152
    				Math.min(getULY(), ext.getULY()));
153
    		Point2D pLr = new Point2D.Double(
154
    				Math.min(getLRX(), ext.getLRX()), 
155
    				Math.max(getLRY(), ext.getLRY()));
156
    		return new ExtentImpl(pUl, pLr);
157
    	}
158
    	return null;
159
    }
160

  
161
    /*
162
     * (non-Javadoc)
163
     * @see org.gvsig.fmap.dal.coverage.datastruct.Extent#intersects(org.gvsig.fmap.dal.coverage.datastruct.Extent)
164
     */
165
    public boolean intersects(Extent ext) {
166
    	if (getMin().getX() > ext.getMax().getX()) 
167
    		return false;
168
    	else if (getMax().getX() < ext.getMin().getX()) 
169
    		return false;
170
    	if (getMin().getY() > ext.getMax().getY()) 
171
    		return false;
172
    	else if (getMax().getY() < ext.getMin().getY()) 
173
    		return false;
174
    	return true;
175
    }
176

  
140 177
    /*ax
141 178
     * (non-Javadoc)
142 179
     * @see org.gvsig.fmap.dal.coverage.datastruct.Extent#getGridExtent(double)
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.api/src/main/java/org/gvsig/fmap/dal/coverage/datastruct/Extent.java
203 203
    public Extent encloseBoundinBoxes(Extent ext);
204 204
    
205 205
    /**
206
     * Gets the intersection between two bounding box
207
     * @param ext
208
     * @return
209
     */
210
    public Extent intersection(Extent ext);
211
    
212
    /**
213
     * Returns true if the selected bounding box intersects with the 
214
     * current
215
     * @param ext
216
     * @return
217
     */
218
    public boolean intersects(Extent ext);
219
    
220
    /**
206 221
     * Obtiene la escala
207 222
     * @param width	Ancho
208 223
     * @param height	Alto

Also available in: Unified diff