make eps, png files, filefilter added

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index f4139c6..079f315 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -63,7 +63,22 @@ public class AlignFrame extends GAlignFrame
 \r
   protected void saveAs_actionPerformed(ActionEvent e)\r
   {\r
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+    String suffix = "";\r
+    if(e.getActionCommand().equals("FASTA"))\r
+      suffix = "fa";\r
+    else if(e.getActionCommand().equals("MSF"))\r
+      suffix = "msf";\r
+    else if(e.getActionCommand().equals("CLUSTAL"))\r
+      suffix = "aln";\r
+    else if(e.getActionCommand().equals("BLC"))\r
+      suffix = "blc";\r
+    else if(e.getActionCommand().equals("PIR"))\r
+      suffix = "pir";\r
+    else if(e.getActionCommand().equals("PFAM"))\r
+      suffix = "pfam";\r
+\r
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
+        , new String[]{suffix}, e.getActionCommand()+" file");\r
     chooser.setFileView(new JalviewFileView());\r
     chooser.setDialogTitle("Save Alignment to file - "+e.getActionCommand() +" format.");\r
     chooser.setToolTipText("Save");\r
@@ -99,12 +114,24 @@ public class AlignFrame extends GAlignFrame
     htmlOutput = null;\r
   }\r
 \r
-  protected void createJPG_actionPerformed(ActionEvent e)\r
+  protected void createPNG_actionPerformed(ActionEvent e)\r
   {\r
-\r
     int height = (viewport.alignment.getWidth() / viewport.getChunkWidth() +1) * viewport.chunkHeight;\r
     int width = alignPanel.seqPanel.getWidth() + alignPanel.idPanel.getWidth();\r
 \r
+    if(!viewport.getWrapAlignment())\r
+    {\r
+      height = viewport.alignment.getHeight() * viewport.charHeight;\r
+      width = alignPanel.idPanel.getWidth() + viewport.alignment.getWidth() * viewport.charWidth;\r
+    }\r
+\r
+    alignPanel.makePNG( width, height);\r
+  }\r
+\r
+  protected void epsFile_actionPerformed(ActionEvent e)\r
+  {\r
+    int height = (viewport.alignment.getWidth() / viewport.getChunkWidth() +1) * viewport.chunkHeight;\r
+    int width = alignPanel.seqPanel.getWidth() + alignPanel.idPanel.getWidth();\r
 \r
     if(!viewport.getWrapAlignment())\r
     {\r
@@ -112,7 +139,8 @@ public class AlignFrame extends GAlignFrame
       width = alignPanel.idPanel.getWidth() + viewport.alignment.getWidth() * viewport.charWidth;\r
     }\r
 \r
-    alignPanel.makeJPG( width, height);\r
+    alignPanel.makeEPS( width, height);\r
+\r
   }\r
 \r
 \r