Changeset 32540 in osm for applications/editors

Timestamp:

2016-07-03T02:49:50+02:00 (9 years ago)

Author:

darya

Message:

fix #13092

Location:

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

Files:

• PTAssistantLayer.java (modified) (7 diffs)
• PTAssistantPaintVisitor.java (modified) (1 diff)
• ProceedDialog.java (modified) (1 diff)

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;
@@ -46 +47 @@
 
         }
-        
+
         public void addPrimitive(OsmPrimitive primitive) {
                 this.primitives.add(primitive);
@@ -57 +58 @@
         @Override
         public void paint(final Graphics2D g, final MapView mv, Bounds bounds) {
-                
+
                 paintVisitor = new PTAssistantPaintVisitor(g, mv);
+
                 for (OsmPrimitive primitive : primitives) {
                         paintVisitor.visit(primitive);
@@ -115 +117 @@
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                
+
                 ArrayList<Relation> routes = new ArrayList<>();
 
@@ -162 +164 @@
                                         if (!Main.getLayerManager().containsLayer(this)) {
                                                 Main.getLayerManager().addLayer(this);
-                                                Main.map.repaint();
+                                        }
+
+                                        if (paintVisitor == null) {
+                                                Graphics g = Main.map.mapView.getGraphics();
+                                                MapView mv = Main.map.mapView;
+                                                paintVisitor = new PTAssistantPaintVisitor(g, mv);
                                         }
 
@@ -168 +175 @@
                                                 paintVisitor.visit(primitive);
                                         }
-                                        
+
                                         Main.map.repaint();
                                 }
@@ -189 +196 @@
         @Override
         public void layerRemoving(LayerRemoveEvent event) {
-                
+
                 if (event.getRemovedLayer() instanceof OsmDataLayer) {
-                        
+
                         this.primitives.clear();
                         Main.map.repaint();

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

@@ -318 +318 @@
                         parentsLabel = parentsLabel.substring(0, parentsLabel.length() - 1);
 
-                        g.setColor(new Color(128, 0, 128));
+                        g.setColor(new Color(255, 20, 147));
                         Font parentLabelFont = new Font("SansSerif", Font.ITALIC, 20);
                         g.setFont(parentLabelFont);

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

@@ -59 +59 @@
                 label4.setAlignmentX(Component.LEFT_ALIGNMENT);
 
-                radioButtonFixAutomatically = new JRadioButton("Fix all errors automatically and proceed", true);
+                radioButtonFixAutomatically = new JRadioButton("Fix all errors automatically and proceed");
                 radioButtonFixManually = new JRadioButton("I will fix the erros manually and click the button to proceed");
-                radioButtonDontFix = new JRadioButton("Do not fix anything and proceed with further tests");
+                radioButtonDontFix = new JRadioButton("Do not fix anything and proceed with further tests", true);
                 ButtonGroup fixOptionButtonGroup = new ButtonGroup();
                 fixOptionButtonGroup.add(radioButtonFixAutomatically);