/ - Diff - Application: gvSIG desktop - gvSIG

     	 * @param dpi TODO
     	 * @throws ReadException
     	 */
     	public void draw(BufferedImage mapImage, Graphics2D mapGraphics, ViewPort viewPort,
     	public void draw(BufferedImage mapImage, Graphics2D mapGraphics, double scale, ViewPort viewPort,
     			Cancellable cancel, double dpi) throws ReadException;
     	/**
-...
     	 * @param properties
     	 * @throws ReadException
     	 */
     	public void print(Graphics2D g, ViewPort viewPort, Cancellable cancel, PrintAttributes properties)
     	public void print(Graphics2D g, double scale, ViewPort viewPort, Cancellable cancel, PrintAttributes properties)
     	throws ReadException;
     	/**

     import org.gvsig.fmap.mapcontext.rendering.symbols.SymbolDrawingException;
     import org.gvsig.fmap.mapcontext.rendering.symbols.styles.ILabelStyle;
     import org.gvsig.tools.persistence.Persistent;
     import org.gvsig.tools.lang.Cloneable;
     public interface ILabelClass extends  Persistent, CartographicSupport{
     public interface ILabelClass extends Cloneable, Persistent, CartographicSupport{
     	/**
     	 * Returns true if the label will be showed in the map
-...
     	boolean isVisible();
     	/**
     	 * Returns true if the label will be showed in the map
+    	 *
     	 * @return isVisible boolean
     	 */
     	boolean isVisible(double scale);
     	/**
     	 * Sets the visibility of the label in the map.
+    	 *
     	 * @param isVisible boolean

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/FLyrVect.java
777	777	double scale,
778	778	double dpi) throws ReadException {
779	779	if (strategy != null && isWithinScale(scale)) {
780		strategy.draw(image, g, viewPort, cancel, dpi);
	780	strategy.draw(image, g, scale, viewPort, cancel, dpi);
781	781	}
782	782	}
783	783
...	...
787	787	double scale,
788	788	PrintAttributes properties) throws ReadException {
789	789	if (strategy != null) {
790		strategy.print(g, viewPort, cancel, properties);
	790	strategy.print(g, scale, viewPort, cancel, properties);
791	791	}
792	792	}
793	793
...	...
917	917	featureQuery.setAttributeNames(names);
918	918	featureQuery.setFeatureTypeId(featureType.getId());
919	919	}
920		String geomName = featureStore.getDefaultFeatureType()
	920	String geomName = featureStore.getDefaultFeatureType()
921	921	.getDefaultGeometryAttributeName();
922	922
923	923	Envelope query_env = fromViewPortCRSToSourceCRS(this, envelope);

     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentContext;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     import org.gvsig.tools.persistence.spi.PersistentContextServices;
     /**
-...
             return defLabelClass.isVisible();
+        }
         public boolean isVisible(double scale) {
             return this.isVisible();
+        }
         public void setVisible(boolean isVisible) {
             defLabelClass.setVisible(isVisible);
+        }
-...
             return defLabelClass.getStringLabelExpression();
+        }
        public Object clone() throws CloneNotSupportedException {
     	PersistenceManager persman = ToolsLocator.getPersistenceManager();
             PersistentContext context = null;
             Object resp = null;
             PersistentState state = null;
             try {
                 state = persman.getState(this, true);
             } catch (PersistenceException e) {
                 logger.warn("Can't clone, return me !!!!!!!!!!!!!!", e);
                 return this;
+            }
             context = state.getContext();
             if (context instanceof PersistentContextServices) {
                 /*
                  * Ensure that previous instances are not used,
                  * so objects are recreated
                  */
                 ((PersistentContextServices) context).clear();
+            }
             try {
                 resp = persman.create(state);
             } catch (Exception e) {
                 logger.warn("Can't clone, return me !!!!!!!!!!!!!!", e);
                 return this;
+            }
             return resp;
+        }
+    }

