Changeset 27252 in osm for applications/editors

Timestamp:

2011-12-17T00:27:38+01:00 (13 years ago)

Author:

kpastor

Message:

Implemented a print dialog with preview.

Location:

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print

Files:

• PrintAction.java (modified) (3 diffs)
• PrintDialog.java (added)
• PrintPlugin.java (modified) (4 diffs)
• PrintPreview.java (added)
• PrintableMapView.java (modified) (6 diffs)

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

@@ -28 +28 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.print.*;
 
-import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -40 +39 @@
  * and takes care of reasonable temporary adjustments to the preferences.
  */
-public class PrintAction extends JosmAction {
+public class PrintAction extends JosmAction implements Runnable {
     
     /**
@@ -56 +55 @@
 
     /**
-     * Trigger the printing process.
+     * Trigger the printing dialog.
      * 
      * @param e not used.
      */
     public void actionPerformed(ActionEvent e) {
-        PrinterJob job = PrinterJob.getPrinterJob();
-        job.setPrintable(new PrintableMapView());
-        if (job.printDialog()) {
-            try {
-                PrintPlugin.adjustPrefs();
-                job.print();
-            }
-            catch (PrinterAbortException ex) {
-                String msg = ex.getLocalizedMessage();
-                if (msg.length() == 0) {
-                    msg = tr("Printing has been cancelled.");
-                }
-                JOptionPane.showMessageDialog(Main.main.parent, msg,
-                  tr("Printing stopped"),
-                  JOptionPane.WARNING_MESSAGE);
-            }
-            catch (PrinterException ex) {
-                String msg = ex.getLocalizedMessage();
-                if (msg.length() == 0) {
-                    msg = tr("Printing has failed.");
-                }
-                JOptionPane.showMessageDialog(Main.main.parent, msg,
-                  tr("Printing stopped"),
-                  JOptionPane.ERROR_MESSAGE);
-            }
-            finally {
-                PrintPlugin.restorePrefs();
-            }
-        }
+        // Allow the JOSM GUI to be redrawn before modifying preferences
+        SwingUtilities.invokeLater(this);
     }
     
+    /**
+     * Open the printing dialog
+     * 
+     * This will temporarily modify the mappaint preferences.
+     */
+    public void run () {
+        PrintPlugin.adjustPrefs();
+        PrintDialog window = new PrintDialog(Main.main.parent);
+        window.setVisible(true);
+        PrintPlugin.restorePrefs();
+    }
 }

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

@@ -23 +23 @@
 
 package org.openstreetmap.josm.plugins.print;
+
+import java.awt.Toolkit;
 
 import javax.swing.JMenu;
@@ -47 +49 @@
      * The default resolution
      */
-    public static final int DEF_RESOLUTION_DPI = 200;
+    public static final int DEF_RESOLUTION_DPI = 100;
 
     /**
@@ -86 +88 @@
         Main.pref.putDefault(
           "print.attribution", DEF_ATTRIBUTION);
+        Main.pref.putDefault(
+          "print.preview.enabled", new Boolean(false).toString());
 
         restorePrefs(); // Recover after crash if neccesseary
@@ -183 +187 @@
             restorePref("mappaint.node.virtual-size");
             Main.pref.put("print.saved-prefs", false);
+            //Main.main.map.mapView.repaint();
         }
     }

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

@@ -27 +27 @@
 
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
@@ -57 +58 @@
 public class PrintableMapView extends MapView implements Printable {
     
-    /** 
-     * Indicates that the instance has been initialized 
-     */
-    protected boolean initialized;
-    
     /**
      * The factor for scaling the printing graphics to the desired
@@ -93 +89 @@
         
         mapView = Main.main.map.mapView;
-        initialized = false;
     }
 
@@ -108 +103 @@
         double heightZoomFactor = g2dFactor * mapView.getHeight() / pageFormat.getImageableHeight();
         setSize((int)(pageFormat.getImageableWidth()/g2dFactor),(int)(pageFormat.getImageableHeight()/g2dFactor));
-        zoomTo(mapView.getRealBounds());
-    }
+    }
+    
+    /**
+     * Resizes this component. 
+     */
+    @Override
+    public void setSize(int width, int height) {
+        Dimension dim = getSize();
+        if (dim.width != width || dim.height != height) {
+            super.setSize(width, height);
+            zoomTo(mapView.getRealBounds());
+        }
+    }
+            
+    /**
+     * Resizes this component. 
+     */
+    @Override
+    public void setSize(Dimension newSize) {
+        Dimension dim = getSize();
+        if (dim.width != newSize.width || dim.height != newSize.height) {
+            super.setSize(newSize);
+            zoomTo(mapView.getRealBounds());
+        }
+    }
+            
 
     /**
@@ -129 +148 @@
                                                     PrinterException {
         if (page > 0) { /* stop after first page */
-            initialized = false;
             return NO_SUCH_PAGE;
         }
-        else if (! initialized) {
-            initialize(pageFormat);
-            initialized = true;
-        }
+
+        initialize(pageFormat);
 
         Graphics2D g2d = (Graphics2D)g;
@@ -324 +340 @@
             layers,
             new Comparator<Layer>() {
+                @Override
                 public int compare(Layer l2, Layer l1) { // l1 and l2 swapped!
                     if (l1 instanceof OsmDataLayer && l2 instanceof OsmDataLayer) {