/ - Diff - Application: gvSIG desktop - gvSIG

Revision 21112

     import java.awt.Graphics2D;
     import java.awt.image.BufferedImage;
     import java.util.Iterator;
     import java.util.Vector;
     import java.util.logging.Level;
     import java.util.logging.Logger;
-...
     import javax.print.attribute.standard.PrintQuality;
     import org.gvsig.data.ReadException;
     import org.gvsig.data.vectorial.Feature;
     import org.gvsig.data.vectorial.FeatureCollection;
     import org.gvsig.data.vectorial.FeatureStore;
     import org.gvsig.data.vectorial.FeatureType;
     import org.gvsig.fmap.core.geometries.utils.FConstant;
     import org.gvsig.fmap.core.geometries.utils.FLabel;
     import org.gvsig.fmap.geom.Geometry;
-...
     import org.gvsig.fmap.mapcontext.layers.FLayer;
     import org.gvsig.fmap.mapcontext.layers.ReadableVectorial;
     import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
     import org.gvsig.fmap.mapcontext.rendering.legend.NullValue;
     import org.gvsig.fmap.mapcontext.rendering.symbols.CartographicSupport;
     import org.gvsig.fmap.mapcontext.rendering.symbols.CartographicSupportToolkit;
     import org.gvsig.fmap.mapcontext.rendering.symbols.SimpleTextSymbol;
