Printing changes

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index f1874b1..59717a9 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -11,6 +11,7 @@ import java.io.*;
 import java.awt.image.*;\r
 import org.jibble.epsgraphics.*;\r
 import javax.imageio.*;\r
+import javax.swing.*;\r
 \r
 \r
 \r
@@ -107,6 +108,11 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   {\r
     // set idCanvas bufferedImage to null\r
     // to prevent drawing old image\r
+    FontMetrics fm = getFontMetrics(av.getFont());\r
+\r
+    scalePanelHolder.setPreferredSize(new Dimension(10, av.charHeight+fm.getDescent()));\r
+    idSpaceFillerPanel1.setPreferredSize(new Dimension(10, av.charHeight+fm.getDescent()));\r
+\r
     idPanel.idCanvas.gg = null;\r
     annotationPanel.adjustPanelHeight();\r
     Dimension d = calculateIdWidth();\r
@@ -404,148 +410,159 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException\r
   {\r
 \r
-    int idWidth = calculateIdWidth().width + 4;\r
+      int idWidth = calculateIdWidth().width + 4;\r
+      FontMetrics fm = getFontMetrics(av.getFont());\r
+      int scaleHeight = av.charHeight + fm.getDescent();\r
 \r
+      pg.setColor(Color.white);\r
+      pg.fillRect(0, 0, pwidth, pheight);\r
+      pg.setFont(av.getFont());\r
 \r
-    pg.setColor(Color.white);\r
-    pg.fillRect(0,0,pwidth, pheight);\r
-    pg.setFont( av.getFont() );\r
+      ////////////////////////////////////\r
+      /// How many sequences and residues can we fit on a printable page?\r
+      int totalRes = (pwidth - idWidth) / av.getCharWidth();\r
 \r
-    ////////////////////////////////////\r
-    /// How many sequences and residues can we fit on a printable page?\r
-    int totalRes = (pwidth - idWidth)/av.getCharWidth();\r
-    int totalSeq = (int)((pheight - 30)/av.getCharHeight())-1;\r
-    int pagesWide = av.getAlignment().getWidth() / totalRes +1;\r
-    int pagesHigh = av.getAlignment().getHeight() / totalSeq +1;\r
+      int totalSeq = (int) ( (pheight - scaleHeight) / av.getCharHeight()) - 1;\r
 \r
-    if (pi >= pagesWide*pagesHigh)\r
-     return Printable.NO_SUCH_PAGE;\r
+      int pagesWide = av.getAlignment().getWidth() / totalRes + 1;\r
 \r
-    /////////////////////////////\r
-    /// Only print these sequences and residues on this page\r
-    int startRes, endRes, startSeq, endSeq;\r
-    startRes = (pi % pagesWide) * totalRes;\r
-    endRes = startRes + totalRes-1;\r
-    if(endRes>av.getAlignment().getWidth())\r
-      endRes = av.getAlignment().getWidth();\r
+      /////////////////////////////\r
+      /// Only print these sequences and residues on this page\r
+      int startRes, endRes, startSeq, endSeq;\r
+      startRes = (pi % pagesWide) * totalRes;\r
+      endRes = startRes + totalRes - 1;\r
+      if (endRes > av.getAlignment().getWidth()-1)\r
+        endRes = av.getAlignment().getWidth()-1;\r
 \r
-     startSeq = (pi / pagesWide) * totalSeq;\r
-     endSeq = startSeq + totalSeq;\r
-     if(endSeq > av.getAlignment().getHeight())\r
-       endSeq = av.getAlignment().getHeight();\r
+      startSeq = (pi / pagesWide) * totalSeq;\r
+      endSeq = startSeq + totalSeq;\r
+      if (endSeq > av.getAlignment().getHeight())\r
+        endSeq = av.getAlignment().getHeight();\r
 \r
+      int pagesHigh = ( (av.alignment.getHeight() / totalSeq) + 1) * pheight;\r
 \r
-    ////////////////\r
-    //draw Scale\r
-    pg.translate(idWidth,0);\r
-    scalePanel.drawScale(pg, startRes, endRes, pwidth-idWidth);\r
+      if (av.showAnnotation)\r
+        pagesHigh += annotationPanel.getHeight();\r
 \r
-    pg.translate(-idWidth, 30);\r
-    ////////////////\r
-    // Draw the ids\r
-    Color currentColor=null;\r
-    Color currentTextColor=null;\r
-    for(int i=startSeq; i<endSeq; i++)\r
-    {\r
-      if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(av.getAlignment().getSequenceAt(i)))\r
-      {\r
-        currentColor = Color.gray;\r
-        currentTextColor = Color.black;\r
-      }\r
-      else\r
+      pagesHigh /= pheight;\r
+\r
+      if (pi >= pagesWide * pagesHigh)\r
+        return Printable.NO_SUCH_PAGE;\r
+\r
+        //draw Scale\r
+      pg.translate(idWidth, 0);\r
+      scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);\r
+      pg.translate( -idWidth, scaleHeight);\r
+      ////////////////\r
+      // Draw the ids\r
+      Color currentColor = null;\r
+      Color currentTextColor = null;\r
+      for (int i = startSeq; i < endSeq; i++)\r
       {\r
-        currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
-        currentTextColor = Color.black;\r
-      }\r
+        if (av.getSelectionGroup() != null &&\r
+            av.getSelectionGroup().sequences.\r
+            contains(av.getAlignment().getSequenceAt(i)))\r
+        {\r
+          currentColor = Color.gray;\r
+          currentTextColor = Color.black;\r
+        }\r
+        else\r
+        {\r
+          currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
+          currentTextColor = Color.black;\r
+        }\r
 \r
-      pg.setColor(currentColor);\r
-      pg.fillRect(0,  jalview.analysis.AlignmentUtil.getPixelHeight(startSeq, i, av.getCharHeight()),\r
-                              idWidth,\r
-                              av.getCharHeight());\r
+        pg.setColor(currentColor);\r
+        pg.fillRect(0,\r
+                    jalview.analysis.AlignmentUtil.getPixelHeight(startSeq, i,\r
+            av.getCharHeight()),\r
+                    idWidth,\r
+                    av.getCharHeight());\r
 \r
-      pg.setColor(currentTextColor);\r
+        pg.setColor(currentTextColor);\r
 \r
-      String string = av.getAlignment().getSequenceAt(i).getName();\r
-      if(av.getShowFullId())\r
-        string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
+        String string = av.getAlignment().getSequenceAt(i).getName();\r
+        if (av.getShowFullId())\r
+          string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
 \r
-      pg.drawString(string, 0,  jalview.analysis.AlignmentUtil.getPixelHeight\r
-                    (startSeq, i, av.getCharHeight()) + av.getCharHeight() - (av.getCharHeight() / 5));\r
-    }\r
+        pg.drawString(string, 0, jalview.analysis.AlignmentUtil.getPixelHeight\r
+                      (startSeq, i, av.getCharHeight()) + av.getCharHeight() -\r
+                      (av.getCharHeight() / 5));\r
+      }\r
 \r
