use fontchooser to change fonts

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

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 8d13e93..603a80f 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -39,6 +39,7 @@ import java.util.*;
 import javax.imageio.*;\r
 \r
 import javax.swing.*;\r
+import java.beans.PropertyChangeEvent;\r
 \r
 \r
 /**\r
@@ -111,6 +112,25 @@ public class TreePanel extends GTreePanel
       treeCanvas = new TreeCanvas(av, scrollPane);\r
       scrollPane.setViewportView(treeCanvas);\r
 \r
+      av.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
+      {\r
+        public void propertyChange(PropertyChangeEvent evt)\r
+        {\r
+          if (evt.getPropertyName().equals("alignment"))\r
+          {\r
+            if(tree==null)\r
+              System.out.println("tree is null");\r
+            if(evt.getNewValue()==null)\r
+              System.out.println("new value is null");\r
+\r
+            tree.UpdatePlaceHolders( (Vector) evt.getNewValue());\r
+\r
+            repaint();\r
+          }\r
+        }\r
+      });\r
+\r
+\r
       TreeLoader tl = new TreeLoader(newTree);\r
       tl.start();\r
 \r
@@ -127,7 +147,6 @@ public class TreePanel extends GTreePanel
 \r
       public void run()\r
       {\r
-        NJTree tree;\r
         if(newtree!=null)\r
           tree = new NJTree(seq, newtree);\r
         else\r
@@ -285,33 +304,25 @@ public class TreePanel extends GTreePanel
      *\r
      * @param e DOCUMENT ME!\r
      */\r
-    public void fontSize_actionPerformed(ActionEvent e)\r
+    public void font_actionPerformed(ActionEvent e)\r
     {\r
         if (treeCanvas == null)\r
         {\r
             return;\r
         }\r
 \r
-        String size = fontSize.getText().substring(fontSize.getText().indexOf("-") +\r
-                1);\r
-\r
-        Object selection = JOptionPane.showInternalInputDialog(Desktop.desktop,\r
-                "Select font size", "Font size", JOptionPane.QUESTION_MESSAGE,\r
-                null,\r
-                new String[]\r
-                {\r
-                    "1", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20"\r
-                }, "Font Size - " + size);\r
-\r
-        if (selection != null)\r
-        {\r
-            fontSize.setText("Font Size - " + selection);\r
+        FontChooser fontchooser = new FontChooser(this);\r
+    }\r
 \r
-            int i = Integer.parseInt(selection.toString());\r
-            treeCanvas.setFontSize(i);\r
-        }\r
+    public Font getFont()\r
+    {\r
+      return treeCanvas.font;\r
+    }\r
 \r
-        scrollPane.setViewportView(treeCanvas);\r
+    public void setFont(Font font)\r
+    {\r
+      if(treeCanvas!=null)\r
+      treeCanvas.setFont(font);\r
     }\r
 \r
     /**\r
@@ -351,6 +362,32 @@ public class TreePanel extends GTreePanel
      */\r
     public void epsTree_actionPerformed(ActionEvent e)\r
     {\r
+      boolean accurateText = true;\r
+\r
+      String renderStyle = jalview.bin.Cache.getDefault("EPS_RENDERING",\r
+          "Prompt each time");\r
+\r
+    // If we need to prompt, and if the GUI is visible then\r
+    // Prompt for EPS rendering style\r
+      if (renderStyle.equalsIgnoreCase("Prompt each time")\r
+          && !\r
+          (System.getProperty("java.awt.headless") != null\r
+           && System.getProperty("java.awt.headless").equals("true")))\r
+      {\r
+        EPSOptions eps = new EPSOptions();\r
+        renderStyle = eps.getValue();\r
+\r
+        if (renderStyle==null || eps.cancelled)\r
+          return;\r
+\r
+\r
+      }\r
+\r
+      if (renderStyle.equalsIgnoreCase("text"))\r
+      {\r
+        accurateText = false;\r
+      }\r
+\r
         int width = treeCanvas.getWidth();\r
         int height = treeCanvas.getHeight();\r
 \r
@@ -372,11 +409,13 @@ public class TreePanel extends GTreePanel
             }\r
 \r
             jalview.bin.Cache.setProperty("LAST_DIRECTORY",\r
-                chooser.getSelectedFile().getParent());\r
+                                          chooser.getSelectedFile().getParent());\r
 \r
             FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());\r
             EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width,\r
-                    height);\r
+                                                 height);\r
+\r
+            pg.setAccurateTextMode(accurateText);\r
 \r
             treeCanvas.draw(pg, width, height);\r
 \r