From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 19 Nov 2004 17:23:44 +0000 (+0000)
Subject: printing now uses printer fonts
X-Git-Tag: Release_2_0~901
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b7b0de15f5a7c17c0a29008b5e920a1906071d19;p=jalview.git

printing now uses printer fonts
---

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