correct eps png bug missing last 2 lines

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 4a2e3f1..76fc8d5 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -434,7 +434,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     }\r
 \r
     // draw main sequence panel\r
-    pg.translate(idWidth,0);\r
+    pg.translate(idWidth+4,0);\r
     pg.setClip(0,0,pwidth-idWidth, pheight);\r
     seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);\r
 \r
@@ -492,7 +492,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     }\r
 \r
     // draw main sequence panel\r
-    pg.translate(idWidth,0);\r
+    pg.translate(idWidth+4,0);\r
     seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth-idWidth, pheight, pi*noChunksOnPage*chunkWidth);\r
 \r
 \r
@@ -501,8 +501,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   }\r
 \r
 \r
-  public void makeEPS(int width, int height)\r
+  public void makeEPS()\r
   {\r
+    int height = (av.alignment.getWidth() / av.getChunkWidth() +1) * av.chunkHeight;\r
+    int width = seqPanel.getWidth() + idPanel.getWidth();\r
+\r
+    if (!av.getWrapAlignment())\r
+    {\r
+      height = (av.alignment.getHeight()+1) * av.charHeight + 30;\r
+      width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
+    }\r
+\r
     try\r
     {\r
       jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(\r
@@ -534,8 +543,19 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     }\r
   }\r
 \r
-  public void makePNG(int width, int height)\r
+  public void makePNG()\r
   {\r
+      int height = (av.alignment.getWidth() / av.getChunkWidth() +1) * av.chunkHeight;\r
+      int width = seqPanel.getWidth() + idPanel.getWidth();\r
+\r
+      if (!av.getWrapAlignment())\r
+      {\r
+        height = (av.alignment.getHeight()+1) * av.charHeight + 30;\r
+        width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
+      }\r
+\r
+\r
+\r
     try\r
     {\r
       jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(\r