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

Timestamp:

2016-02-27T16:14:25+01:00 (10 years ago)

Author:

malcolmh

Message:

[seachart] update

File:

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

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

@@ -568 +568 @@
                 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), Arc2D.OPEN));
+                g2.draw(new Arc2D.Double(centre.x - radial, centre.y - radial, 2 * radial, 2 * radial, -(s1 + 90), ((s1 < s2) ? (s1 - s2) : (s1 - s2 - 360)), 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), 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) ? (s1 - s2) : (s1 - s2 - 360)), Arc2D.OPEN));
                 }
                 if ((str != null) && (!str.isEmpty())) {
@@ -584 +584 @@
             double offset = 0;
             Point2D origin;
-                        double arc = (s2 - s1);
                         if (dir) {
                                 radial += 10 * sScale;
@@ -604 +603 @@
                     }
                         } else {
+                                double arc = (s2 > s1) ? (s2 - s1) : (s2 - s1 + 360);
                                 double awidth = (Math.toRadians(arc) * radial);
                                 if (gwidth < awidth) {