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

Timestamp:

2016-02-27T09:09:45+01:00 (9 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

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

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

@@ -47 +47 @@
                                 g2.clip(new Rectangle2D.Double(tl.getX(), tl.getY(), (br.getX() - tl.getX()), (br.getY() - tl.getY())));
                         }
-                        g2.setBackground(context.background());
+                        g2.setBackground(context.background(map));
                         g2.clearRect(rect.x, rect.y, rect.width, rect.height);
                         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -484 +484 @@
             g2.setPaint(colour);
             FontRenderContext frc = g2.getFontRenderContext();
-            GlyphVector gv = font.deriveFont((float)(font.getSize()*sScale)).createGlyphVector(frc, (" " + str));
+            GlyphVector gv = font.deriveFont(font.getSize2D() * (float)sScale).createGlyphVector(frc, (" " + str));
             GeneralPath path = new GeneralPath();
                         Point2D prev = new Point2D.Double();
@@ -560 +560 @@
                         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))));
                 } else {
-                        g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(s1)), centre.y + radial * Math.cos(Math.toRadians(s1))));
-                        g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(s2)), centre.y + radial * Math.cos(Math.toRadians(s2))));
+                        if ((s1 != 0.0) || (s2 != 360.0)) {
+                                g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(s1)), centre.y + radial * Math.cos(Math.toRadians(s1))));
+                                g2.draw(new Line2D.Double(centre.x, centre.y, centre.x - radial * Math.sin(Math.toRadians(s2)), centre.y + radial * Math.cos(Math.toRadians(s2))));
+                        }
                 }
                 double arcWidth =  10.0 * sScale;
                 g2.setStroke(new BasicStroke((float)arcWidth, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1));
                 g2.setPaint(col1);
-                g2.draw(new Arc2D.Double(centre.x - radial, centre.y - radial, 2 * radial, 2 * radial, -(s1 + 90), (s1 - s2 - 360) % 360, Arc2D.OPEN));
+                g2.draw(new Arc2D.Double(centre.x - radial, centre.y - radial, 2 * radial, 2 * radial, -(s1 + 90), (s1 - s2), Arc2D.OPEN));
                 if (col2 != null) {
                         g2.setPaint(col2);
-                        g2.draw(new Arc2D.Double(centre.x - radial + arcWidth, centre.y - radial + arcWidth, 2 * (radial - arcWidth), 2 * (radial - arcWidth), -(s1 + 90), (s1 - s2 - 360) % 360, Arc2D.OPEN));
+                        g2.draw(new Arc2D.Double(centre.x - radial + arcWidth, centre.y - radial + arcWidth, 2 * (radial - arcWidth), 2 * (radial - arcWidth), -(s1 + 90), (s1 - s2), Arc2D.OPEN));
                 }
                 if ((str != null) && (!str.isEmpty())) {
@@ -577 +579 @@
             Font font = new Font("Arial", Font.PLAIN, 40);
             GeneralPath path = new GeneralPath();
-            GlyphVector gv = font.deriveFont((float)(font.getSize()*sScale)).createGlyphVector(frc, (" " + str));
+            GlyphVector gv = font.deriveFont(font.getSize2D() * (float)sScale).createGlyphVector(frc, (" " + str));
                         double gwidth = gv.getLogicalBounds().getWidth();
                         boolean hand = false;
             double offset = 0;
             Point2D origin;
-                        double arc = (s2 - s1 + 360) % 360;
+                        double arc = (s2 - s1);
                         if (dir) {
                                 radial += 10 * sScale;