/ - Diff - Application: gvSIG desktop - gvSIG

Revision 12522

     /*
      * Created on 9-ago-2006
+     *
      * To change the template for this generated file go to
      * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
      */
     /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
      * Copyright (C) 2007 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
-...
     import org.gvsig.raster.datastruct.GeoPoint;
     import org.gvsig.raster.datastruct.Histogram;
     import org.gvsig.raster.datastruct.ViewPortData;
     import org.gvsig.raster.datastruct.serializer.ColorTableRmfSerializer;
     import org.gvsig.raster.datastruct.serializer.HistogramRmfSerializer;
     /**
-...
     		//Tabla de color
     		colorTable.setName("Prueba Tabla de Color");
     		ColorTableRmfSerializer ser1 = new ColorTableRmfSerializer(colorTable);
     		//ColorTableRmfSerializer ser1 = new ColorTableRmfSerializer(colorTable);
     		//manager.addClient(ser1);
     		//Estadisticas

     import org.gvsig.raster.dataset.RasterDriverException;
     import org.gvsig.raster.dataset.properties.DatasetStatistics;
     import org.gvsig.raster.dataset.serializer.GeoInfoRmfSerializer;
     import org.gvsig.raster.dataset.serializer.GeoPointRmfSerializer;
     import org.gvsig.raster.dataset.serializer.StatisticsRmfSerializer;
     import org.gvsig.raster.datastruct.ColorTable;
     import org.gvsig.raster.datastruct.GeoPoint;
     import org.gvsig.raster.datastruct.Histogram;
     import org.gvsig.raster.datastruct.HistogramClass;
     import org.gvsig.raster.datastruct.serializer.ColorTableRmfSerializer;
-...
     public class TestRmfRead extends TestCase {
     	private String baseDir = "./test-images/";
     	private RasterDataset	testDataset = null;
     	private RmfBlocksManager manager = null;
     	private Histogram histogram = null;
     	public String file = "readtest.rmf";
     	private RasterDataset f1 = null;
     	private String path1 = baseDir + "03AUG23153350-M2AS-000000122423_01_P001-BROWSE.jpg";
-...
     		ColorTableRmfSerializer ser1 = new ColorTableRmfSerializer();
     		StatisticsRmfSerializer ser2 = new StatisticsRmfSerializer();
     		GeoInfoRmfSerializer ser3 = new GeoInfoRmfSerializer(f1);
     		GeoPointRmfSerializer ser4 = new GeoPointRmfSerializer();
     		manager.addClient(ser);
     		manager.addClient(ser1);
     		manager.addClient(ser2);
     		manager.addClient(ser3);
     		manager.addClient(ser4);
     		try {
     			manager.read(null);
-...
     					testStatistics((DatasetStatistics)manager.getClient(i).getResult());
     				if(client instanceof GeoInfoRmfSerializer)
     					testGeoInfo((RasterDataset)manager.getClient(i).getResult());
     				if(client instanceof GeoPointRmfSerializer)
     					testGeoPoints((GeoPoint[])manager.getClient(i).getResult());
+    			}
     		} catch (ParsingException e) {
-...
+    	}
     	public void testGeoInfo(RasterDataset dataset) {
     		String proj = "";
     		//String proj = "";
     		//TODO: TEST: Terminar test de acceso a la georreferenciaci?n.
     		if(dataset.getProjection() != null)
     			proj = dataset.getProjection().getAbrev();
     		//if(dataset.getProjection() != null)
     			//proj = dataset.getProjection().getAbrev();
     		double x = dataset.getExtent().getMin().getX();
     		double y = dataset.getExtent().getMax().getY();
     		assertEquals((int)x, 5000);
     		assertEquals((int)y, 5000);
+    	}
     	public void testGeoPoints(GeoPoint[] gpList) {
     		GeoPoint p = gpList[0];
     		assertEquals((int)p.pixelPoint.getX(), 10);
     		assertEquals((int)p.pixelPoint.getY(), 10);
     		assertEquals((int)p.mapPoint.getX(), 34223);
     		assertEquals((int)p.mapPoint.getY(), 2344);
     		assertEquals(p.active, true);
     		assertEquals((int)p.leftCenterPoint.getX(), 24223);
     		assertEquals((int)p.leftCenterPoint.getY(), 3244);
     		assertEquals((int)p.rightCenterPoint.getX(), 2433);
     		assertEquals((int)p.rightCenterPoint.getY(), 6244);
     		assertEquals((int)p.leftViewPort.getExtent().minX(), 30032);
     		assertEquals((int)p.leftViewPort.getExtent().maxY(), 2103);
     		assertEquals((int)p.rightViewPort.getExtent().minX(), 30032);
     		assertEquals((int)p.rightViewPort.getExtent().maxY(), 2103);
     		assertEquals((int)p.zoomLeft, 1);
     		assertEquals((int)p.zoomRight, 1);
+    	}
+    }

      */
     package org.gvsig.raster.dataset.serializer;
     import java.awt.geom.AffineTransform;
     import java.awt.geom.Point2D;
     import java.io.IOException;
     import java.io.Reader;
     import java.io.StringReader;
