Changeset 32191 in osm

Timestamp:

2016-05-25T21:19:27+02:00 (8 years ago)

Author:

donvip

Message:

[josm_print] update to JOSM 10282

Location:

applications/editors/josm/plugins/print

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java (added)
• src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (10 diffs)

applications/editors/josm/plugins/print/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8554"/>
+    <property name="plugin.main.version" value="10282"/>
 
     <property name="plugin.author" value="Kai Pastor"/>

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java

@@ -34 +34 @@
 import java.awt.Graphics2D;
 import java.awt.Shape;
+import java.awt.event.ComponentListener;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
@@ -41 +42 @@
 import java.awt.print.Printable;
 import java.awt.print.PrinterException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 import javax.swing.JPanel;
@@ -54 +51 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -72 +68 @@
      * resolution
      */
-     protected double g2dFactor;
-    
-    /**
-     * The real MapView which is the data source
-     */
-    protected MapView mapView;
+    protected double g2dFactor;
     
     /**
@@ -89 +80 @@
     public PrintableMapView() {
         /* Initialize MapView with a dummy parent */
-        super(new JPanel(), null);
+        super(new PrintableLayerManager(), new JPanel(), null);
         
         /* Disable MapView's ComponentLister, 
          * as it will interfere with the main MapView. */
-        java.awt.event.ComponentListener listeners[] = getComponentListeners();
+        ComponentListener listeners[] = getComponentListeners();
         for (int i=0; i<listeners.length; i++) {
             removeComponentListener(listeners[i]);
         }
-        
-        mapView = Main.map.mapView;
     }
 
@@ -155 +144 @@
         if (dim.width != width || dim.height != height) {
             super.setSize(width, height);
-            zoomTo(mapView.getRealBounds());
+            zoomTo(Main.map.mapView.getRealBounds());
             rezoomToFixedScale();
         }
@@ -168 +157 @@
         if (dim.width != newSize.width || dim.height != newSize.height) {
             super.setSize(newSize);
-            zoomTo(mapView.getRealBounds());
+            zoomTo(Main.map.mapView.getRealBounds());
             rezoomToFixedScale();
         }
@@ -230 +219 @@
         
         Bounds box = getRealBounds();
-        List<Layer> visibleLayers = getVisibleLayersInZOrder();
-        for (Layer l : visibleLayers) {
+        for (Layer l : getLayerManager().getVisibleLayersInZOrder()) {
             if (l.getOpacity() < 1) {
                 g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,(float)l.getOpacity()));
@@ -357 +345 @@
      * Paint a text.
      * 
-     * This method will not only draw the letters but also a background 
-     * which improves redability.
+     * This method will not only draw the letters but also a background which improves redability.
      * 
      * @param g2d the graphics context to use for painting
@@ -365 +352 @@
      * @param y the y coordinate
      */
-    
     public void paintText(Graphics2D g2d, String text, int x, int y) {
-            AffineTransform ax = g2d.getTransform();
-            g2d.translate(x,y);
-
-            FontRenderContext frc = g2d.getFontRenderContext();
-            GlyphVector gv = g2d.getFont().createGlyphVector(frc, text);
-            Shape textOutline = gv.getOutline();
-
-            g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
-            g2d.setColor(Color.WHITE);
-            g2d.draw(textOutline);
-            
-            g2d.setStroke(new BasicStroke());
-            g2d.setColor(Color.BLACK);
-            g2d.drawString(text, 0, 0);
-
-            g2d.setTransform(ax);
-    }
-
-    /**
-     * Get the active layer
-     * 
-     * This method is implemented in MapView but we need at this instance.
-     */
-    @Override
-    public Layer getActiveLayer() {
-        return mapView.getActiveLayer();
-    }
-
-    /**
-     * Get the position of a particular layer in the stack of layers
-     * 
-     * This method is implemented in MapView but we need at this instance.
-     */
-    @Override
-    public int getLayerPos(Layer layer) {
-        return mapView.getLayerPos(layer);
-    }
-    
-    /**
-     * This method is implemented in MapView but protected.
-     * 
-     * The algorithm is slightly modified.
-     */
-    @Override
-    public List<Layer> getVisibleLayersInZOrder() {
-        ArrayList<Layer> layers = new ArrayList<>();
-        for (Layer l: mapView.getAllLayersAsList()) {
-            if (l.isVisible()) {
-                layers.add(l);
-            }
-        }
-        Collections.sort(
-            layers,
-            new Comparator<Layer>() {
-                @Override
-                public int compare(Layer l2, Layer l1) { // l1 and l2 swapped!
-                    if (l1 instanceof OsmDataLayer && l2 instanceof OsmDataLayer) {
-                        if (l1 == getActiveLayer()) return -1;
-                        if (l2 == getActiveLayer()) return 1;
-                        return Integer.valueOf(getLayerPos(l1)).
-                                     compareTo(getLayerPos(l2));
-                    } else
-                        return Integer.valueOf(getLayerPos(l1)).
-                                     compareTo(getLayerPos(l2));
-                }
-            }
-        );
-        return layers;
+        AffineTransform ax = g2d.getTransform();
+        g2d.translate(x, y);
+
+        FontRenderContext frc = g2d.getFontRenderContext();
+        GlyphVector gv = g2d.getFont().createGlyphVector(frc, text);
+        Shape textOutline = gv.getOutline();
+
+        g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+        g2d.setColor(Color.WHITE);
+        g2d.draw(textOutline);
+
+        g2d.setStroke(new BasicStroke());
+        g2d.setColor(Color.BLACK);
+        g2d.drawString(text, 0, 0);
+
+        g2d.setTransform(ax);
     }
 }