/ - Diff - Application: gvSIG desktop - gvSIG

Revision 4523

+     *
      * $Id$
      * $Log$
      * Revision 1.35  2006-02-28 18:15:22  fjp
      * Revision 1.36  2006-03-22 11:46:29  caballero
      * Editar capa de anotaciones
+     *
      * Revision 1.35  2006/02/28 18:15:22  fjp
      * Consola de CAD
+     *
      * Revision 1.34  2006/02/24 11:30:32  fjp
-...
     import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
     import com.iver.cit.gvsig.fmap.operations.strategies.FeatureVisitor;
     import com.vividsolutions.jts.geom.Envelope;
     import com.vividsolutions.jts.index.SpatialIndex;
     import com.vividsolutions.jts.index.quadtree.Quadtree;
     /**
-...
     	protected VectorialAdapter ova;
     	//private VectorialDriver driver;
     	protected Quadtree index;
     	protected Rectangle2D fullExtent;
     	//private SpatialIndex spatialIndex;
     	/* private class MyFeatureIterator implements IFeatureIterator
+    	{
     		int numReg = 0;
-...
     		String epsg;
     		IFeatureIterator origFeatIt;
     		boolean bHasNext = true;
     		public MyFeatureIterator(Rectangle2D r, String strEPSG) throws DriverException
+    		{
     			rect = r;
-...
+    		}
     		public void closeIterator() throws DriverException {
+    		}
     	} */
     	public VectorialEditableAdapter(){
     		super();
+    	}
-...
          * @throws EditionException DOCUMENT ME!
          */
         public void startEdition() throws EditionException {
             super.startEdition();
         	isEditing = true;
             try {
                 expansionFile.open();
                 if (index==null || fullExtent==null){
                 // TODO: Si la capa dispone de un ?ndice espacial, hacer
                 // algo aqu? para que se use ese ?ndice espacial.
                 index = new Quadtree();
-...
                     	fullExtent = fullExtent.createUnion(r);
+                    }
+                }
+                }
             } catch (DriverIOException e) {
                 throw new EditionException(e);
             } catch (IOException e) {
-...
         	int calculatedIndex=getCalculatedIndex(index);
         	Integer integer = new Integer(calculatedIndex);
             //Si no est? en el fichero de expansi?n
         	DefaultRowEdited edRow=null;
         	DefaultRowEdited edRow=null;
             if (!relations.containsKey(integer)) {
     			try {
     				edRow = new DefaultRowEdited(ova.getFeature(calculatedIndex),
-...
                 edRow = new DefaultRowEdited(aux.getLinkedRow().cloneRow(), aux.getStatus(), index);
                 return edRow;
+            }
+        }
+        }
         /**
          * Elimina una geometria. Si es una geometr?a original de la capa en
          * edici?n se marca como eliminada (haya sido modificada o no). Si es una
-...
             Rectangle2D r = g.getBounds2D();
             index.insert(new Envelope(r.getX(), r.getX() + r.getWidth(), r.getY(),
                     r.getY() + r.getHeight()), new Integer(calculatedIndex));
             return calculatedIndex;
+        }
         /**
-...
     	 */
     	public Rectangle2D getFullExtent() throws DriverIOException {
             /* if (fullExtent == null)
+            {
+            {
             	fullExtent = ova.getFullExtent();
+            }
             else
-...
+    	}
     	/**
     	 * Usar solo cuando est?s seguro de que puedes
     	 * gastar memoria. Nosotros lo usamos para las
     	 * gastar memoria. Nosotros lo usamos para las
     	 * b?squedas por ?ndice espacial con el handle.
     	 * La idea es usarlo una vez, guardar las geometr?as que
     	 * La idea es usarlo una vez, guardar las geometr?as que
     	 * necesitas en ese extent y trabajar con ellas
     	 * hasta el siguiente cambio de extent.
     	 * @param r
-...
     		} catch (IOException e1) {
     			throw new DriverException(e1);
+    		}
     		return feats;
+    	}
     	public void setSpatialIndex(SpatialIndex spatialIndex) {
     		index=(Quadtree)spatialIndex;
+    	}
     	public void setFullExtent(Rectangle2D fullExtent2) {
     		fullExtent=fullExtent2;
+    	}
+    }

     import com.iver.cit.gvsig.fmap.core.ShapeFactory;
     import com.iver.cit.gvsig.fmap.core.v02.FConverter;
     import com.iver.cit.gvsig.fmap.core.v02.FLabel;
     import com.iver.cit.gvsig.fmap.drivers.BoundedShapes;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.layers.FLyrAnnotation;
     import com.iver.cit.gvsig.fmap.layers.MappingAnnotation;
     import com.vividsolutions.jts.geom.Envelope;
     import com.vividsolutions.jts.index.quadtree.Quadtree;
     public class AnnotationEditableAdapter extends VectorialEditableAdapter{
     	private ArrayList labels;
-...
+    	}
     	public int doModifyRow(int calculatedIndex, IRow feat) throws IOException, DriverIOException {
     		FLabel label=(FLabel)labels.get(calculatedIndex);
     		Value value=feat.getAttribute(mapping.getColumnText());
     		((FLabel)labels.get(calculatedIndex)).setString(value.toString());
     		Rectangle2D rLabelAnt=(Rectangle2D)label.getBoundBox().clone();
     		Rectangle2D rLabel=(Rectangle2D)label.getBoundBox();
     		label.setString(value.toString());
     		if (mapping.getColumnRotate()==mapping.getColumnText()){
     			((FLabel)labels.get(calculatedIndex)).setRotation(((NumericValue)value).doubleValue());
     			label.setRotation(((NumericValue)value).doubleValue());
     		} //Aqu? hay que comprobar, si se quiere, el resto de columnas, si son iguales a la de Texto.
     		return super.doModifyRow(calculatedIndex, feat);
     		int posAnteriorInExpansionFile = -1;
     		Integer integer = new Integer(calculatedIndex);
     		IFeature featAnt = null;
     		System.err.println("Modifica una Row en la posici?n: "
     				+ calculatedIndex);
     		// Si la geometr?a no ha sido modificada
     		if (!relations.containsKey(integer)) {
     			int newPosition = expansionFile.addRow(feat);
     			relations.put(integer, new Integer(newPosition));
     			// Se actualiza el ?ndice espacial
     			try {
     				featAnt = (DefaultFeature) (ova.getFeature(calculatedIndex));
     			} catch (DriverException e) {
     				throw new DriverIOException(e);
+    			}
     			Rectangle2D rAntAux = featAnt.getGeometry().getBounds2D();
     			Rectangle2D rAnt=label.getBoundBox();
     			rAnt.setFrame(rAntAux.getX(),rAntAux.getY(),rAnt.getWidth(),rAnt.getHeight());
     			Rectangle2D r = ((IFeature) feat).getGeometry().getBounds2D();
     			double difX=r.getX()-rAnt.getX();
     			double difY=r.getY()-rAnt.getY();
     			Point2D p=new Point2D.Double(rLabel.getX()+difX,rLabel.getY()+difY);
     			label.setBoundBox(new Rectangle2D.Double(p.getX(),p.getY(),rLabel.getWidth(),rLabel.getHeight()));
     			label.setOrig(p);
     			index.remove(new Envelope(rLabelAnt.getX(), rLabelAnt.getX()
     					+ rLabelAnt.getWidth(), rLabelAnt.getY(), rLabelAnt.getY()
     					+ rLabelAnt.getHeight()), new Integer(calculatedIndex));
     			index.insert(new Envelope(rLabel.getX(), rLabel.getX() + rLabel.getWidth(), rLabel
     					.getY(), rLabel.getY() + rLabel.getHeight()), new Integer(
     					calculatedIndex));
     		} else {
     			// Obtenemos el ?ndice en el fichero de expansi?n
     			int num = ((Integer) relations.get(integer)).intValue();
     			posAnteriorInExpansionFile = num;
     			// Obtenemos la geometr?a para actualiza el ?ndice
     			// espacialposteriormente
     			featAnt = (IFeature) expansionFile.getRow(num).getLinkedRow();
     			/*
     			 * Se modifica la geometr?a y nos guardamos el ?ndice dentro del
     			 * fichero de expansi?n en el que se encuentra la geometr?a
     			 * modificada
     			 */
     			num = expansionFile.modifyRow(num, feat);
     			/*
     			 * Actualiza la relaci?n del ?ndice de la geometr?a al ?ndice en el
     			 * fichero de expansi?n.
     			 */
     			relations.put(integer, new Integer(num));
     			// Se modifica el ?ndice espacial
     			Rectangle2D rAnt = featAnt.getGeometry().getBounds2D();
     			Rectangle2D r = ((IFeature) feat).getGeometry().getBounds2D();
     			double difX=r.getX()-rAnt.getX();
     			double difY=r.getY()-rAnt.getY();
     			Point2D p=new Point2D.Double(rLabel.getX()+difX,rLabel.getY()+difY);
     			label.setBoundBox(new Rectangle2D.Double(p.getX(),p.getY(),rLabel.getWidth(),rLabel.getHeight()));
     			label.setOrig(p);
     			index.remove(new Envelope(rLabelAnt.getX(), rLabelAnt.getX()
     					+ rLabelAnt.getWidth(), rLabelAnt.getY(), rLabelAnt.getY()
     					+ rLabelAnt.getHeight()), new Integer(calculatedIndex));
     			index.insert(new Envelope(rLabel.getX(), rLabel.getX() + rLabel.getWidth(), rLabel
     					.getY(), rLabel.getY() + rLabel.getHeight()), new Integer(
     					calculatedIndex));
+    		}
     		return posAnteriorInExpansionFile;
+    	}
     	public IRow doRemoveRow(int index) throws DriverIOException, IOException {
-...
+    		}
     		return ShapeFactory.createPolygon2D(resul);