-...
     import org.gvsig.raster.dataset.io.rmf.ClassSerializer;
     import org.gvsig.raster.dataset.io.rmf.ParsingException;
     import org.gvsig.raster.datastruct.Extent;
     import org.gvsig.raster.datastruct.GeoPoint;
     import org.gvsig.raster.datastruct.ViewPortData;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParserException;
-...
     	public GeoPointRmfSerializer() {
+    	}
     	private void parserCenterPoint(GeoPoint gp, KXmlParser parser, String tag) {
     	/**
     	 * Parsea un bloque correspondiente a un punto central
     	 * @param gp
     	 * @param parser
     	 * @param parseableTag
     	 * @throws NumberFormatException
     	 * @throws XmlPullParserException
     	 * @throws IOException
     	 */
     	private void parserCenterPoint(GeoPoint gp, KXmlParser parser, String parseableTag) throws NumberFormatException, XmlPullParserException, IOException {
     		boolean end = false;
     		boolean tagOk = false;
     		int tag = parser.next();
     		while (!end) {
     			switch(tag) {
     			case KXmlParser.START_TAG:
     				if(parser.getName() != null){
     					if (parser.getName().compareTo(parseableTag) == 0)
     						tagOk = true;
+    				}
     				break;
     			case KXmlParser.END_TAG:
     				if (parser.getName().compareTo(parseableTag) == 0)
     					end = true;
     				break;
     			case KXmlParser.TEXT:
     				if(tagOk) {
     					if(parseableTag.compareTo("LeftCenterPoint") == 0) {
     						double x = Double.valueOf(parserString(parser, X, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, Y, null)).doubleValue();
     						gp.leftCenterPoint = new Point2D.Double(x, y);
+    					}
     					if(parseableTag.compareTo("RightCenterPoint") == 0) {
     						double x = Double.valueOf(parserString(parser, X, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, Y, null)).doubleValue();
     						gp.rightCenterPoint = new Point2D.Double(x, y);
+    					}
     					tagOk = false;
+    				}
     				break;
+    			}
     			if (!end)
     				tag = parser.next();
+    		}
+    	}
     	private void parserViewPort(GeoPoint gp, KXmlParser parser, String tag) {
     	/**
     	 * Parsea un bloque correspondiente a un punto central
     	 * @param gp
     	 * @param parser
     	 * @param parseableTag
     	 * @throws NumberFormatException
     	 * @throws XmlPullParserException
     	 * @throws IOException
     	 */
     	private void parserBoundingBox(GeoPoint gp, KXmlParser parser, String parseableTag) throws NumberFormatException, XmlPullParserException, IOException {
     		boolean end = false;
     		boolean tagOk = false;
     		int tag = parser.next();
     		while (!end) {
     			switch(tag) {
     			case KXmlParser.START_TAG:
     				if(parser.getName() != null){
     					if (parser.getName().compareTo(BBOX) == 0)
     						tagOk = true;
+    				}
     				break;
     			case KXmlParser.END_TAG:
     				if (parser.getName().compareTo(BBOX) == 0)
     					end = true;
     				break;
     			case KXmlParser.TEXT:
     				if(tagOk) {
     					if(parseableTag.compareTo("LeftViewPort") == 0) {
     						double x = Double.valueOf(parserString(parser, PX, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, PY, null)).doubleValue();
     						double w = Double.valueOf(parserString(parser, WCWIDTH, null)).doubleValue();
     						double h = Double.valueOf(parserString(parser, WCHEIGHT, null)).doubleValue();
     						gp.leftViewPort.setExtent(new Extent(x, y, x + w, y - h));
+    					}
     					if(parseableTag.compareTo("RightViewPort") == 0) {
     						double x = Double.valueOf(parserString(parser, PX, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, PY, null)).doubleValue();
     						double w = Double.valueOf(parserString(parser, WCWIDTH, null)).doubleValue();
     						double h = Double.valueOf(parserString(parser, WCHEIGHT, null)).doubleValue();
     						gp.rightViewPort.setExtent(new Extent(x, y, x + w, y - h));
+    					}
     					tagOk = false;
+    				}
     				break;
+    			}
     			if (!end)
     				tag = parser.next();
+    		}
+    	}
     	/**
     	 * Parsea un bloque correspondiente a un punto central
     	 * @param gp
     	 * @param parser
     	 * @param parseableTag
     	 * @throws NumberFormatException
     	 * @throws XmlPullParserException
     	 * @throws IOException
     	 */
     	private void parserDimension(GeoPoint gp, KXmlParser parser, String parseableTag) throws NumberFormatException, XmlPullParserException, IOException {
     		boolean end = false;
     		boolean tagOk = false;
     		int tag = parser.next();
     		while (!end) {
     			switch(tag) {
     			case KXmlParser.START_TAG:
     				if(parser.getName() != null){
     					if (parser.getName().compareTo(PDIM) == 0)
     						tagOk = true;
+    				}
     				break;
     			case KXmlParser.END_TAG:
     				if (parser.getName().compareTo(PDIM) == 0)
     					end = true;
     				break;
     			case KXmlParser.TEXT:
     				if(tagOk) {
     					if(parseableTag.compareTo("LeftViewPort") == 0) {
     						double x = Double.valueOf(parserString(parser, WIDTH, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, HEIGHT, null)).doubleValue();
     						//gp.leftViewPort.setSize(x, y);
+    					}
     					if(parseableTag.compareTo("RightViewPort") == 0) {
     						double x = Double.valueOf(parserString(parser, WIDTH, null)).doubleValue();
     						double y = Double.valueOf(parserString(parser, HEIGHT, null)).doubleValue();
     						//gp.rightViewPort.setSize(x, y);
+    					}
     					tagOk = false;
+    				}
     				break;
+    			}
     			if (!end)
     				tag = parser.next();
+    		}
+    	}
     	/**
     	 * Parsea un viewport contenido en un punto de control
     	 * @param gp
     	 * @param parser
     	 * @param parseableTag
     	 * @throws XmlPullParserException
     	 * @throws IOException
     	 */
     	private void parserViewPort(GeoPoint gp, KXmlParser parser, String parseableTag) throws XmlPullParserException, IOException {
     		boolean end = false;
     		if(parseableTag.compareTo("LeftViewPort") == 0) {
     			gp.leftViewPort = new ViewPortData();
     			gp.leftViewPort.mat = new AffineTransform();
+    		}
     		if(parseableTag.compareTo("RightViewPort") == 0) {
     			gp.rightViewPort = new ViewPortData();
     			gp.rightViewPort.mat = new AffineTransform();
+    		}
     		int tag = parser.next();
     		while (!end) {
     			switch(tag) {
     			case KXmlParser.START_TAG:
     				if(parser.getName() != null){
     					if (parser.getName().compareTo(parseableTag) == 0) {
     						String proj = parserString(parser, PROJ, null);
     						parserBoundingBox(gp, parser, parseableTag);
     						parserDimension(gp, parser, parseableTag);
     						if(parseableTag.compareTo("LeftViewPort") == 0)
     							gp.zoomLeft = Double.valueOf(parserString(parser, ZOOM, null)).doubleValue();
     						if(parseableTag.compareTo("RightViewPort") == 0)
     							gp.zoomRight = Double.valueOf(parserString(parser, ZOOM, null)).doubleValue();
+    					}
+    				}
     				break;
     			case KXmlParser.END_TAG:
     				if (parser.getName().compareTo(parseableTag) == 0)
     					end = true;
     				break;
     			case KXmlParser.TEXT:
     				break;
+    			}
     			if (!end)
     				tag = parser.next();
+    		}
+    	}
     	/**
     	 * Parsea un punto de control completo
     	 * @param gp
     	 * @param parser
     	 * @param xml
     	 * @param tag
     	 * @throws XmlPullParserException
     	 * @throws IOException
     	 */
     	public void parserGeoPoint(GeoPoint gp, KXmlParser parser, String xml, int tag) throws XmlPullParserException, IOException  {
     		double px = Double.parseDouble(parserString(parser, PIXELX, null));
     		double py = Double.parseDouble(parserString(parser, PIXELY, null));
     		gp.pixelPoint = new Point2D.Double(px, py);
     		double mx = Double.parseDouble(parserString(parser, MAPX, null));
     		double my = Double.parseDouble(parserString(parser, MAPY, null));
     		gp.mapPoint = new Point2D.Double(mx, my);
     		gp.active = Boolean.valueOf(parserString(parser, ACTIVE, null)).booleanValue();
     		parserCenterPoint(gp, parser, "LeftCenterPoint");
     		parserCenterPoint(gp, parser, "RightCenterPoint");
     		parserViewPort(gp, parser, "LeftViewPort");
     		parserViewPort(gp, parser, "RightViewPort");
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.raster.dataset.io.rmf.IRmfBlock#read(java.lang.String)
     	 */
     	public void read(String xml) throws ParsingException {
     		ArrayList list = new ArrayList();
     		GeoPoint gp = new GeoPoint();
     		GeoPoint gp = null;
     		boolean init = false;
     		int nPoint = -1;
     		boolean tagOk = false;
     		KXmlParser parser = new KXmlParser();
     		Reader reader = new StringReader(xml);
-...
     				while(tag != KXmlParser.END_DOCUMENT) {
     					switch(tag) {
     						case KXmlParser.START_TAG:
     							if (parser.getName().compareTo(MAIN_TAG) == 0) {
     								double px = Double.parseDouble(parserString(parser, PIXELX, null));
     								double py = Double.parseDouble(parserString(parser, PIXELY, null));
     								gp.pixelPoint.setLocation(px, py);
     								double mx = Double.parseDouble(parserString(parser, MAPX, null));
     								double my = Double.parseDouble(parserString(parser, MAPY, null));
     								gp.mapPoint.setLocation(mx, my);
     								gp.active = Boolean.valueOf(parserString(parser, ACTIVE, null)).booleanValue();
     								parserCenterPoint(gp, parser, "LeftCenterPoint");
     								parserCenterPoint(gp, parser, "RightCenterPoint");
     								parserViewPort(gp, parser, "LeftViewPort");
     								parserViewPort(gp, parser, "RightViewPort");
     							if (parser.getName().compareTo(MAIN_TAG) == 0)
     								init = true;
     							if(init) {
     								if (parser.getName().compareTo(GEOPOINT) == 0) {
     									gp = new GeoPoint();
     									tagOk = true;
     									nPoint++;
+    								}
+    							}
     							break;
     						case KXmlParser.END_TAG:
     							break;
     						case KXmlParser.TEXT:
     						case KXmlParser.TEXT:
     							if(tagOk) {
     								parserGeoPoint(gp, parser, xml,tag);
     								tagOk = false;
     								list.add(gp);
+    							}
     							break;
+    					}
     					tag = parser.next();
-...
+    		}
     		gpList = new GeoPoint[list.size()];
     		for (int i = 0; i < list.size(); i++)
     		for (int i = 0; i < list.size(); i++)
     			gpList[i] = (GeoPoint)list.get(i);
+    	}
     	/*
-...
     		b.append("<" + MAIN_TAG + ">\n");
     		for (int i = 0; i < gpList.length; i++) {
     			b.append("\t<" + GEOPOINT + " n=" + i + ">\n");
     			b.append("\t<" + GEOPOINT + " n=\"" + i + "\">\n");
     			putProperty(b, PIXELX, gpList[i].pixelPoint.getX(), 2);
     			putProperty(b, PIXELY, gpList[i].pixelPoint.getY(), 2);
     			putProperty(b, MAPX, gpList[i].mapPoint.getX(), 2);
-...
     			b.append("\t\t<" + LEFTVP + ">\n");
     			String proj = "";
     			if(gpList[i].leftViewPort.getProjection() != null)
     				putProperty(b, PROJ, gpList[i].leftViewPort.getProjection().getAbrev(), 2);
     				proj = gpList[i].leftViewPort.getProjection().getAbrev();
     			putProperty(b, PROJ, proj, 3);
     			b.append("\t\t\t<" + BBOX + ">\n");
     			putProperty(b, PX, gpList[i].leftViewPort.getExtent().getMin().getX(), 4);
     			putProperty(b, PY, gpList[i].leftViewPort.getExtent().getMax().getY(), 4);
-...
     			b.append("\t\t\t<" + PDIM + ">\n");
     			putProperty(b, WIDTH, GeoPoint.WIDTH_WINDOW, 4);
     			putProperty(b, HEIGHT, GeoPoint.HEIGHT_WINDOW, 4);
     			putProperty(b, ZOOM, gpList[i].zoomLeft, 4);
     			b.append("\t\t\t<" + PDIM + ">\n");
     			b.append("\t\t\t</" + PDIM + ">\n");
     			putProperty(b, ZOOM, gpList[i].zoomLeft, 3);
     			b.append("\t\t</" + LEFTVP + ">\n");
     			b.append("\t\t<" + RIGHTVP + ">\n");
     			proj = "";
     			if(gpList[i].rightViewPort.getProjection() != null)
     				putProperty(b, PROJ, gpList[i].rightViewPort.getProjection().getAbrev(), 2);
     				proj = gpList[i].rightViewPort.getProjection().getAbrev();
     			putProperty(b, PROJ, proj, 3);
     			b.append("\t\t\t<" + BBOX + ">\n");
     			putProperty(b, PX, gpList[i].rightViewPort.getExtent().getMin().getX(), 4);
     			putProperty(b, PY, gpList[i].rightViewPort.getExtent().getMax().getY(), 4);
-...
     			b.append("\t\t\t<" + PDIM + ">\n");
     			putProperty(b, WIDTH, GeoPoint.WIDTH_WINDOW, 4);
     			putProperty(b, HEIGHT, GeoPoint.HEIGHT_WINDOW, 4);
     			putProperty(b, ZOOM, gpList[i].zoomRight, 4);
     			b.append("\t\t\t<" + PDIM + ">\n");
     			b.append("\t\t\t</" + PDIM + ">\n");
     			putProperty(b, ZOOM, gpList[i].zoomRight, 3);
     			b.append("\t\t</" + RIGHTVP + ">\n");

Also available in: Unified diff