Changeset 2675 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-12-23T21:22:35+01:00 (14 years ago)

Author:

jttt

Message:

MapPaintVisitor - delegate drawing to styles, MapPaintVisitor should only select correct style and then let primitives draw in correct order. (not finished yet)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/AreaElemStyle.java (modified) (4 diffs)
• mappaint/ElemStyle.java (modified) (4 diffs)
• mappaint/ElemStyleHandler.java (modified) (1 diff)
• mappaint/IconElemStyle.java (modified) (2 diffs)
• mappaint/LineElemStyle.java (modified) (3 diffs)
• mappaint/NoPaintElemStyle.java (added)
• mappaint/SimpleNodeElemStyle.java (added)
• preferences/ColorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.mappaint;
 import java.awt.Color;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 
 public class AreaElemStyle extends ElemStyle
@@ -6 +10 @@
     public Color color;
     public boolean closed;
-    public LineElemStyle line = null;
+    private LineElemStyle line;
 
     public AreaElemStyle (AreaElemStyle a, long maxScale, long minScale) {
@@ -15 +19 @@
         this.minScale = minScale;
         this.rules = a.rules;
+        this.line = new LineElemStyle();
+        this.line.color = a.color;
     }
 
@@ -36 +42 @@
         priority = 0;
     }
+
+    public ElemStyle getLineStyle() {
+        return line;
+    }
+
+    @Override
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected) {
+        // TODO
+        /*Way way = (Way)primitive;
+        String name = painter.isShowNames() ? painter.getWayName(way) : null;
+        painter.drawArea(getPolygon(way), selected ? paintSettings.getSelectedColor() : color, name);
+        line.paintPrimitive(way, paintSettings, painter, selected);*/
+    }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -5 +5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 
-abstract public class ElemStyle
-{
+abstract public class ElemStyle {
     // zoom range to display the feature
     public long minScale;
@@ -16 +17 @@
     Collection<Rule> rules = null;
 
-    public Boolean equals(ElemStyle s)
-    {
-        return s != null && s.getCode().equals(getCode());
+    @Override
+    public boolean equals(Object o) {
+        return (o instanceof ElemStyle) && (((ElemStyle) o).getCode().equals(getCode()));
     }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+
     public String getCode()
     {
@@ -25 +32 @@
         {
             code = "";
-            for(Rule r: rules)
+            for(Rule r: rules) {
                 code += r.toCode();
+            }
         }
         return code;
@@ -39 +47 @@
             String bv = OsmUtils.getNamedOsmBoolean(r.boolValue);
             if(k == null || (r.value != null && !k.equals(r.value))
-            || (bv != null && !bv.equals(OsmUtils.getNamedOsmBoolean(k))))
+                    || (bv != null && !bv.equals(OsmUtils.getNamedOsmBoolean(k))))
                 return false;
         }
         return true;
     }
+
+    public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected);
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java

@@ -84 +84 @@
                 if(val.startsWith("+"))
                 {
-                    line.width = Integer.parseInt(val.substring(1));
+                    line.setWidth(Integer.parseInt(val.substring(1)));
                     line.widthMode = LineElemStyle.WidthMode.OFFSET;
                 }
                 else if(val.startsWith("-"))
                 {
-                    line.width = Integer.parseInt(val);
+                    line.setWidth(Integer.parseInt(val));
                     line.widthMode = LineElemStyle.WidthMode.OFFSET;
                 }
                 else if(val.endsWith("%"))
                 {
-                    line.width = Integer.parseInt(val.substring(0, val.length()-1));
+                    line.setWidth(Integer.parseInt(val.substring(0, val.length()-1)));
                     line.widthMode = LineElemStyle.WidthMode.PERCENT;
                 } else {
-                    line.width = Integer.parseInt(val);
+                    line.setWidth(Integer.parseInt(val));
                 }
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java

@@ -3 +3 @@
 import javax.swing.GrayFilter;
 import javax.swing.ImageIcon;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 
 public class IconElemStyle extends ElemStyle
@@ -33 +38 @@
         return disabledIcon = new ImageIcon(GrayFilter.createDisabledImage(icon.getImage()));
     }
+    @Override
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter, boolean selected) {
+        if (painter.isShowIcons()) {
+            Node n = (Node) primitive;
+            String name = painter.isShowNames()?painter.getNodeName(n):null;
+            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon,
+                    annotate, selected, name);
+        } else {
+            SimpleNodeElemStyle.INSTANCE.paintPrimitive(primitive, settings, painter, selected);
+        }
+
+    }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -4 +4 @@
 import java.util.Collection;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.tools.I18n;
 