+    		}
+    	}
     	public void draw(BufferedImage mapImage, Graphics2D mapGraphics,
     			ViewPort viewPort,
     			double scale, ViewPort viewPort,
     			Cancellable cancel,
     			double dpi) throws ReadException {
-...
     		 */
     		for (ILabelClass lc : ts) {
     		    if (!lc.isVisible()) {
     		    if (!lc.isVisible(scale)) {
     		        /*
     		         * Avoid non-visible labels
     		         */
-...
+    	}
     	public void print(
     			Graphics2D g, ViewPort viewPort,
     			Graphics2D g, double scale, ViewPort viewPort,
     			Cancellable cancel, PrintAttributes properties)
     			throws ReadException {
-...
     		/* signal printing output */
     		printMode = true;
     		draw(null,g,viewPort,cancel,dpi);
     		draw(null,g,scale, viewPort,cancel,dpi);
+    	}
     	public String[] getUsedFields() {

     import java.awt.GridLayout;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.util.logging.Level;
     import javax.swing.AbstractCellEditor;
     import javax.swing.BorderFactory;
-...
     			return;
     		lc = labelClass;
     		clonedClass = (ILabelClass) LabelClassUtils.clone(lc);
                     try {
                         clonedClass = (ILabelClass) lc.clone();
                     } catch (CloneNotSupportedException ex) {
                         clonedClass = lc;
+                    }
     		labelPreview.setLabelClass(clonedClass);
     		boolean clo_use_sql = LabelClassUtils.isUseSqlQuery(clonedClass);

             URL u = new URL(url);
             String[] x = u.getPath().split("/");
             String path = "";
             for( int i=1; i<x.length; i++ ) { path = path + "/" + x[i]; URL t = new URL(u,path) ; mkdir(t.toString()); } } public void mkdir(String url) throws Exception {
             for( int i=1; i<x.length; i++ ) {
                 path = path + "/" + x[i];
                 URL t = new URL(u,path) ;
                 mkdir(t.toString());
+            }
+        }
         public void mkdir(String url) throws Exception {
             if( ! exists(url) ) {
                 log.info("[WEBDAV] mkdir '"+url+"'.");
                 sardine.createDirectory(url);

     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.Persistent;
     import org.gvsig.tools.persistence.PersistentContext;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     import org.gvsig.tools.persistence.spi.PersistentContextServices;
     import org.gvsig.tools.util.Callable;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
+    	}
     	/**
     	 * Returns true if the label will be showed in the map
+    	 *
     	 * @return isVisible boolean
     	 */
     	public boolean isVisible(double scale) {
     		return isVisible();
+    	}
     	/**
     	 * Sets the visibility of the label in the map.
+    	 *
     	 * @param isVisible boolean
-...
     		return expr;
+    	}
         public Object clone() throws CloneNotSupportedException {
     	PersistenceManager persman = ToolsLocator.getPersistenceManager();
             PersistentContext context = null;
             Object resp = null;
             PersistentState state = null;
             try {
                 state = persman.getState(this, true);
             } catch (PersistenceException e) {
                 logger.warn("Can't clone, return me !!!!!!!!!!!!!!", e);
                 return this;
+            }
             context = state.getContext();
             if (context instanceof PersistentContextServices) {
                 /*
                  * Ensure that previous instances are not used,
                  * so objects are recreated
                  */
                 ((PersistentContextServices) context).clear();
+            }
             try {
                 resp = persman.create(state);
             } catch (Exception e) {
                 logger.warn("Can't clone, return me !!!!!!!!!!!!!!", e);
                 return this;
+            }
             return resp;
+        }
+    }

             this.zoom = constraints;
+        }
         private double getScale(ViewPort vp, PrintAttributes patts)
                 throws ReadException {
     //    private double getScale(ViewPort vp, PrintAttributes patts)
     //            throws ReadException {
     //
     //        double dpi = 0;
     //        if (patts != null) {
     //            int len = PrintAttributes.PRINT_QUALITY_DPI.length;
     //            int priq = patts.getPrintQuality();
     //            if (priq < 0 || priq >= len) {
     //                dpi = vp.getDPI();
     //            } else {
     //                dpi = PrintAttributes.PRINT_QUALITY_DPI[priq];
     //            }
     //        } else {
     //            dpi = vp.getDPI();
     //        }
     //
     //        // ============== We have dpi now ====================
     //        IProjection proj = vp.getProjection();
     //
     //        if (vp.getImageSize() == null || vp.getAdjustedEnvelope() == null) {
     //            throw new ReadException("",
     //                    new Exception("Viewport does not have image size or envelope"));
     //        }
     //
     //        double[] trans2Meter = MapContext.getDistanceTrans2Meter();
     //        if (proj == null) {
     //            double wmeters = ((vp.getImageSize().width / dpi) * 0.0254);
     //            return (long) ((trans2Meter[vp.getMapUnits()] * vp.getAdjustedEnvelope().getLength(0))
     //                    / wmeters);
     //        } else {
     //            return Math.round(proj.getScale(
     //                    vp.getAdjustedEnvelope().getMinimum(0)
     //                    * trans2Meter[vp.getMapUnits()],
     //                    vp.getAdjustedEnvelope().getMaximum(0)
     //                    * trans2Meter[vp.getMapUnits()],
     //                    vp.getImageSize().width,
     //                    dpi));
     //        }
     //
     //    }
             double dpi = 0;
             if (patts != null) {
                 int len = PrintAttributes.PRINT_QUALITY_DPI.length;
                 int priq = patts.getPrintQuality();
                 if (priq < 0 || priq >= len) {
                     dpi = vp.getDPI();
                 } else {
                     dpi = PrintAttributes.PRINT_QUALITY_DPI[priq];
+                }
             } else {
                 dpi = vp.getDPI();
+            }
             // ============== We have dpi now ====================
             IProjection proj = vp.getProjection();
             if (vp.getImageSize() == null || vp.getAdjustedEnvelope() == null) {
                 throw new ReadException("",
                         new Exception("Viewport does not have image size or envelope"));
+            }
             double[] trans2Meter = MapContext.getDistanceTrans2Meter();
             if (proj == null) {
                 double wmeters = ((vp.getImageSize().width / dpi) * 0.0254);
                 return (long) ((trans2Meter[vp.getMapUnits()] * vp.getAdjustedEnvelope().getLength(0))
                         / wmeters);
             } else {
                 return Math.round(proj.getScale(
                         vp.getAdjustedEnvelope().getMinimum(0)
                         * trans2Meter[vp.getMapUnits()],
                         vp.getAdjustedEnvelope().getMaximum(0)
                         * trans2Meter[vp.getMapUnits()],
                         vp.getImageSize().width,
                         dpi));
+            }
+        }
         private void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
         private void draw(BufferedImage image, Graphics2D g, double scale, ViewPort viewPort,
                 Cancellable cancel, PrintAttributes props) throws ReadException {
             double scale = getScale(viewPort, props);
     //        double scale = getScale(viewPort, props);
             SimpleTextSymbol sym = new SimpleTextSymbol();
             sym.setFont(getFont());
-...
+            }
+        }
         public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
         public void draw(BufferedImage image, Graphics2D g, double scale, ViewPort viewPort,
                 Cancellable cancel, double dpi) throws ReadException {
             draw(image, g, viewPort, cancel, null);
             draw(image, g, scale, viewPort, cancel, null);
+        }
         private org.gvsig.fmap.geom.primitive.Point createLabelPoint(org.gvsig.fmap.geom.Geometry geom)
-...
             this.colorFieldName = colorFieldName;
+        }
         public void print(Graphics2D g, ViewPort viewPort, Cancellable cancel,
         public void print(Graphics2D g, double scale, ViewPort viewPort, Cancellable cancel,
                 PrintAttributes props) throws ReadException {
             draw(null, g, viewPort, cancel, props);
             draw(null, g, scale, viewPort, cancel, props);
+        }
         public void setUsesFixedSize(boolean b) {

Application: gvSIG desktop

Revision 41676