Changeset 2987 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-02-14T20:23:18+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #4289 - rendering goes crazy at high zoom levels,
fixed #4424 - Problems rendering long ways at higher zoom levels

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/ShowStatusReportAction.java (modified) (1 diff)
• data/osm/visitor/paint/LineClip.java (added)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -155 +155 @@
 
     /**
+     * Wheather or not the java vm is openjdk
+     * We use this to work around openjdk bugs
+     */
+    public static boolean isOpenjdk;
+
+    /**
      * Set or clear (if passed <code>null</code>) the map.
      */
@@ -190 +196 @@
     public Main() {
         main = this;
-        //        platform = determinePlatformHook();
+        isOpenjdk = System.getProperty("java.vm.name").toUpperCase().indexOf("OPENJDK") != -1;
         platform.startupHook();
         contentPane.add(panel, BorderLayout.CENTER);

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -59 +59 @@
         text.append(" MB allocated, but free)");
         text.append("\n");
-        text.append("Java version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + ", " + System.getProperty("os.name"));
+        text.append("Java version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + ", " + System.getProperty("java.vm.name"));
+        text.append("\n");
+        text.append("Operating system: "+ System.getProperty("os.name"));
         text.append("\n\n");
         DataSet dataset = Main.main.getCurrentDataSet();

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -131 +131 @@
 
     private void drawSegment(GeneralPath path, Point p1, Point p2, boolean showDirection, boolean reversedDirection) {
-        if (isSegmentVisible(p1, p2)) {
-
+        boolean drawIt = false;
+        if (Main.isOpenjdk) {
+            /**
+             * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424)
+             * (It looks like int overflow when clipping.) We do custom clipping.
+             */
+            Rectangle bounds = g.getClipBounds();
+            bounds.grow(100, 100);                  // avoid arrow heads at the border
+            LineClip clip = new LineClip();
+            drawIt = clip.cohenSutherland(p1.x, p1.y, p2.x, p2.y, bounds.x, bounds.y, bounds.x+bounds.width, bounds.y+bounds.height);
+            p1 = clip.getP1();
+            p2 = clip.getP2();
+        } else {
+            drawIt = isSegmentVisible(p1, p2);
+        }
+        if (drawIt) {
             /* draw segment line */
             path.moveTo(p1.x, p1.y);