X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPCAPanel.java;h=e680ddeab3fcb15970cd0817878fad8521c221a2;hb=03e082a4dba4e1ba9b6929ca3d3f8055f9224fc1;hp=71891aaef54a0baa6017984a45d965aaaac084a6;hpb=d4cf3b864ffb4d148389a3cdb788e43efd4e4b47;p=jalview.git

diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index 71891aa..e680dde 100755
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -29,10 +29,6 @@ import java.awt.event.*;
 
 import java.util.*;
 import javax.swing.*;
-import java.io.FileOutputStream;
-import org.jibble.epsgraphics.EpsGraphics2D;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
 import java.awt.print.*;
 
 
@@ -313,7 +309,6 @@ public class PCAPanel extends GPCAPanel implements Runnable
 
 
 
-
     /**
      * DOCUMENT ME!
      *
@@ -321,79 +316,7 @@ public class PCAPanel extends GPCAPanel implements Runnable
      */
     public void eps_actionPerformed(ActionEvent e)
     {
-      boolean accurateText = true;
-
-      String renderStyle = jalview.bin.Cache.getDefault("EPS_RENDERING",
-          "Prompt each time");
-
-  // If we need to prompt, and if the GUI is visible then
-  // Prompt for EPS rendering style
-      if (renderStyle.equalsIgnoreCase("Prompt each time")
-          && !
-          (System.getProperty("java.awt.headless") != null
-           && System.getProperty("java.awt.headless").equals("true")))
-      {
-        EPSOptions eps = new EPSOptions();
-        renderStyle = eps.getValue();
-
-        if (renderStyle == null || eps.cancelled)
-          return;
-
-      }
-
-      if (renderStyle.equalsIgnoreCase("text"))
-      {
-        accurateText = false;
-      }
-
-      int width = rc.getWidth();
-      int height = rc.getHeight();
-
-      try
-      {
-        jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty(
-                "LAST_DIRECTORY"), new String[]
-            {"eps"},
-            new String[]
-            {"Encapsulated Postscript"},
-            "Encapsulated Postscript");
-        chooser.setFileView(new jalview.io.JalviewFileView());
-        chooser.setDialogTitle("Create EPS file from PCA");
-        chooser.setToolTipText("Save");
-
-        int value = chooser.showSaveDialog(this);
-
-        if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
-        {
-          return;
-        }
-
-        jalview.bin.Cache.setProperty("LAST_DIRECTORY",
-                                      chooser.getSelectedFile().getParent());
-
-        FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
-        EpsGraphics2D pg = new EpsGraphics2D("PCA", out, 0, 0, width,
-                                             height);
-
-        pg.setAccurateTextMode(accurateText);
-
-        rc.drawBackground(pg, rc.bgColour);
-        rc.drawScene(pg);
-
-        if (rc.drawAxes == true)
-        {
-          rc.drawAxes(pg);
-        }
-
-
-        pg.flush();
-        pg.close();
-      }
-      catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
+      makePCAImage(jalview.util.ImageMaker.EPS);
     }
 
     /**
@@ -403,48 +326,38 @@ public class PCAPanel extends GPCAPanel implements Runnable
      */
     public void png_actionPerformed(ActionEvent e)
     {
+       makePCAImage(jalview.util.ImageMaker.PNG);
+    }
+
+    void makePCAImage(int type)
+    {
       int width = rc.getWidth();
       int height = rc.getHeight();
 
-      try
-      {
-        jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
-            jalview.bin.Cache.getProperty(
-                "LAST_DIRECTORY"), new String[]
-            {"png"},
-            new String[]
-            {"Portable network graphics"},
-            "Portable network graphics");
-
-        chooser.setFileView(new jalview.io.JalviewFileView());
-        chooser.setDialogTitle("Create PNG image from PCA");
-        chooser.setToolTipText("Save");
-
-        int value = chooser.showSaveDialog(this);
+      jalview.util.ImageMaker im;
 
-        if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
-        {
-          return;
-        }
-
-        jalview.bin.Cache.setProperty("LAST_DIRECTORY",
-                                      chooser.getSelectedFile().getParent());
-
-        FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
-
-        BufferedImage bi = new BufferedImage(width, height,
-                                             BufferedImage.TYPE_INT_RGB);
-        Graphics big = bi.getGraphics();
-
-        big.drawImage(rc.img,0,0,this);
-
-        ImageIO.write(bi, "png", out);
-        out.close();
-      }
-      catch (Exception ex)
-      {
-        ex.printStackTrace();
-      }
+      if(type == jalview.util.ImageMaker.PNG)
+        im = new jalview.util.ImageMaker(this,
+                                         jalview.util.ImageMaker.PNG,
+                                         "Make PNG image from PCA",
+                                         width, height,
+                                         null, null);
+        else
+          im = new jalview.util.ImageMaker(this,
+                                 jalview.util.ImageMaker.EPS,
+                                 "Make EPS file from PCA",
+                                 width, height,
+                                 null, this.getTitle());
+
+      if(im.getGraphics()!=null)
+       {
+         rc.drawBackground(im.getGraphics(), Color.black);
+         rc.drawScene(im.getGraphics());
+         if (rc.drawAxes == true)
+         {
+           rc.drawAxes(im.getGraphics());
+         }
+         im.writeImage();
+       }
     }
-
   }