printing now uses printer fonts

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 53f65d8..2266462 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -178,15 +178,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   }\r
 \r
 \r
-  public int print(Graphics g, PageFormat pf, int pi) throws PrinterException\r
+  public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException\r
   {\r
 \r
+    pg.translate((int)pf.getImageableX(), (int)pf.getImageableY());\r
+\r
     int pwidth = (int)pf.getImageableWidth();\r
     int pheight = (int)pf.getImageableHeight();\r
     int idWidth = (int)idPanel.idCanvas.getLabelWidth().getWidth();\r
 \r
-    BufferedImage printImage = new BufferedImage(pwidth,pheight,BufferedImage.TYPE_INT_RGB);\r
-    Graphics pg = printImage.getGraphics();\r
+    //BufferedImage printImage = new BufferedImage(pwidth,pheight,BufferedImage.TYPE_INT_RGB);\r
+   // Graphics pg = printImage.getGraphics();\r
     pg.setColor(Color.white);\r
     pg.fillRect(0,0,pwidth, pheight);\r
     pg.setFont( av.getFont() );\r
@@ -254,34 +256,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     pg.translate(idWidth,0);\r
     seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);\r
 \r
-\r
-    g.drawImage( printImage, (int)pf.getImageableX (), (int)pf.getImageableY(), this);\r
-\r
-   /* JFrame frame = new JFrame("preview");\r
-    javax.swing.JPanel p = new preview(printImage);\r
-    frame.getContentPane().setLayout(new BorderLayout());\r
-    frame.getContentPane().add(p, java.awt.BorderLayout.CENTER);\r
-    frame.setVisible(true);\r
-    frame.setSize(pwidth, pheight);\r
-\r
-    frame.validate();*/\r
-\r
     return Printable.PAGE_EXISTS;\r
   }\r
 }\r
 \r
-class preview extends javax.swing.JPanel\r
-{\r
-  Image i=null;\r
-  public preview(Image image)\r
-  {\r
-    i = image;\r
-  }\r
-\r
-  public void paint(Graphics g)\r
-  {\r
-    if(g!=null)\r
-      g.drawImage(i, 0,0,null);\r
-  }\r
-}\r
-\r