-...
     			&& (scale <= zoom.getMinScale()) ) ) {
     			try {
     				// limit the labeling to the visible extent
     				FBitSet bs = layer.queryByRect(viewPort.getAdjustedExtent());
     				ReadableVectorial source = layer.getSource();
     				SelectableDataSource recordSet = source.getRecordset();
     				for(int i=bs.nextSetBit(0); i>=0 && !cancel.isCanceled(); i=bs.nextSetBit(i+1)) {
     					Value[] vv = recordSet.getRow(i);
     //				FBitSet bs = layer.queryByRect(viewPort.getAdjustedExtent());
     				FeatureCollection collection=(FeatureCollection)layer.getFeatureStore().getDataCollection(new String[0],null,null);
     //				ReadableVectorial source = layer.getSource();
     //				SelectableDataSource recordSet = source.getRecordset();
     				Iterator iterator=collection.iterator();
     				while(iterator.hasNext()){
     					if (cancel.isCanceled()){
     						return;
+    					}
     					Feature feature=(Feature)iterator.next();
     //				for(int i=bs.nextSetBit(0); i>=0 && !cancel.isCanceled(); i=bs.nextSetBit(i+1)) {
     //					Value[] vv = recordSet.getRow(i);
     					double size;
     					if (useFixedSize){
-...
     					} else if (idHeightField != -1) {
     						// text size is defined in the table
     						try {
     							size = ((NumericValue) vv[idHeightField]).doubleValue() * fontScaleFactor;
     							size = ((Number) feature.get(idHeightField)).doubleValue() * fontScaleFactor;
     						} catch (ClassCastException ccEx) {
     							if (!NullValue.class.equals(vv[idHeightField].getClass())) {
     							if (!NullValue.class.equals(feature.get(idHeightField).getClass())) {
     								throw new ReadException("Unknown", ccEx);
+    							}
     							// a null value
     							Logger.getAnonymousLogger().
     								warning("Null text height value for text '"+vv[idTextField].toString()+"'");
     								warning("Null text height value for text '"+feature.get(idTextField).toString()+"'");
     							continue;
+    						}
     					} else {
-...
     					double rotation = 0D;
     					if (idRotationField!= -1) {
     						// text rotation is defined in the table
     						rotation = -Math.toRadians(((NumericValue) vv[idRotationField]).doubleValue());
     						rotation = -Math.toRadians(((Number) feature.get(idRotationField)).doubleValue());
+    					}
     					Geometry geom = source.getGeometry(i);
     					sym.setText(vv[idTextField].toString());
     					Geometry geom = (Geometry)feature.getDefaultGeometry();
     					sym.setText(feature.get(idTextField).toString());
     					sym.setRotation(rotation);
     					FLabel[] aux = geom.createLabels(0, true);
-...
     						sym.draw(g, null, p, cancel);
+    					}
+    				}
     			} catch (VisitorException e) {
     				Logger.getAnonymousLogger().log(Level.SEVERE, "Could not get the layer extent.\n" +
     						e.getMessage());
     			} catch (ExpansionFileReadException e) {
     				Logger.getAnonymousLogger().log(Level.SEVERE, "Could not draw annotation in the layer" +
     						"\""+layer.getName()+"\".\nIs the layer being edited?.\n"+e.getMessage());
     			} catch (ReadException e) {
     				Logger.getAnonymousLogger().log(Level.SEVERE, "Could not draw annotation in the layer.\n" +
     						e.getMessage());
-...
     	public String getRotationField() throws ReadException {
     		if (idRotationField == -1) return null;
     		return ((SelectableDataSource) layer.getRecordset())
     				.getFieldName(idRotationField);
     		return ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getByOrder(idRotationField).getName();
+    	}
     	public int getRotationFieldId() {
-...
     	public String getTextField() throws ReadException {
     		if (idTextField == -1) return null;
     		return ((SelectableDataSource) layer.getRecordset())
     				.getFieldName(idTextField);
     		return ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getByOrder(idTextField).getName();
+    	}
     	public int getTextFieldId() {
-...
     	public String getHeightField() throws ReadException {
     		if (idHeightField == -1) return null;
     		return ((SelectableDataSource) layer.getRecordset())
     				.getFieldName(idHeightField);
     		return ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getByOrder(idHeightField).getName();
+    	}
     	public int getHeightFieldId() {
-...
     	public void setTextField(String textFieldName) {
     		try {
     			idTextField = ((SelectableDataSource) layer.getRecordset())
     								.getFieldIndexByName(textFieldName);
     		} catch (ReadDriverException e) {
     			idTextField = ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getFieldIndex(textFieldName);
     		} catch (ReadException e) {
     			Logger.getAnonymousLogger().log(Level.SEVERE, e.getMessage());
+    		}
+    	}
-...
     	public void setRotationField(String rotationFieldName) {
     		if (rotationFieldName != null) {
     			try {
     				idRotationField = ((SelectableDataSource) layer.getRecordset())
     					.getFieldIndexByName(rotationFieldName);
     			} catch (ReadDriverException e) {
     				idRotationField = ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getFieldIndex(rotationFieldName);
     			} catch (ReadException e) {
     				Logger.getAnonymousLogger().log(Level.SEVERE, e.getMessage());
+    			}
     		} else idRotationField = -1;
-...
     	public void setHeightField(String heightFieldName) {
     		if (heightFieldName != null) {
     			try {
     				idHeightField = ((SelectableDataSource) layer.getRecordset())
     				.getFieldIndexByName(heightFieldName);
     				idHeightField = ((FeatureType)layer.getFeatureStore().getFeatureTypes().get(0)).getFieldIndex(heightFieldName);
     			} catch (ReadException e) {
     				Logger.getAnonymousLogger().log(Level.SEVERE, e.getMessage());
+    			}
-...
+    	}
     	public void print(Graphics2D g, ViewPort viewPort, Cancellable cancel, PrintRequestAttributeSet properties) throws ReadDriverException {
     	public void print(Graphics2D g, ViewPort viewPort, Cancellable cancel, PrintRequestAttributeSet properties) throws ReadException {
     		isPrinting = true;
     		PrintQuality resolution=(PrintQuality)properties.get(PrintQuality.class);
     		if (resolution.equals(PrintQuality.NORMAL)){

     	public FeatureCollection getFeatureIteratorByLabelClass(FLyrVect layer, LabelClass lc, ViewPort viewPort, String[] usedFields)
     	throws ReadException {
     		return layer.getSource().getFeatureIterator(
     					viewPort.getAdjustedExtent(), usedFields,
     					layer.getProjection(), true);
     		return layer.getFeatureStore().getDataCollection(usedFields,null,order);
     //		layer.getSource().getFeatureIterator(
     //					viewPort.getAdjustedExtent(), usedFields,
     //					layer.getProjection(), true);
+    	}
     	public boolean definesPriorities() {

     			throw new RuntimeException(
     					"No se espera que SelectByPointVisitor lance esta excepci�n",
     					e1);
     		} catch (VisitorException e) {
     			throw new RuntimeException(
     					"No se espera que SelectByPointVisitor lance esta excepci�n",
     					e);
+    		}
     		return visitor.getSelectBound();
-...
     	 * @throws ReadDriverException if fails reading with the driver.
     	 */
     	public void draw(BufferedImage image, Graphics2D g, Cancellable cancel,
     			double scale) throws ReadDriverException {
     			double scale) throws ReadException {
     		if (viewPort.getExtent() == null) {
     			// System.err.println("viewPort.getExtent() = null");
     			return;
-...
     	 * @see GraphicLayer#draw(BufferedImage, Graphics2D, ViewPort, Cancellable, double)
     	 */
     	public void drawGraphics(BufferedImage image, Graphics2D g,
     			Cancellable cancel, double scale) throws ReadDriverException {
     			Cancellable cancel, double scale) throws ReadException {
     		if (viewPort == null)
     			return;
     		tracLayer.draw(image, g, viewPort, cancel, scale);
-...
     	 * @see #draw(BufferedImage, Graphics2D, Cancellable, double)
     	 */
     	public void draw(BufferedImage image, Graphics2D g, double scale)
     			throws ReadDriverException {
     			throws ReadException {
     		layers.setDirty(true);
     		draw(image, g, new Cancellable() {
     			/**
-...
+    	 *
     	 * @see FLayers#getFullExtent()
     	 */
     	public Rectangle2D getFullExtent() throws ReadDriverException {
     	public Rectangle2D getFullExtent() throws ReadException {
     		return layers.getFullExtent();
+    	}
-...
     				if (lyr.isAvailable()) {
     					try {
     						getViewPort().setExtent(lyr.getFullExtent());
     					} catch (ReadDriverException e1) {
     					} catch (ReadException e1) {
     						e1.printStackTrace();
+    					}
+    				}
-...
     				c.addLegendListener(eventBuffer);
+    			}
     			if (lyr instanceof AlphanumericData) {
     				Selectable s=null;
     				try {
     					s = ((AlphanumericData) lyr).getRecordset();
     					if (s!=null) {
     						s.addSelectionListener(eventBuffer);
+    					}
     				} catch (ReadDriverException e1) {
     					e1.printStackTrace();
+    				}
+    			}
     //			if (lyr instanceof AlphanumericData) {
     //				Selectable s=null;
     //				try {
     //					s = ((AlphanumericData) lyr).getRecordset();
     //					if (s!=null) {
     //						s.addSelectionListener(eventBuffer);
     //					}
     //				} catch (ReadException e1) {
     //					e1.printStackTrace();
     //				}
     //
     //			}
     			if (lyr instanceof FLayers){
     				FLayers lyrs=(FLayers)lyr;
     				for(int i=0;i<lyrs.getLayersCount();i++){

Also available in: Unified diff