-public class LineElemStyle extends ElemStyle implements Comparable<LineElemStyle>
-{
-    public int width;
+public class LineElemStyle extends ElemStyle implements Comparable<LineElemStyle> {
+
+    public static final LineElemStyle UNTAGGED_WAY;
+
+    static {
+        UNTAGGED_WAY = new LineElemStyle();
+        UNTAGGED_WAY.color = PaintColors.UNTAGGED.get();
+    }
+
+    private int width;
     public int realWidth; //the real width of this line in meter
     public Color color;
@@ -60 +73 @@
     public void init()
     {
-        width = 1;
+        width = -1;
         realWidth = 0;
         dashed = new float[0];
@@ -124 +137 @@
         }
     }
+
+    @Override
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected) {
+        Way w = (Way)primitive;
+        /* show direction arrows, if draw.segment.relevant_directions_only is not set,
+        the way is tagged with a direction key
+        (even if the tag is negated as in oneway=false) or the way is selected */
+        boolean showDirection = selected || ((!paintSettings.isUseRealWidth()) && (paintSettings.isShowDirectionArrow()
+                && (!paintSettings.isShowRelevantDirectionsOnly() || w.hasDirectionKeys())));
+        /* head only takes over control if the option is true,
+        the direction should be shown at all and not only because it's selected */
+        boolean showOnlyHeadArrowOnly = showDirection && selected && paintSettings.isShowHeadArrowOnly();
+        Node lastN;
+
+        Color myColor = color;
+        int myWidth = getWidth();
+
+        if (realWidth > 0 && paintSettings.isUseRealWidth() && !showDirection) {
+
+            /* if we have a "width" tag, try use it */
+            /* (this might be slow and could be improved by caching the value in the Way, on the other hand only used if "real width" is enabled) */
+            String widthTag = w.get("width");
+            if(widthTag == null) {
+                widthTag = w.get("est_width");
+            }
+            if(widthTag != null) {
+                try {
+                    realWidth = Integer.parseInt(widthTag);
+                }
+                catch(NumberFormatException nfe) {
+                }
+            }
+
+            myWidth = (int) (100 /  (float) (painter.getCircum() / realWidth));
+            if (myWidth < getWidth()) {
+                myWidth = getWidth();
+            }
+        }
+
+        if(w.highlighted) {
+            myColor = paintSettings.getHighlightColor();
+        } else if (selected) {
+            myColor = paintSettings.getSelectedColor();
+        } else if(w.isDisabled()) {
+            myColor = paintSettings.getInactiveColor();
+        }
+
+        /* draw overlays under the way */
+        if(overlays != null) {
+            for(LineElemStyle s : overlays) {
+                if(!s.over) {
+                    painter.drawWay(w, s.color != null && selected ? myColor: s.color, s.getWidth(myWidth),
+                            s.getDashed(), s.dashedColor, false, false);
+                }
+            }
+        }
+
+        /* draw the way */
+        painter.drawWay(w, myColor, myWidth, dashed, dashedColor, showDirection, showOnlyHeadArrowOnly);
+
+        /* draw overlays above the way */
+        if(overlays != null)  {
+            for(LineElemStyle s : overlays) {
+                if(s.over) {
+                    painter.drawWay(w, s.color != null && selected ? myColor : s.color, s.getWidth(myWidth),
+                            s.getDashed(), s.dashedColor, false, false);
+                }
+            }
+        }
+
+        if(paintSettings.isShowOrderNumber()) {
+            int orderNumber = 0;
+            lastN = null;
+            for(Node n : w.getNodes()) {
+                if(lastN != null) {
+                    orderNumber++;
+                    painter.drawOrderNumber(lastN, n, orderNumber);
+                }
+                lastN = n;
+            }
+        }
+    }
+
+    public int getWidth() {
+        if (width == -1)
+            return MapPaintSettings.INSTANCE.getDefaultSegmentWidth();
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -34 +34 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.gui.MapScaler;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
@@ -254 +254 @@
      */
     private void fixColorPrefixes() {
-        (new MapPaintVisitor()).getColors();
+        PaintColors.getColors();
         MarkerLayer.getColor(null);
         MapScaler.getColor();