Changeset 340 in josm for branch/0.5/src

Timestamp:

2007-10-04T23:41:26+02:00 (17 years ago)

Author:

framm

Message:

• merged in JOSM render speed patch by Brent Easton
• merged in Imi's changes to remove eigenheimstrasse.de references
• merged in the plugin download whitespace stripping bugfix

Location:

branch/0.5/src/org/openstreetmap/josm

Files:

• actions/HelpAction.java (modified) (1 diff)
• data/osm/visitor/SimplePaintVisitor.java (modified) (12 diffs)
• gui/ConflictResolver.java (modified) (1 diff)
• gui/preferences/TaggingPresetPreference.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (1 diff)

branch/0.5/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -47 +47 @@
 
         private JFrame helpBrowser = new JFrame("JOSM Online Help");
-        private String baseurl = Main.pref.get("help.baseurl", "http://josm.eigenheimstrasse.de");
+        private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
         private JEditorPane help = new JEditorPane();
         private WikiReader reader = new WikiReader(baseurl);

branch/0.5/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
 
@@ -41 +43 @@
 
         protected static final double PHI = Math.toRadians(20);
+        
+        /**
+         * Preferences
+        */
+        protected Color inactiveColor;
+        protected Color selectedColor;
+        protected Color nodeColor;
+        protected Color dfltWayColor;
+        protected Color incompleteColor;
+        protected Color backgroundColor;
+        protected boolean showDirectionArrow;
+        protected boolean showOrderNumber;
+        
+        /**
+         * Draw subsequent segments of same color as one Path
+         */
+        protected Color currentColor = null;
+        protected GeneralPath currentPath = new GeneralPath();
 
         public void visitAll(DataSet data) {
+                
+                inactiveColor = getPreferencesColor("inactive", Color.DARK_GRAY);
+                selectedColor = getPreferencesColor("selected", Color.WHITE);
+                nodeColor = getPreferencesColor("node", Color.RED);
+                dfltWayColor = getPreferencesColor("way", darkblue);
+                incompleteColor = getPreferencesColor("incomplete way", darkerblue);
+                backgroundColor = getPreferencesColor("background", Color.BLACK);
+                showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
+                showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
+                
                 for (final OsmPrimitive osm : data.ways)
                         if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
+                displaySegments(null);
                 for (final OsmPrimitive osm : data.nodes)
                         if (!osm.deleted && !osm.selected)
@@ -52 +83 @@
                         if (!osm.deleted)
                                 osm.visit(this);
+                displaySegments(null);
         }
 
@@ -63 +95 @@
                 Color color = null;
                 if (inactive)
-                        color = getPreferencesColor("inactive", Color.DARK_GRAY);
+                        color = inactiveColor;
                 else if (n.selected)
-                        color = getPreferencesColor("selected", Color.WHITE);
+                        color = selectedColor;
                 else
-                        color = getPreferencesColor("node", Color.RED);
+                        color = nodeColor;
                 drawNode(n, color);
         }
@@ -78 +110 @@
                 Color wayColor;
                 if (inactive)
-                        wayColor = getPreferencesColor("inactive", Color.DARK_GRAY);
+                        wayColor = inactiveColor;
                 else {
-                        wayColor = getPreferencesColor("way", darkblue);
-                }
-
-                boolean showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
-                boolean showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
+                        wayColor = dfltWayColor;
+                }
+
                 int orderNumber = 0;
                 Node lastN = null;
@@ -93 +123 @@
                         }
                         orderNumber++;
-                        drawSegment(lastN, n, w.selected && !inactive ? getPreferencesColor("selected", Color.WHITE) : wayColor, showDirectionArrow);
+                        drawSegment(lastN, n, w.selected && !inactive ? selectedColor : wayColor, showDirectionArrow);
                         if (showOrderNumber)
                                 drawOrderNumber(lastN, n, orderNumber);
@@ -101 +131 @@
 
         public void visit(Relation e) {
-                // relations are not drawn.
-        }
+                // relations are not (yet?) drawn.
+        }
+        
         /**
          * Draw an number of the order of the two consecutive nodes within the
@@ -117 +148 @@
                 if (screen.contains(x,y)) {
                         Color c = g.getColor();
-                        g.setColor(getPreferencesColor("background", Color.BLACK));
+                        g.setColor(backgroundColor);
                         g.fillRect(x-1, y-12, 8*strlen+1, 14);
                         g.setColor(c);
@@ -135 +166 @@
                 Rectangle screen = g.getClipBounds();
 
-                if ( screen.contains(p.x, p.y) )
+                if (screen.contains(p.x, p.y))
                         g.drawRect(p.x-1, p.y-1, 2, 2);
         }
@@ -152 +183 @@
                 {
                         g.drawLine(p1.x, p1.y, p2.x, p2.y);
-        
+                        currentPath.moveTo(p1.x, p1.y);
+                        currentPath.lineTo(p2.x, p2.y);
+                        
                         if (showDirection) {
                                 double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI;
-                        g.drawLine(p2.x,p2.y, (int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI)));
-                        g.drawLine(p2.x,p2.y, (int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI)));
+                                currentPath.lineTo((int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI)));
+                                currentPath.moveTo((int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI)));
+                                currentPath.lineTo(p2.x, p2.y);  
                         }
                 }
@@ -169 +203 @@
                 return ColorHelper.html2color(colStr);
         }
-
-
+        
         public void setGraphics(Graphics g) {
         this.g = g;
@@ -178 +211 @@
         this.nc = nc;
     }
+
+        protected void displaySegments(Color newColor) {
+                if (currentPath != null) {
+                        g.setColor(currentColor);
+                        ((Graphics2D) g).draw(currentPath);
+                        currentPath = new GeneralPath();
+                        currentColor = newColor;
+                }
+        }
 }

branch/0.5/src/org/openstreetmap/josm/gui/ConflictResolver.java

@@ -156 +156 @@
                 }
                 
-                if (this.conflicts.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent,
-                                        "The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
-                                        "Of course, this is a bug.\n"+
-                                        "The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
-                                        "If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
-                                        "files you opened (have them ready?) to display this message again, pretty please\n"+
-                                        "inform Imi at josm@eigenheimstrasse.de about the details.\n"+
-                                        "Thanks.");
-                        //throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
-                }
 
                 // have to initialize the JTables here and not in the declaration, because its constructor

branch/0.5/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -74 +74 @@
                 taggingPresetSources.setVisibleRowCount(3);
 
-                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.eigenheimstrasse.de/wiki/TaggingPresets for help."));
+                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.openstreetmap.de/wiki/TaggingPresets for help."));
                 addAnno.setToolTipText(tr("Add a new tagging preset source to the list."));
                 deleteAnno.setToolTipText(tr("Delete the selected source from the list."));

branch/0.5/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -70 +70 @@
                                 report();
                         else if (characters != null && !current.isEmpty()) {
-                                setValue(qname, characters);
+                                setValue(qname, characters.trim());
                                 characters = "";
                         }