Changeset 32088 in osm for applications/editors/josm/plugins/seachart/src/render/Renderer.java

Timestamp:

2016-02-29T11:29:17+01:00 (9 years ago)

Author:

malcolmh

Message:

[Seachart] Publish new release

File:

• applications/editors/josm/plugins/seachart/src/render/Renderer.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/src/render/Renderer.java

@@ -548 +548 @@
         }
         
-        public static void lightSector(Feature feature, Color col1, Color col2, double radius, double s1, double s2, boolean dir, String str) {
+        public static void lightSector(Feature feature, Color col1, Color col2, double radius, double s1, double s2, Double dir, String str) {
                 if ((zoom >= 16) && (radius > 0.2)) {
-                        radius = 0.2 / (Math.pow(2, zoom-16));
+                        radius /= (Math.pow(2, zoom-15));
                 }
                 double mid = (((s1 + s2)  / 2) + (s1 > s2 ? 180 : 0)) % 360;
@@ -557 +557 @@
                 Point2D.Double centre = (Point2D.Double) context.getPoint(feature.geom.centre);
                 double radial = radius * context.mile(feature);
-                if (dir) {
-                        g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(mid)), centre.y + radial * Math.cos(Math.toRadians(mid))));
+                if (dir != null) {
+                        g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(dir)), centre.y + radial * Math.cos(Math.toRadians(dir))));
                 } else {
                         if ((s1 != 0.0) || (s2 != 360.0)) {
@@ -574 +574 @@
                 }
                 if ((str != null) && (!str.isEmpty())) {
-                        g2.setPaint(Color.black);
-                        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            FontRenderContext frc = g2.getFontRenderContext();
-            Font font = new Font("Arial", Font.PLAIN, 40);
-            GeneralPath path = new GeneralPath();
-            GlyphVector gv = font.deriveFont(font.getSize2D() * (float)sScale).createGlyphVector(frc, (" " + str));
-                        double gwidth = gv.getLogicalBounds().getWidth();
-                        boolean hand = false;
-            double offset = 0;
-            Point2D origin;
-                        if (dir) {
-                                radial += 10 * sScale;
-                                if (mid < 180) {
-                                        radial += gwidth;
-                                        hand = true;
-                                }
-                                origin = new Point2D.Double(centre.x - radial * Math.sin(Math.toRadians(mid)), centre.y + radial * Math.cos(Math.toRadians(mid)));
-                    int length = gv.getNumGlyphs();
-                    for (int i = 0; i < length; i++) {
-                                        Shape shape = gv.getGlyphOutline(i);
-                                        Point2D point = gv.getGlyphPosition(i);
-                                        AffineTransform at = AffineTransform.getTranslateInstance(origin.getX(), origin.getY());
-                                        at.rotate(Math.toRadians(mid + (hand ? -90 : 90)));
-                                        at.translate(-point.getX() + offset, -point.getY() + (15 * sScale));
-                                        path.append(at.createTransformedShape(shape), false);
-                                        offset += gv.getGlyphMetrics(i).getAdvance();
-                                        g2.fill(path);
-                    }
-                        } else {
-                                double arc = (s2 > s1) ? (s2 - s1) : (s2 - s1 + 360);
-                                double awidth = (Math.toRadians(arc) * radial);
-                                if (gwidth < awidth) {
-                                        offset = 0;
-                                        double phi = 0;
-                                        if ((mid > 270) || (mid < 90)) {
-                                                hand = true;
-                                                phi = Math.toRadians(s2) - ((awidth - gwidth) / 2) /radial;
-                                                radial -= 20 * sScale;
-                                        } else {
-                                                phi = Math.toRadians(s1) + (((awidth - gwidth) / 2)) /radial;
-                                                radial += 20 * sScale;
-                                        }
-                                        origin = new Point2D.Double(centre.x - radial * Math.sin(phi), centre.y + radial * Math.cos(phi));
-                            int length = gv.getNumGlyphs();
-                            for (int i = 0; i < length; i++) {
-                                                Shape shape = gv.getGlyphOutline(i);
-                                                Point2D point = gv.getGlyphPosition(i);
-                                                AffineTransform at = AffineTransform.getTranslateInstance(origin.getX(), origin.getY());
-                                                at.rotate(phi + (hand ? 0 : Math.toRadians(180)));
-                                                at.translate(-point.getX() + offset, -point.getY());
-                                                path.append(at.createTransformedShape(shape), false);
-                                                double advance = gv.getGlyphMetrics(i).getAdvance();
-                                                offset += advance;
-                                                phi += (hand ? -0.5 : +0.5) * advance / radial;
-                                                g2.fill(path);
-                            }
-                                }
+                        FontRenderContext frc = g2.getFontRenderContext();
+                        Font font = new Font("Arial", Font.PLAIN, 40);
+                        GlyphVector gv = font.deriveFont(font.getSize2D() * (float)sScale).createGlyphVector(frc, str);
+                        double arc = (s2 > s1) ? (s2 - s1) : (s2 - s1 + 360);
+                        double awidth = (Math.toRadians(arc) * radial);
+                        boolean hand = ((mid > 270) || (mid < 90));
+                        double phi = Math.toRadians(mid);
+                        radial += 30 * sScale;
+                        AffineTransform at = AffineTransform.getTranslateInstance(-radial * Math.sin(phi) / sScale, radial * Math.cos(phi) / sScale);
+                        if (gv.getLogicalBounds().getWidth() < awidth) {
+                                at.rotate(Math.toRadians(mid + (hand ? 0 : 180)));
+                                Renderer.labelText(feature, str, font, Color.black, new Delta(Handle.CC, at));
+                        } else if (gv.getLogicalBounds().getHeight() < awidth) {
+                                hand = (mid < 180);
+                                at.rotate(Math.toRadians(mid + (hand ? -90 : 90)));
+                                Renderer.labelText(feature, str, font, Color.black, hand ? new Delta(Handle.RC, at) : new Delta(Handle.LC, at));
+                        }
+                        if (dir != null) {
+                                font = new Font("Arial", Font.PLAIN, 30);
+                                str = dir + "°";
+                                hand = (dir > 180);
+                                phi = Math.toRadians(dir + (hand ? -0.5 : 0.5));
+                                radial -= 70 * sScale;
+                                at = AffineTransform.getTranslateInstance(-radial * Math.sin(phi) / sScale, radial * Math.cos(phi) / sScale);
+                                at.rotate(Math.toRadians(dir + (hand ? 90 : -90)));
+                                Renderer.labelText(feature, str, font, Color.black, hand ? new Delta(Handle.BR, at) : new Delta(Handle.BL, at));
                         }
                 }