X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreePanel.java;h=bd619a3436cd94095386df9e2c00f9a945129bee;hb=32ce9ddb7ce1a68add53dd81785ae428ca136a83;hp=04be0fd87742a3cb3cee8fc42fbddd7317da3230;hpb=cc6d3409ba4055800f8945e1a984899327c66da4;p=jalview.git

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 04be0fd..bd619a3 100755
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -26,18 +26,14 @@ import jalview.io.*;
 
 import jalview.jbgui.*;
 
-import org.jibble.epsgraphics.*;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.image.*;
 
 import java.io.*;
 
 import java.util.*;
 
-import javax.imageio.*;
-
 import java.beans.PropertyChangeEvent;
 
 
@@ -153,6 +149,7 @@ public class TreePanel extends GTreePanel
           // update distance/bootstrap visibility at the same time
           showBootstrap(newtree.HasBootstrap());
           showDistances(newtree.HasDistances());
+          showPlaceholders(true);
         }
       }
 
@@ -168,8 +165,8 @@ public class TreePanel extends GTreePanel
         treeCanvas.setTree(tree);
 
         treeCanvas.repaint();
-
       }
+
     }
 
     public void showDistances(boolean b)
@@ -354,6 +351,7 @@ public class TreePanel extends GTreePanel
         treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected());
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -361,70 +359,7 @@ public class TreePanel extends GTreePanel
      */
     public void epsTree_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 = treeCanvas.getWidth();
-        int height = treeCanvas.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 tree");
-            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("Tree", out, 0, 0, width,
-                                                 height);
-
-            pg.setAccurateTextMode(accurateText);
-
-            treeCanvas.draw(pg, width, height);
-
-            pg.flush();
-            pg.close();
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
+      makeTreeImage(jalview.util.ImageMaker.EPS);
     }
 
     /**
@@ -434,44 +369,34 @@ public class TreePanel extends GTreePanel
      */
     public void pngTree_actionPerformed(ActionEvent e)
     {
-        int width = treeCanvas.getWidth();
-        int height = treeCanvas.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 tree");
-            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());
+       makeTreeImage(jalview.util.ImageMaker.PNG);
+    }
 
-            FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
+    void makeTreeImage(int type)
+    {
+      int width = treeCanvas.getWidth();
+      int height = treeCanvas.getHeight();
 
-            BufferedImage bi = new BufferedImage(width, height,
-                    BufferedImage.TYPE_INT_RGB);
-            Graphics png = bi.getGraphics();
+      jalview.util.ImageMaker im;
 
-            treeCanvas.draw(png, width, height);
+      if(type == jalview.util.ImageMaker.PNG)
+        im = new jalview.util.ImageMaker(this,
+                                         jalview.util.ImageMaker.PNG,
+                                         "Make PNG image from tree",
+                                         width, height,
+                                         null, null);
+        else
+          im = new jalview.util.ImageMaker(this,
+                                 jalview.util.ImageMaker.EPS,
+                                 "Make EPS file from tree",
+                                 width, height,
+                                 null, this.getTitle());
 
-            ImageIO.write(bi, "png", out);
-            out.close();
-        }
-        catch (Exception ex)
-        {
-            ex.printStackTrace();
-        }
+      if(im.getGraphics()!=null)
+      {
+        treeCanvas.draw(im.getGraphics(), width, height);
+        im.writeImage();
+      }
     }
+
 }