/ - Diff - Application: gvSIG desktop - gvSIG

Revision 35620

             int numParts;
             int numPoints;
             int i;
             int j;
             int partIndex;
             bb.position(bb.position() + 32);
             numParts = bb.getInt();
-...
                 tempParts[i] = bb.getInt();
+            }
             j = 0;
             partIndex = 0;
             System.out.println(numPoints);
             for (i = 0; i < numPoints; i++) {
                 p = readPoint(bb);
                 if (i == tempParts[j]) {
                     surface.addMoveToVertex(p);
                     if (j < (numParts - 1)) {
                         j++;
                 if (i == tempParts[partIndex]) {
                     surface.addMoveToVertex(p);
                     if (partIndex < (numParts - 1)) {
                         partIndex++;
+                    }
                 } else {
                     if (i==numPoints-1){
                         surface.closePrimitive();
                     if ((i == tempParts[partIndex] - 1) || (i == numPoints - 1)){
                         surface.closePrimitive();
                     }else{
                         surface.addVertex(p);
                         surface.addVertex(p);
+                    }
+                }
+            }

     import org.gvsig.fmap.geom.primitive.Curve;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.fmap.geom.primitive.GeneralPathX;
     import org.gvsig.fmap.geom.primitive.OrientablePrimitive;
     import org.gvsig.fmap.geom.primitive.Point;
     import org.gvsig.fmap.geom.primitive.Surface;
     import org.gvsig.fmap.geom.util.Converter;
-...
     	 */
     	public void obtainsPoints(Geometry g) {
     		boolean is3D=false;
     		if (SHP.POLYLINE3D == m_type){
     			Curve curve = (Curve)g;
     			zs = new double[curve.getNumVertices()];
     		if ((SHP.POLYLINE3D == m_type) || (SHP.POLYGON3D == m_type)){
     			OrientablePrimitive orientablePrimitive = (OrientablePrimitive)g;
     			zs = new double[orientablePrimitive.getNumVertices()];
     			for (int i=0 ; i<zs.length ; i++){
     				zs[i] = curve.getCoordinateAt(i, 2);
     				zs[i] = orientablePrimitive.getCoordinateAt(i, 2);
+    			}
     			is3D=true;
     		}else if (SHP.POLYGON3D == m_type){
     			Surface surface = (Surface)g;
     			zs = new double[surface.getNumVertices()];
     			for (int i=0 ; i<zs.length ; i++){
     				zs[i] = surface.getCoordinateAt(i, 2);
+    			}
     			is3D=true;
+    		}
     		ArrayList arrayPoints = null;
     		ArrayList arrayParts = new ArrayList();

     import java.awt.geom.PathIterator;
     import java.awt.geom.Point2D;
     import java.util.ArrayList;
     import java.util.List;
     import javax.swing.JOptionPane;
     import com.vividsolutions.jts.geom.GeometryCollection;
     import org.gvsig.andami.PluginServices;
     import org.gvsig.andami.messages.NotificationManager;
     import org.gvsig.editing.CADExtension;
-...
     import org.gvsig.editing.layers.VectorialLayerEdited;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.gvsig.fmap.dal.feature.EditableFeature;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureSelection;
-...
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.aggregate.MultiPrimitive;
     import org.gvsig.fmap.geom.aggregate.MultiSurface;
     import org.gvsig.fmap.geom.aggregate.impl.BaseMultiPrimitive;
     import org.gvsig.fmap.geom.primitive.GeneralPathX;
     import org.gvsig.fmap.geom.primitive.Point;
     import org.gvsig.fmap.mapcontrol.MapControlDrawer;
     import org.gvsig.tools.dispose.DisposableIterator;
     import org.gvsig.tools.dispose.DisposeUtils;
     import com.vividsolutions.jts.geom.GeometryCollection;
     /**
      * DOCUMENT ME!
+     *
-...
      */
     public class InternalPolygonCADTool extends DefaultCADTool {
     	protected InternalPolygonCADToolContext _fsm;
     	protected ArrayList<Point2D> points=new ArrayList<Point2D>();
     	protected Geometry geometry=null;
     	protected List<Point> points = new ArrayList<Point>();
     	protected Geometry geometry = null;
     	/**
     	 * Crea un nuevo PolylineCADTool.
-...
     				iterator = featureCollection.iterator();
     				Feature feature = (Feature) iterator.next();
     				geometry=(feature.getDefaultGeometry()).cloneGeometry();
     				if (geometry.getShape().contains(x,y)){
     					points.add(new Point2D.Double(x,y));
     				if (geometry.contains(x,y)){
     					points.add(createPoint(x, y));
     				}else{
     					JOptionPane.showMessageDialog(((Component)PluginServices.getMainFrame()),PluginServices.getText(this,"debe_insertar_el_punto_dentro_de_los_limites_de_la_geometria"));
+    				}
-...
     		} catch (DataException e) {
     			NotificationManager.addError(e.getMessage(),e);
     		} finally {
     			DisposeUtils.dispose(iterator);
     			DisposeUtils.dispose(featureCollection);
     			DisposeUtils.dispose(iterator);
+    		}
+    	}
-...
     	 * @param y par?metro x del punto que se pase para dibujar.
     	 */
     	public void drawOperation(MapControlDrawer renderer, double x, double y) {
     		Point2D[] ps=points.toArray(new Point2D[0]);
     		GeneralPathX gpx=new GeneralPathX();
     		GeneralPathX gpx1=new GeneralPathX();
     		GeneralPathX gpx = new GeneralPathX();
     		GeneralPathX gpx1 = new GeneralPathX();
     		if (ps.length>0){
     			for (int i=0;i<ps.length;i++){
     		if (points.size()>0){
     			for (int i=0 ; i<points.size() ; i++){
     				if (i==0){
     					gpx.moveTo(ps[i].getX(),ps[i].getY());
     					gpx1.moveTo(ps[i].getX(),ps[i].getY());
     					gpx.moveTo(points.get(i));
     					gpx1.moveTo(points.get(i));
     				}else{
     					gpx.lineTo(ps[i].getX(),ps[i].getY());
     					gpx1.lineTo(ps[i].getX(),ps[i].getY());
     					gpx.lineTo(points.get(i));
     					gpx1.lineTo(points.get(i));
+    				}
+    			}
     			gpx.lineTo(x,y);
     			gpx.lineTo(createPoint(x,y));
     			gpx.closePath();
     			gpx1.closePath();
-...
     					Feature feature = (Feature) iterator.next();
     					geometry = (feature.getDefaultGeometry()).cloneGeometry();
     					if (geometry instanceof GeometryCollection) {
     						BaseMultiPrimitive gc = (BaseMultiPrimitive) geometry;
     						geometry = createNewPolygonGC(gc, points
     								.toArray(new Point2D[0]));
     						MultiPrimitive gc = (MultiPrimitive) geometry;
     						geometry = createNewPolygonGC(gc, points);
     					} else {
     						geometry = createNewPolygon(geometry, points
     								.toArray(new Point2D[0]));
     						geometry = createNewPolygon(geometry, points);
+    					}
     					try {
     						EditableFeature eFeature = feature.getEditable();
-...
     	 */
     	public void addValue(double d) {
+    	}
     	private Geometry createNewPolygon(Geometry gp,Point2D[] ps) {
     	private Geometry createNewPolygon(Geometry geometry, List<Point> points) {
     		GeneralPathX newGp = new GeneralPathX();
     		double[] theData = new double[6];
-...
     		int theType;
     		int numParts = 0;
     		theIterator = gp.getPathIterator(null, geomManager.getFlatness());
     		theIterator = geometry.getPathIterator(null, geomManager.getFlatness());
     		while (!theIterator.isDone()) {
     			theType = theIterator.currentSegment(theData);
     			switch (theType) {
-...
     			theIterator.next();
     		} //end while loop
     		GeneralPathX gpxInternal=new GeneralPathX();
     		gpxInternal.moveTo(ps[ps.length-1].getX(),ps[ps.length-1].getY());
     		for (int i=ps.length-1;i>=0;i--){
     			gpxInternal.lineTo(ps[i].getX(),ps[i].getY());
     		gpxInternal.moveTo(points.get(points.size()-1));
     		for (int i=points.size()-2 ; i>=0 ; i--){
     			gpxInternal.lineTo(points.get(i));
+    		}
     		gpxInternal.lineTo(ps[ps.length-1].getX(),ps[ps.length-1].getY());
     		gpxInternal.closePath();
     		if (!gpxInternal.isCCW()) {
     			gpxInternal.flip();
+    		}
-...
     		return createSurface(newGp);
+    	}
     	private Geometry createNewPolygonGC(BaseMultiPrimitive gp,Point2D[] ps) {
     		ArrayList geoms=new ArrayList();
     		Geometry[] geometries=gp.getGeometries();
     		for (int i = 0;i<geometries.length;i++) {
     			geoms.add(geometries[i]);
     	private Geometry createNewPolygonGC(MultiPrimitive multiPrimitive, List<Point> points) {
     	    MultiPrimitive multiPrimitiveAux = createMultiPrimitive();
     		for (int i = 0 ; i<multiPrimitive.getPrimitivesNumber() ; i++) {
     		    multiPrimitiveAux.addPrimitive(multiPrimitive.getPrimitiveAt(i));
+    		}
     		GeneralPathX gpx=new GeneralPathX();
     		gpx.moveTo(ps[ps.length-1].getX(),ps[ps.length-1].getY());
     		for (int i=ps.length-2;i>=0;i--){
     			gpx.lineTo(ps[i].getX(),ps[i].getY());
     			geoms.add(createCurve(gpx));
     			gpx=new GeneralPathX();
     			gpx.moveTo(ps[i].getX(),ps[i].getY());
     		gpx.moveTo(points.get(points.size()-1));
     		for (int i=points.size()-2 ; i>=0 ; i--){
     			gpx.lineTo(points.get(i));
     			multiPrimitiveAux.addPrimitive(createCurve(gpx));
     			gpx = new GeneralPathX();
     			gpx.moveTo(points.get(i));
+    		}
     		gpx.lineTo(ps[ps.length-1].getX(),ps[ps.length-1].getY());
     		geoms.add(createCurve(gpx));
     		MultiPrimitive gc = createMultiPrimitive(((Geometry[])geoms.toArray(new Geometry[0])));
     		return gc;
     		gpx.closePath();
     		multiPrimitiveAux.addPrimitive(createCurve(gpx));
     		return multiPrimitiveAux;
+    	}
     	public String getName() {
     		return PluginServices.getText(this,"internal_polygon_");
+    	}

     		return spline;
+    	}
     	   /**
          * Create a MultiPrimitive. If there is an
          * error return <code>null</code> and add the error
          * to the log
          * @return
          */
         protected MultiPrimitive createMultiPrimitive(){
             try {
                 return (MultiPrimitive)geomManager.create(TYPES.AGGREGATE, getSubType());
             } catch (org.gvsig.fmap.geom.exception.CreateGeometryException e) {
                 LOG.error("Error creating MultiPrimitive",
                     new CreateGeometryException(TYPES.SPLINE, getSubType(), e));
+            }
             return null;
+        }
     	/**
     	 * Create a MultiPrimitive. If there is an
     	 * error return <code>null</code> and add the error

Also available in: Unified diff