hey Peppe, i see you are still reformatting whitespaces for whole classes. assuming that this is still not intentional, please find the setting to disable this behaviour. also the (i assume) automatic addition of the keyword /final/ bugs me a little.
regards.. ede On 30.10.2018 15:13, jump-pilot-svn--- via Jump-pilot-devel wrote: > Revision: 5986 > http://sourceforge.net/p/jump-pilot/code/5986 > Author: ma15569 > Date: 2018-10-30 14:13:25 +0000 (Tue, 30 Oct 2018) > Log Message: > ----------- > Method to get available values of styles from a feature collection > > Modified Paths: > -------------- > > core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/StyleUtil.java > > Modified: > core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/StyleUtil.java > =================================================================== > --- > core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/StyleUtil.java > 2018-10-30 13:34:49 UTC (rev 5985) > +++ > core/trunk/src/com/vividsolutions/jump/workbench/ui/renderer/style/StyleUtil.java > 2018-10-30 14:13:25 UTC (rev 5986) > @@ -31,39 +31,44 @@ > */ > package com.vividsolutions.jump.workbench.ui.renderer.style; > > +import java.awt.Color; > +import java.awt.Graphics2D; > +import java.awt.Paint; > +import java.awt.Shape; > +import java.awt.Stroke; > +import java.awt.geom.GeneralPath; > +import java.awt.geom.NoninvertibleTransformException; > +import java.util.Iterator; > +import java.util.Set; > +import java.util.TreeSet; > + > import com.vividsolutions.jts.geom.Envelope; > import com.vividsolutions.jts.geom.Geometry; > import com.vividsolutions.jts.geom.GeometryCollection; > import com.vividsolutions.jts.geom.LineString; > import com.vividsolutions.jts.geom.MultiLineString; > -import com.vividsolutions.jts.geom.TopologyException; > -import com.vividsolutions.jts.util.AssertionFailedException; > - > +import com.vividsolutions.jump.feature.Feature; > +import com.vividsolutions.jump.feature.FeatureCollection; > import com.vividsolutions.jump.geom.EnvelopeUtil; > import com.vividsolutions.jump.workbench.ui.Viewport; > > -import java.awt.*; > -import java.awt.geom.GeneralPath; > -import java.awt.geom.NoninvertibleTransformException; > - > - > public class StyleUtil { > /** > * Smart enough to not fill LineStrings. > */ > public static void paint(Geometry geometry, Graphics2D g, > - Viewport viewport, boolean renderingFill, Stroke fillStroke, > - Paint fillPaint, boolean renderingLine, Stroke lineStroke, > - Color lineColor) throws NoninvertibleTransformException { > + Viewport viewport, boolean renderingFill, Stroke fillStroke, > + Paint fillPaint, boolean renderingLine, Stroke lineStroke, > + Color lineColor) throws NoninvertibleTransformException { > if (geometry instanceof GeometryCollection) { > paintGeometryCollection((GeometryCollection) geometry, g, > viewport, > - renderingFill, fillStroke, fillPaint, renderingLine, > - lineStroke, lineColor); > + renderingFill, fillStroke, fillPaint, renderingLine, > + lineStroke, lineColor); > > return; > } > > - Shape shape = toShape(geometry, viewport); > + final Shape shape = toShape(geometry, viewport); > if (!(shape instanceof GeneralPath) && renderingFill) { > g.setStroke(fillStroke); > g.setPaint(fillPaint); > @@ -77,80 +82,113 @@ > } > > private static void paintGeometryCollection(GeometryCollection > collection, > - Graphics2D g, Viewport viewport, boolean renderingFill, > - Stroke fillStroke, Paint fillPaint, boolean renderingLine, > - Stroke lineStroke, Color lineColor) > - throws NoninvertibleTransformException { > - //For GeometryCollections, render each element separately. Otherwise, > - //for example, if you pass in a GeometryCollection containing a ring > and a > - // disk, you cannot render them as such: if you use Graphics.fill, > you'll get > - //two disks, and if you use Graphics.draw, you'll get two rings. > [Jon Aquino] > + Graphics2D g, Viewport viewport, boolean renderingFill, > + Stroke fillStroke, Paint fillPaint, boolean renderingLine, > + Stroke lineStroke, Color lineColor) > + throws NoninvertibleTransformException { > + // For GeometryCollections, render each element separately. > Otherwise, > + // for example, if you pass in a GeometryCollection containing a ring > + // and a > + // disk, you cannot render them as such: if you use Graphics.fill, > + // you'll get > + // two disks, and if you use Graphics.draw, you'll get two rings. > [Jon > + // Aquino] > for (int i = 0; i < collection.getNumGeometries(); i++) { > paint(collection.getGeometryN(i), g, viewport, renderingFill, > - fillStroke, fillPaint, renderingLine, lineStroke, lineColor); > + fillStroke, fillPaint, renderingLine, lineStroke, > lineColor); > } > } > > private static Shape toShape(Geometry geometry, Viewport viewport) > - throws NoninvertibleTransformException { > - //At high magnifications, Java rendering can be sped up by clipping > - //the Geometry to only that portion visible inside the viewport. > - //Hence the code below. [Jon Aquino] > - Envelope bufferedEnvelope = > EnvelopeUtil.bufferByFraction(viewport.getEnvelopeInModelCoordinates(), > - 0.05); > + throws NoninvertibleTransformException { > + // At high magnifications, Java rendering can be sped up by clipping > + // the Geometry to only that portion visible inside the viewport. > + // Hence the code below. [Jon Aquino] > + final Envelope bufferedEnvelope = EnvelopeUtil.bufferByFraction( > + viewport.getEnvelopeInModelCoordinates(), 0.05); > Geometry actualGeometry = geometry; > - Envelope geomEnv = actualGeometry.getEnvelopeInternal(); > - if (! bufferedEnvelope.contains(geomEnv)) { > - /** > - * MD - letting Java2D do more clipping actually seems to be > slower! > - * So don't use following "optimization" > - */ > - //if (isRatioLarge(bufferedEnvelope, geomEnv, 2)) { > - if (!((geometry instanceof LineString) || (geometry instanceof > MultiLineString))) > - actualGeometry = clipGeometry(geometry, > bufferedEnvelope); > - //System.out.println("cl"); > - //} > + final Envelope geomEnv = actualGeometry.getEnvelopeInternal(); > + if (!bufferedEnvelope.contains(geomEnv)) { > + /** > + * MD - letting Java2D do more clipping actually seems to be > slower! > + * So don't use following "optimization" > + */ > + // if (isRatioLarge(bufferedEnvelope, geomEnv, 2)) { > + if (!((geometry instanceof LineString) || (geometry instanceof > MultiLineString))) { > + actualGeometry = clipGeometry(geometry, bufferedEnvelope); > + // System.out.println("cl"); > + // } > + } > } > return viewport.getJava2DConverter().toShape(actualGeometry); > } > > /** > - * Clipping a geometry using JTS produces higher quality results than > letting Java2D do it. > - * It may also be faster! > + * Clipping a geometry using JTS produces higher quality results than > + * letting Java2D do it. It may also be faster! > * > * @param geom > * @param env > * @return > */ > - private static Geometry clipGeometry(Geometry geom, Envelope env) > - { > - try { > - Geometry clipGeom = EnvelopeUtil.toGeometry(env) > - .intersection(geom); > - return clipGeom; > - } catch (Exception e) { > - //Can get a TopologyException if the Geometry is invalid. Eat it. > [Jon Aquino] > - //Can get an AssertionFailedException (unable to assign hole to a > shell) > - //at high magnifications. Eat it. [Jon Aquino] > + private static Geometry clipGeometry(Geometry geom, Envelope env) { > + try { > + final Geometry clipGeom = EnvelopeUtil.toGeometry(env) > + .intersection(geom); > + return clipGeom; > + } catch (final Exception e) { > + // Can get a TopologyException if the Geometry is invalid. Eat > it. > + // [Jon Aquino] > + // Can get an AssertionFailedException (unable to assign hole to > a > + // shell) > + // at high magnifications. Eat it. [Jon Aquino] > > - //Alvaro Zabala reports that we can get here with an > - //IllegalArgumentException (points must form a closed linestring) > - //for bad geometries. Eat it. [Jon Aquino] > - } > - return geom; > + // Alvaro Zabala reports that we can get here with an > + // IllegalArgumentException (points must form a closed > linestring) > + // for bad geometries. Eat it. [Jon Aquino] > + } > + return geom; > } > > - private static boolean isRatioLarge(Envelope viewEnv, > - Envelope geomEnv, > - double factor) > - { > - if (isRatioLarge(viewEnv.getHeight(), geomEnv.getHeight(), factor)) > return true; > - if (isRatioLarge(viewEnv.getWidth(), geomEnv.getWidth(), factor)) > return true; > - return false; > + private static boolean isRatioLarge(Envelope viewEnv, Envelope geomEnv, > + double factor) { > + if (isRatioLarge(viewEnv.getHeight(), geomEnv.getHeight(), factor)) { > + return true; > + } > + if (isRatioLarge(viewEnv.getWidth(), geomEnv.getWidth(), factor)) { > + return true; > + } > + return false; > } > > - private static boolean isRatioLarge(double winDim, double geomDim, > double factor) > - { > - return (geomDim / winDim) < factor; > + private static boolean isRatioLarge(double winDim, double geomDim, > + double factor) { > + return (geomDim / winDim) < factor; > } > + > + /** > + * [Giuseppe Aruta 2018_10-30] Gets available values of styles from > feature > + * collection > + * > + * @param ColorThemingStyle > + * @param FeatureCollection > + * @return > + */ > + > + public static Set<String> getAvailableValues(ColorThemingStyle style, > + FeatureCollection fc) { > + final Set<String> set = new TreeSet<>(); > + set.add(""); > + final Iterator<Feature> it = fc.iterator(); > + while (it.hasNext()) { > + final Feature f = it.next(); > + > + if (style.isEnabled()) { > + > + set.add(f.getAttribute(style.getAttributeName()).toString()); > + > + } > + } > + return set; > + } > } > > > > _______________________________________________ > Jump-pilot-devel mailing list > Jump-pilot-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel > _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