+        }
         public void startEdition() throws EditionException {
         	isEditing = true;
     		try {
     			expansionFile.open();
     				index = new Quadtree();
     				for (int i = 0; i < labels.size(); i++) {
     					Rectangle2D r=((FLabel)labels.get(i)).getBoundBox();
     					Envelope e = new Envelope(r.getX(),
     							r.getX() + r.getWidth(), r.getY(), r.getY()
     									+ r.getHeight());
     					index.insert(e, new Integer(i));
     					if (fullExtent == null) {
     						fullExtent = r;
     					} else {
     						fullExtent = fullExtent.createUnion(r);
+    					}
+    				}
     		} catch (IOException e) {
     			throw new EditionException(e);
+    		}
     		System.err.println("Se han metido en el ?ndice "
     				+ index.queryAll().size() + " labels");
+    	}
         public Rectangle2D getShapeBounds(int index) throws IOException {
     		//Solo se utiliza cuando el driver es BoundedShapes
     //		 Si no est? en el fichero de expansi?n
     		Integer integer = new Integer((int) index);
     		if (!relations.containsKey(integer)) {
     			if (ova.getDriver() instanceof BoundedShapes){
     				BoundedShapes bs = (BoundedShapes) ova.getDriver();
     				return bs.getShapeBounds(index);
     			}else{
     				return ova.getDriver().getShape(index).getBounds2D();
+    			}
     		} else {
     			int num = ((Integer) relations.get(integer)).intValue();
     			DefaultRowEdited feat;
     			feat = (DefaultRowEdited) expansionFile.getRow(num);
     			if (feat.getStatus() == IRowEdited.STATUS_DELETED)
     				return null;
     			IGeometry geom = ((IFeature)feat.getLinkedRow()).getGeometry();
     			return geom.getBounds2D();//getGeometry();
+    		}
+    	}
+    }

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java
791	791
792	792	sds = ds;
793	793	sds.setSelectionSupport(selectionSupport);
794
	794
