Changeset 29199 in osm for applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

Timestamp:

2013-01-15T15:08:25+01:00 (13 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/seamap/Renderer.java (modified) (5 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -10 +10 @@
 package seamap;
 
+import java.awt.BasicStroke;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
@@ -20 +23 @@
 import s57.S57val.*;
 import s57.S57val;
+import seamap.SeaMap;
 import seamap.SeaMap.*;
 import symbols.Symbols;
@@ -31 +35 @@
         static double tScale;
         static Graphics2D g2;
+        static int zoom;
         
-        public static void reRender(Graphics2D g, int zoom, double factor, SeaMap m, MapHelper h) {
+        public static void reRender(Graphics2D g, int z, double factor, SeaMap m, MapHelper h) {
                 g2 = g;
+                zoom = z;
                 helper = h;
                 map = m;
@@ -115 +121 @@
         public static void symbol(Feature feature, Symbol symbol, Obj obj, Delta delta) {
                 Point2D point = helper.getPoint(findCentroid(feature));
-                ArrayList<ColCOL> colours = (ArrayList<ColCOL>) getAttVal(feature, obj, 0, Att.COLOUR);
-                ArrayList<ColPAT> pattern = (ArrayList<ColPAT>) getAttVal(feature, obj, 0, Att.COLPAT);
-                Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, new Scheme(pattern, colours));
+                if (obj == null) {
+                        Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, null);
+                } else {
+                        ArrayList<ColCOL> colours = (ArrayList<ColCOL>) getAttVal(feature, obj, 0, Att.COLOUR);
+                        ArrayList<ColPAT> pattern = (ArrayList<ColPAT>) getAttVal(feature, obj, 0, Att.COLPAT);
+                        Symbols.drawSymbol(g2, symbol, sScale, point.getX(), point.getY(), delta, new Scheme(pattern, colours));
+                }
         }
         
@@ -131 +141 @@
         
         public static void lineVector (Feature feature, LineStyle style) {
-                
+                if (feature.flag != Fflag.NODE) {
+                        ArrayList<Long> nodes = map.ways.get(feature.refs);
+                        Path2D.Double p = new Path2D.Double();
+                        p.setWindingRule(GeneralPath.WIND_NON_ZERO);
+                        boolean first = true;
+                        for (long node : nodes) {
+                                Point2D point = helper.getPoint(map.nodes.get(node));
+                                if (first) {
+                                        p.moveTo(point.getX(), point.getY());
+                                        first = false;
+                                } else {
+                                        p.lineTo(point.getX(), point.getY());
+                                }
+                        }
+                        if (style.line != null) {
+                                if (style.dash != null) {
+                                        float[] dash = new float[style.dash.length];
+                                        System.arraycopy(style.dash, 0, dash, 0, style.dash.length);
+                                        for (int i = 0; i < style.dash.length; i++) {
+                                                dash[i] *= (float) (sScale);
+                                        }
+                                        g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND, 1, dash, 0));
+                                } else {
+                                        g2.setStroke(new BasicStroke((float) (style.width * sScale), BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+                                }
+                                g2.setPaint(style.line);
+                                g2.draw(p);
+                        }
+                        if (style.fill != null) {
+                                g2.setPaint(style.fill);
+                                g2.fill(p);
+                        }
+                }
         }