Changeset 32436 in osm for applications/editors/josm

Timestamp:

2016-06-29T03:09:52+02:00 (9 years ago)

Author:

darya

Message:

minor styling change

Location:

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui

Files:

• PTAssistantLayer.java (modified) (6 diffs)
• PTAssistantPaintVisitor.java (modified) (6 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.pt_assistant.gui;
 
+import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.KeyboardFocusManager;
@@ -32 +33 @@
 
         private List<OsmPrimitive> primitives = new ArrayList<>();
+        private PTAssistantPaintVisitor paintVisitor;
 
         public PTAssistantLayer() {
                 super("pt_assistant layer");
-
                  KeyboardFocusManager.getCurrentKeyboardFocusManager().addPropertyChangeListener(this);
 
@@ -51 +52 @@
         public void paint(final Graphics2D g, final MapView mv, Bounds bounds) {
 
-                PTAssistantPaintVisitor paintVisitor = new PTAssistantPaintVisitor(g, mv);
+                paintVisitor = new PTAssistantPaintVisitor(g, mv);
                 for (OsmPrimitive primitive : primitives) {
                         paintVisitor.visit(primitive);
@@ -103 +104 @@
         }
 
+        /**
+         * Listens to a selection change 
+         */
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
@@ -147 +151 @@
                                 
                                 if (RouteUtils.isTwoDirectionRoute(relation)) {
+
                                         this.primitives.clear();
                                         this.primitives.add(relation);
@@ -152 +157 @@
                                                 Main.getLayerManager().addLayer(this);
                                         }
-//                                      Main.map.repaint();
+                                        Graphics g = paintVisitor.getGraphics();
+                                        paintVisitor = new PTAssistantPaintVisitor(g, Main.map.mapView);
+                                        for (OsmPrimitive primitive : primitives) {
+                                                paintVisitor.visit(primitive);
+
+                                        }
+                                        Main.map.repaint();
                                 }
 
                         }
-
-//                      System.out.println("focusedWindow: ");
-//                      System.out.println("GET NEW VALUE: " + evt.getNewValue().getClass());
-//                      System.out.println("");
                 }
         }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantPaintVisitor.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Point;
@@ -34 +35 @@
                 for (RelationMember rm : r.getMembers()) {
                         if (RouteUtils.isPTStop(rm)) {
-                                drawStop(rm.getMember(), Color.BLUE, Color.BLACK, (new Integer(stopCount)).toString());
+                                String label = "";
+                                if (r.hasKey("ref")) {
+                                        label = label + r.get("ref");
+                                } else if (r.hasKey("name")) {
+                                        label = label + r.get("name");
+                                }
+                                label = label + "." + stopCount;
+                                drawStop(rm.getMember(), Color.BLUE, Color.BLACK,  label);
                                 stopCount++;
                         } else if (RouteUtils.isPTWay(rm)) {
@@ -62 +70 @@
                                 continue;
                         }
-                        drawSegment(lastN, n, Color.BLUE);
+                        drawSegment(lastN, n, new Color(208, 80, 208, 179));
                         lastN = n;
                 }
@@ -93 +101 @@
 
                 double t = Math.atan2((double) p2.x - p1.x, (double) p2.y - p1.y);
-                double cosT = 5 * Math.cos(t);
-                double sinT = 5 * Math.sin(t);
+                double cosT = 8 * Math.cos(t);
+                double sinT = 8 * Math.sin(t);
+                
+                
+                int[] xPoints = {(int)(p1.x+cosT), (int)(p2.x+cosT), (int)(p2.x-cosT), (int)(p1.x-cosT)};
+                int[] yPoints = {(int)(p1.y-sinT), (int)(p2.y-sinT), (int)(p2.y+sinT), (int)(p1.y+sinT)};
+                g.setColor(color);
+                g.fillPolygon(xPoints, yPoints, 4);
+                g.fillOval((int)(p1.x-8), (int)(p1.y-8), 16, 16);
+                g.fillOval((int)(p2.x-8), (int)(p2.y-8), 16, 16);
+                
 
-                g.setColor(color);
-                g.drawLine((int) (p1.x + cosT), (int) (p1.y - sinT), (int) (p2.x + cosT), (int) (p2.y - sinT));
-                g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT), (int) (p2.x - cosT), (int) (p2.y + sinT));
+//              g.drawLine((int) (p1.x - cosT), (int) (p1.y - sinT), (int) (p2.x + cosT), (int) (p2.y - sinT));
+//              g.drawLine((int) (p1.x - cosT), (int) (p1.y + sinT), (int) (p2.x - cosT), (int) (p2.y + sinT));
 
         }
@@ -127 +143 @@
 
                 g.setColor(fillColor);
-                // g.drawRect(p.x-10, p.y-10, 20, 20);
                 g.fillOval(p.x - 5, p.y - 5, 10, 10);
                 g.setColor(outlineColor);
@@ -133 +148 @@
 
                 g.setColor(Color.WHITE);
+                Font stringFont = new Font( "SansSerif", Font.PLAIN, 18 );
+                g.setFont(stringFont);
                 g.drawString(label, p.x - 20, p.y - 20);
         }
+        
+        protected Graphics getGraphics() {
+                return this.g;
+        }
+        
 }