/ - Diff - | gvSIG desktop 1 - gvSIG

     			Geometry circle = createCircle(firstPoint,
     					new Point2D.Double(x, y));
     			GeneralPathX gpx = new GeneralPathX();
     			gpx.append(circle.getInternalShape(), true);
     			gpx.append(circle.getInternalShape().getPathIterator(null), true);
     			Geometry circleSel = createCurve(gpx);
     			// Dibuja el c?rculo de selecci?n
     			DrawOperationContext doc = new DrawOperationContext();
-...
     							"ComplexSelectionCADTool.end"))) {
     				Geometry polygon = getGeometryPolygon(null);
     				GeneralPathX gpx = new GeneralPathX();
     				gpx.append(polygon, true);
     				gpx.append(polygon.getPathIterator(null), true);
     				if (gpx.isCCW()) {
     					gpx.flip();
     					polygon = createSurface(gpx);

     			theIterator.next();
     		} // end while loop
     		GeneralPathX gpx = new GeneralPathX();
     		gpx.append(geomAux.getInternalShape(), true);
     		gpx.append(geomAux.getInternalShape().getPathIterator(null), true);
     		VectorialLayerEdited vle = getVLE();
     		FeatureStore featureStore = ((FLyrVect) vle.getLayer())
     				.getFeatureStore();

branches/v2_0_0_prep/extensions/extEditing/src/org/gvsig/editing/gui/cad/tools/InternalPolygonCADTool.java
360	360	if (!gpxInternal.isCCW()) {
361	361	gpxInternal.flip();
362	362	}
363		newGp.append(gpxInternal,false);
	363	newGp.append(gpxInternal.getPathIterator(null),false);
364	364
365	365	return createSurface(newGp);
366	366	}

         public Geometry getGeometry(AffineTransform at) {
         	GeneralPathX polyLine;
     		try {
     			polyLine = new GeneralPathX(geomManager.createSurface(getGPX(), SUBTYPES.GEOM2D));
     			polyLine = new GeneralPathX(geomManager.createSurface(getGPX(), SUBTYPES.GEOM2D).getPathIterator(null));
     			polyLine.transform(at);
     	    	return geomManager.createSurface(polyLine, SUBTYPES.GEOM2D);
     		} catch (CreateGeometryException e) {
-...
             double r = p.distance(points[0]);
             Ellipse2D ellipse = new Ellipse2D.Double(x - r, y - r, 2. * r, 2. * r);
             setGPX(new GeneralPathX(ellipse));
             setGPX(new GeneralPathX(ellipse.getPathIterator(null)));
+        }
     	public void print(Graphics2D g, AffineTransform at, ISymbol symbol,

          * @param symbol DOCUMENT ME!
          */
         public void draw(Graphics2D g, AffineTransform at, ISymbol symbol) {
             GeneralPathX rectangle = new GeneralPathX(getGeometry());
             GeneralPathX rectangle = new GeneralPathX(getGeometry().getPathIterator(null));
             rectangle.transform(at);
             Geometry shapeAux;

     					d.height);
     			GeometryManager geomManager = GeometryLocator.getGeometryManager();
     			Curve curve = (Curve)geomManager.create(TYPES.CURVE, SUBTYPES.GEOM2D);
     			curve.setGeneralPath(new GeneralPathX(aShape));
     			curve.setGeneralPath(new GeneralPathX(aShape.getPathIterator(null)));
     			/*
     			 * create a full-featured Feature with randomed values at its fields

     					d.height);
     			GeometryManager geomManager = GeometryLocator.getGeometryManager();
     			Curve curve = (Curve)geomManager.create(TYPES.CURVE, SUBTYPES.GEOM2D);
     			curve.setGeneralPath(new GeneralPathX(aShape));
     			curve.setGeneralPath(new GeneralPathX(aShape.getPathIterator(null)));
     			/*
     			 * create a full-featured Feature with randomed values at its fields

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/rendering/legend/styling/TextPath.java
269	269	}
270	270	correctedPath.lineTo(endPointX, endPointY);
271	271
272		return geomManager.createCurve(new GeneralPathX(
273		correctedPath), SUBTYPES.GEOM2D);
	272	return geomManager.createCurve(new GeneralPathX(correctedPath.getPathIterator(null)), SUBTYPES.GEOM2D);
274	273	}
275	274
276	275	/**

     		AffineTransform at = AffineTransform.getTranslateInstance(p.getX(), p.getY());
     		at.concatenate(AffineTransform.getRotateInstance(theta));
     		returnedValue = geomManager.createSurface(new GeneralPathX(bounds), SUBTYPES.GEOM2D);
     		returnedValue = geomManager.createSurface(new GeneralPathX(bounds.getPathIterator(null)), SUBTYPES.GEOM2D);
     		returnedValue.transform(at);
     		return returnedValue;

     			case Geometry.TYPES.SURFACE:
     				GeneralPathX rectAux = new GeneralPathX(r);
     				GeneralPathX rectAux = new GeneralPathX(r.getPathIterator(null));
     				rectAux.transform(mT2);
     				geom = geomManager.createSurface(rectAux, SUBTYPES.GEOM2D);
-...
     				// Pol�gono
     				r.setSize(r.width / 3, r.height);
     				GeneralPathX rectAux2 = new GeneralPathX(r);
     				GeneralPathX rectAux2 = new GeneralPathX(r.getPathIterator(null));
     				rectAux2.transform(mT2);
     				geom = geomManager.createSurface(rectAux2, SUBTYPES.GEOM2D);
     				symbol.draw(g2, mT, geom, null);

     		Shape shape = gv.getOutline((float) p.getX(), (float) p.getY());
     		Geometry myFShape;
     		try {
     			myFShape = geomManager.createSurface(new GeneralPathX(shape.getBounds2D()), SUBTYPES.GEOM2D);
     			myFShape = geomManager.createSurface(new GeneralPathX(shape.getBounds2D().getPathIterator(null)), SUBTYPES.GEOM2D);
     			myFShape.transform(AffineTransform.getTranslateInstance(p.getX(), p.getY()));
     			if (rotation != 0) {

     		rect.setFrame(((int) rect.getMinX())+1, ((int) rect.getMinY())+1, ((int) rect.getWidth())-2, ((int) rect.getHeight())-2);
     		Geometry geom;
     		try {
     			geom = geomManager.createSurface(new GeneralPathX(rect), SUBTYPES.GEOM2D);
     			geom = geomManager.createSurface(new GeneralPathX(rect.getPathIterator(null)), SUBTYPES.GEOM2D);
     		} catch (CreateGeometryException e) {
     			logger.error("Creating a surface", e);
     			throw new SymbolDrawingException(getSymbolType());

     				return shp;
     			ArrayList segments = new ArrayList(); //<Point2D[]>
     			GeneralPathX gpx = new GeneralPathX(shp);
     			GeneralPathX gpx = new GeneralPathX(shp.getPathIterator(null));
     			PathIterator it = gpx.getPathIterator(null);
     			double[] data = new double[6];
     			Point2D segmentIni = null;

     			Shape myShp = stroke.createStrokedShape(shp);
     			Geometry haloShape = null;;
     			try {
     				haloShape = geomManager.createSurface(new GeneralPathX(myShp.getBounds2D()), SUBTYPES.GEOM2D);
     				haloShape = geomManager.createSurface(new GeneralPathX(myShp.getBounds2D().getPathIterator(null)), SUBTYPES.GEOM2D);
     			} catch (CreateGeometryException e) {
     				logger.error("Error creating a surface", e);
+    			}

     	public static GeneralPathX offsetLine(Shape p, double offset) {
     		if (Math.abs(offset) < 1) {
     			return new GeneralPathX(p);
     			return new GeneralPathX(p.getPathIterator(null));
+    		}
     		PathIterator pi = p.getPathIterator(null);
     		double[] dataCoords = new double[6];
-...
     					from = first;
     					try {
     						offsetSegments.append(offsetAndConsumeClosedSegments(
     								offset, segments), false);
     								offset, segments).getPathIterator(null), false);
     					} catch (NotEnoughSegmentsToClosePathException e) {
     						logger.error(
     								e.getMessage(), e);
-...
     				pi.next();
+    			}
     			offsetSegments.append(offsetAndConsumeSegments(offset, segments),
     			offsetSegments.append(offsetAndConsumeSegments(offset, segments).getPathIterator(null),
     					true);
     			return offsetSegments;
     		} catch (ParallelLinesCannotBeResolvedException e) {
     			logger.error(e.getMessage(), e);
     			return new GeneralPathX(p);
     			return new GeneralPathX(p.getPathIterator(null));
+    		}
+    	}
-...
     					pEnd = eq.resolve(eq1);
     				} catch (ParallelLinesCannotBeResolvedException e) { //Las lineas son paralelas y NO son la misma.
     					pEnd = new Point2D.Double(eq.xEnd, eq.yEnd);
     					gpx.append(new Line2D.Double(pIni, pEnd), true); // a?adimos una linea hasta el final del primer segmento
     					gpx.append(new Line2D.Double(pIni, pEnd).getPathIterator(null), true); // a?adimos una linea hasta el final del primer segmento
     //					 y asignamos como punto final el principio del siguiente segmento
     //					 para que en la siguiente iteraci?n lo tome como punto inicial.
     					pIni = pEnd;
-...
     				pEnd = new Point2D.Double(eq.xEnd, eq.yEnd);
+    			}
     			gpx.append(new Line2D.Double(pIni, pEnd), true);
     			gpx.append(new Line2D.Double(pIni, pEnd).getPathIterator(null), true);
     			segments.remove(0);
+    		}
     		return gpx;

     								// a?adimos sin unir al anterior
     								if (bFirstHoleEntity
     										|| ((psLine.type == DGNFileHeader.DGNT_SHAPE) && ((psLine.properties & 0x8000) != 0))) {
     									elementoCompuesto.append(elShape, false);
     									elementoCompuesto.append(elShape.getPathIterator(null), false);
     									bFirstHoleEntity = false;
     								} else {
     									elementoCompuesto.append(elShape, bConnect);
     									elementoCompuesto.append(elShape.getPathIterator(null), bConnect);
+    								}
     							} else {
     								addShape(createMultiCurve(elShape), auxRow,
-...
     						// Ellipse2D.Double(psArc.origin.x - psArc.primary_axis,
     						// psArc.origin.y - psArc.secondary_axis,2.0 *
     						// psArc.primary_axis, 2.0 * psArc.secondary_axis);
     						GeneralPathX elShapeArc = new GeneralPathX(elArco);
     						GeneralPathX elShapeArc = new GeneralPathX(elArco.getPathIterator(null));
     						// Transformamos el GeneralPahtX porque si transformamos
     						// elArco nos lo convierte
-...
     							// Y EL ELEMENTO ES UN POLIGONO
     							if (bFirstHoleEntity
     									|| ((elemento.type == DGNFileHeader.DGNT_SHAPE) && ((elemento.properties & 0x8000) != 0))) {
     								elementoCompuesto.append(elShapeArc, false);
     								elementoCompuesto.append(elShapeArc.getPathIterator(null), false);
     								bFirstHoleEntity = false;
     							} else {
     								elementoCompuesto.append(elShapeArc, bConnect);
     								elementoCompuesto.append(elShapeArc.getPathIterator(null), bConnect);
+    							}
     						} else {
     							addShape(createMultiCurve(elShapeArc), auxRow,

| gvSIG desktop 1

Revision 29973