Changeset 775 in josm for trunk/src/org

Timestamp:

2008-08-12T20:31:49+02:00 (16 years ago)

Author:

stoecker

Message:

cleanup of mappaint patches. Closes #1404. Patch by Jörg Henne.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (5 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (4 diffs)
• gui/MapView.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -86 +86 @@
 
         private int unselectedNodeRadius;
+        
+        private int taggedNodeRadius;
 
         private int selectedNodeSize;
@@ -92 +94 @@
 
         private int defaultSegmentWidth = 2;
+        private int taggedNodeSize;
 
     public final static Color darkerblue = new Color(0,0,96);
@@ -144 +147 @@
                         if (n.selected)
                                 drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
+                        else if (n.tagged)
+                                drawNode(n, nodeColor, taggedNodeSize, taggedNodeRadius, fillUnselectedNode);
                         else
                                 drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
@@ -352 +357 @@
                                 return;
                         g.setColor(color);
-                        if (fill)
+                        if (fill) {
                                 g.fillRect(p.x - radius, p.y - radius, size, size);
-                        else
+                                g.drawRect(p.x - radius, p.y - radius, size, size);
+                        } else
                                 g.drawRect(p.x - radius, p.y - radius, size, size);
                 }
@@ -380 +386 @@
                         5) / 2;
                 selectedNodeSize = selectedNodeRadius * 2;
+
                 unselectedNodeRadius = Main.pref.getInteger(
                         "mappaint.node.unselected-size", 3) / 2;
                 unselectedNodeSize = unselectedNodeRadius * 2;
+
+                taggedNodeRadius = Main.pref.getInteger(
+                                "mappaint.node.tagged-size", 5) / 2;
+                taggedNodeSize = taggedNodeRadius * 2;
 
                 defaultSegmentWidth = Main.pref.getInteger(

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -86 +86 @@
 
         Rectangle bbox = new Rectangle();
+        private int taggedNodeRadius;
+        private int taggedNodeSize;
 
         public void visitAll(DataSet data) {
@@ -107 +109 @@
                 unselectedNodeSize = unselectedNodeRadius * 2;
 
+                taggedNodeRadius = Main.pref.getInteger(
+                                "mappaint.node.tagged-size", 5) / 2;
+                taggedNodeSize = taggedNodeRadius * 2;
+
                 defaultSegmentWidth = Main.pref.getInteger(
                         "mappaint.segment.default-width", 2);
@@ -161 +167 @@
                 else if (n.selected)
                         drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
-                else
+                else if(n.tagged)
+                        drawNode(n, nodeColor, taggedNodeSize, taggedNodeRadius, fillUnselectedNode);
+                else 
                         drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         }
@@ -276 +284 @@
                                 return;
                         g.setColor(color);
-                        if (fill)
+                        if (fill) {
                                 g.fillRect(p.x - radius, p.y - radius, size, size);
-                        else
+                                g.drawRect(p.x - radius, p.y - radius, size, size);
+                        } else
                                 g.drawRect(p.x - radius, p.y - radius, size, size);
                 }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -86 +86 @@
         private LinkedList<MapViewPaintable> temporaryLayers = new LinkedList<MapViewPaintable>();
         
+        private BufferedImage offscreenBuffer;
+        
         /**
          * The listener of the active layer changes.
@@ -204 +206 @@
                 if (center == null)
                         return; // no data loaded yet.
-                
-                BufferedImage bim = new BufferedImage(getWidth(), getHeight(), Transparency.OPAQUE);
-                Graphics2D tempG = bim.createGraphics();
+
+                // re-create offscreen-buffer if we've been resized, otherwise
+                // just re-use it.
+                if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth()
+                        || offscreenBuffer.getHeight() != getHeight())
+                        offscreenBuffer = new BufferedImage(getWidth(), getHeight(),
+                                BufferedImage.TYPE_INT_ARGB);
+
+                Graphics2D tempG = offscreenBuffer.createGraphics();
                 tempG.setColor(Preferences.getPreferencesColor("background", Color.BLACK));
                 tempG.fillRect(0, 0, getWidth(), getHeight());
@@ -238 +246 @@
                         playHeadMarker.paint(tempG, this);
 
-                g.drawImage(bim, 0, 0, null);
+                g.drawImage(offscreenBuffer, 0, 0, null);
                 super.paint(g);
         }