-    // draw main sequence panel\r
-    pg.translate(idWidth,0);\r
-    seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);\r
+      // draw main sequence panel\r
+      pg.translate(idWidth, 0);\r
+      seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq,\r
+                                   startRes, startSeq, 0);\r
 \r
 \r
-    if(av.getShowAnnotation())\r
+      if (av.showAnnotation && endSeq == av.alignment.getHeight())\r
       {\r
-        pg.translate(-idWidth,(endSeq-startSeq)*av.charHeight);\r
-        alabels.drawComponent((Graphics2D)pg);\r
-        pg.translate(idWidth,0);\r
-        annotationPanel.drawComponent((Graphics2D) pg, startRes, endRes+1);\r
+        pg.translate( -idWidth, (endSeq - startSeq) * av.charHeight);\r
+        alabels.drawComponent( (Graphics2D) pg);\r
+        pg.translate(idWidth, 0);\r
+        annotationPanel.drawComponent( (Graphics2D) pg, startRes, endRes+1);\r
       }\r
 \r
-    return Printable.PAGE_EXISTS;\r
+      return Printable.PAGE_EXISTS;\r
+\r
   }\r
 \r
 \r
   public int printWrappedAlignment(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException\r
   {\r
+      int idWidth = calculateIdWidth().width + 4;\r
 \r
-    int idWidth = calculateIdWidth().width+4;\r
+      int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth - idWidth);\r
+      int totalHeight = totalHeight = (av.alignment.getHeight() + 2) *\r
+          ( (av.alignment.getWidth()\r
+             / resWidth) + 1) * av.charHeight;\r
 \r
-    if( seqPanel.seqCanvas.getWidth() < pwidth-idWidth)\r
-      pwidth = seqPanel.seqCanvas.getWidth() + idWidth;\r
 \r
+      pg.setColor(Color.white);\r
+      pg.fillRect(0, 0, pwidth, pheight);\r
+      pg.setFont(av.getFont());\r
 \r
-    pg.setColor(Color.white);\r
-    pg.fillRect(0,0,pwidth, pheight);\r
-    pg.setFont( av.getFont() );\r
+      ////////////////\r
+      // Draw the ids\r
+      pg.setColor(Color.black);\r
 \r
-    ////////////////////////////////////\r
-    /// How many sequences and residues can we fit on a printable page?\r
-    AlignmentI da = av.alignment;\r
-    int endy   = da.getHeight();\r
-    int chunkHeight =  (da.getHeight() + 2)*av.charHeight;\r
-    int chunkWidth  =   (pwidth-idWidth)/av.charWidth;\r
+      pg.translate(0, -pi * pheight);\r
 \r
-    int noChunksOnPage = pheight / chunkHeight;\r
-    int totalChunks = da.getWidth() / chunkWidth;\r
+      pg.setClip(0,pi*pheight,pwidth, pheight);\r
 \r
-    if ( pi*noChunksOnPage > totalChunks )\r
-     return Printable.NO_SUCH_PAGE;\r
+      int ypos = 2 * av.charHeight;\r
+      do\r
+      {\r
+        for (int i = 0; i < av.alignment.getHeight(); i++)\r
+        {\r
+          SequenceI s = av.alignment.getSequenceAt(i);\r
+          String string = s.getName();\r
+          if (av.getShowFullId())\r
+            string = s.getDisplayId();\r
 \r
-    ////////////////\r
-    // Draw the ids\r
-//    pg.setClip(0,0,pwidth, noChunksOnPage*chunkHeight);\r
+          pg.drawString(string, 0,\r
+                        AlignmentUtil.getPixelHeight(0, i, av.charHeight) +\r
+                        ypos +\r
+                        av.charHeight - (av.charHeight / 5));\r
 \r
-    pg.setColor(Color.black);\r
+        }\r
 \r
-    int rowSize =  av.getEndRes() - av.getStartRes();\r
-    for(int ypos=2*av.charHeight, row=av.getEndRes()-rowSize;\r
-              ypos <= pheight && row<av.alignment.getWidth();\r
-              ypos += av.chunkHeight, row+=rowSize )\r
-    {\r
-      for (int i = 0; i < endy; i++)\r
-      {\r
-        SequenceI s = da.getSequenceAt(i);\r
-        String string = s.getName();\r
-        if (av.getShowFullId())\r
-          string = s.getDisplayId();\r
+        ypos += (av.alignment.getHeight() + 2) * av.charHeight;\r
 \r
-        pg.drawString(string, 0,\r
-                      AlignmentUtil.getPixelHeight(0, i, av.charHeight) + ypos +\r
-                      av.charHeight - (av.charHeight / 5));\r
       }\r
-    }\r
+      while (ypos < totalHeight);\r
 \r
-    // draw main sequence panel\r
-    pg.translate(idWidth,0);\r
-    seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth-idWidth, pheight, pi*noChunksOnPage*chunkWidth);\r
+      pg.translate(idWidth, 0);\r
+\r
+      seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);\r
+\r
+      if (pi * pheight < totalHeight)\r
+        return Printable.PAGE_EXISTS;\r
+      else\r
+        return Printable.NO_SUCH_PAGE;\r
 \r
 \r
-    return Printable.PAGE_EXISTS;\r
 \r
   }\r
 \r
@@ -650,6 +667,37 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
 }\r
 \r
+class Preview extends JFrame\r
+{\r
+\r
+  public Preview(Image image)\r
+  {\r
+    setResizable(true);\r
+    setSize(image.getWidth(this), image.getHeight(this));\r
+    setVisible(true);\r
+    getContentPane().setLayout(new BorderLayout());\r
+    getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER);\r
+    validate();\r
+    repaint();\r
+  }\r
+}\r
+\r
+class PreviewPanel extends JPanel\r
+{\r
+  Image image;\r
+  public PreviewPanel(Image image)\r
+  {\r
+    this.image = image;\r
+  }\r
+  public void paintComponent(Graphics g)\r
+  {\r
+    if(image!=null)\r
+      g.drawImage(image,0,0,this);\r
+    else\r
+      System.out.println("image is null");\r
+  }\r
+}\r
+\r
 \r
 \r
 \r