Revision 7904 trunk/libraries/libJCRS/src/org/gvsig/crs/Crs.java

View differences:

Crs.java
17 17
import org.gvsig.crs.ogr.crsgdalException;
18 18

  
19 19
public class Crs implements ICrs {
20
	private static final Color basicGridColor = new Color(64, 64, 64, 128);
20 21
	private String proj4;
21 22
	private String trans;
22 23
	//private String transOrigin = "";
......
28 29
	boolean targetNad = false;
29 30
	String nad = "";
30 31
	String wkt = null;
32
	Color gridColor = basicGridColor;
33
	CRSDatum datum = null;
31 34

  
32 35
	public Crs(String code) throws CrsException {
33 36
		String fullCode;
......
84 87
				throw new CrsException(e);
85 88
			}
86 89
		}
90
//		Asignar el datum:
91
		if (!(crsWkt.getSpheroid()[1].equals("")||crsWkt.getSpheroid()[2].equals(""))){
92
			double eSemiMajorAxis = Double.valueOf(crsWkt.getSpheroid()[1]).doubleValue();
93
			double eIFlattening = Double.valueOf(crsWkt.getSpheroid()[2]).doubleValue();
94
			datum = new CRSDatum(eSemiMajorAxis,eIFlattening);
95
		}
87 96
	}	
88 97
	
89 98
	public Crs(int epsg_cod, String code) throws CrsException {
......
142 151
				throw new CrsException(e);
143 152
			}
144 153
		}
154
		//	Asignar el datum:
155
		double eSemiMajorAxis = Double.valueOf(crsWkt.getSpheroid()[1]).doubleValue();
156
		double eIFlattening = Double.valueOf(crsWkt.getSpheroid()[2]).doubleValue();
157
		datum = new CRSDatum(eSemiMajorAxis,eIFlattening);
145 158
	}
146 159
	
147 160
	public Crs(int epsg_cod, String code,String params) throws CrsException {
......
200 213
				throw new CrsException(e);
201 214
			}
202 215
		}
216
		//	Asignar el datum:
217
		double eSemiMajorAxis = Double.valueOf(crsWkt.getSpheroid()[1]).doubleValue();
218
		double eIFlattening = Double.valueOf(crsWkt.getSpheroid()[2]).doubleValue();
219
		datum = new CRSDatum(eSemiMajorAxis,eIFlattening);
203 220
	}
204 221
		
205 222
	public Crs(CrsEpsg source) throws CrsException {
......
228 245
	}
229 246
	
230 247
	public IDatum getDatum() {
231
		return null;
248
		/*CSDatum datum = new CSDatum();
249
		try {
250
			datum.fromWKT(getWKT());
251
		} catch (FactoryException e) {
252
			// TODO Auto-generated catch block
253
			e.printStackTrace();
254
		}*/
255
		return datum;
232 256
	}
233 257
	
234 258
	public CrsWkt getCrsWkt() {
......
273 297
	}
274 298

  
275 299
	public void setGridColor(Color c) {
276
		// TODO Auto-generated method stub
277
		
300
		gridColor = c;
278 301
	}
279 302

  
280 303
	public Color getGridColor() {
281
		// TODO Auto-generated method stub
282
		return null;
304
		return gridColor;
283 305
	}
284 306

  
285 307
	public ICoordTrans getCT(IProjection dest) {
......
299 321

  
300 322
	public Point2D toGeo(Point2D pt) {
301 323
		// TODO Auto-generated method stub
302
		return null;
324
		return pt;
303 325
	}
304 326

  
305 327
	public Point2D fromGeo(Point2D gPt, Point2D mPt) {

Also available in: Unified diff