795	795	} catch (DriverLoadException e) {
796	796	throw new DriverException(e);
797	797	}
798	798	}
799	799	return sds;
800		}
801
	800	}
	801
802	802	/* (non-Javadoc)
803	803	* @see com.iver.cit.gvsig.fmap.layers.FLyrDefault#setEditing(boolean)
804	804	*/
...	...
821	821	}
822	822	vea.setOriginalVectorialAdapter(getSource());
823	823	try{
	824	///vea.setSpatialIndex(getSpatialIndex());
	825	///vea.setFullExtent(getFullExtent());
824	826	vea.startEdition();
825	827	setSource(vea);
826	828	getRecordset().setSelectionSupport(vea.getOriginalAdapter().getRecordset().getSelectionSupport());
...	...
833	835	// TODO Auto-generated catch block
834	836	e.printStackTrace();
835	837	}
836
837	838
	839
838	840	}
839	841	else
840	842	{

     		FSymbol theSymbol = l.getDefaultSymbol();
     		theSymbol.setFontSizeInPixels(inPixels);
     		System.out.println("Dibujando Anotaciones...");
     		ViewPort vp=capa.getFMap().getViewPort();
     		ViewPort vp=viewPort;//capa.getFMap().getViewPort();
     		AffineTransform at=vp.getAffineTransform();
     		try {
     		long numRows=lyrAnnotation.getRecordset().getRowCount();

Also available in: Unified diff