Align labels format left

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

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 672d200..b4fd746 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -50,13 +50,13 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     JScrollPane scrollPane;\r
     AlignViewport av;\r
     Font font;\r
-    int fontSize = 12;\r
+    FontMetrics fm;\r
     boolean fitToWindow = true;\r
     boolean showDistances = false;\r
     boolean showBootstrap = false;\r
     boolean markPlaceholders = false;\r
     int offx = 20;\r
-    int offy = 20;\r
+    int offy;\r
     float threshold;\r
     String longestName;\r
     int labelLength = -1;\r
@@ -77,6 +77,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     public TreeCanvas(AlignViewport av, JScrollPane scroller)\r
     {\r
         this.av = av;\r
+        font = av.getFont();\r
         scrollPane = scroller;\r
         addMouseListener(this);\r
         PaintRefresher.Register(this, av.alignment);\r
@@ -194,7 +195,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 \r
             if (showDistances && (node.dist > 0))\r
             {\r
-                nodeLabel = new Format("%5.2f").form(node.dist);\r
+                nodeLabel = new Format("%-.2f").form(node.dist);\r
             }\r
 \r
             if (showBootstrap)\r
@@ -209,16 +210,16 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 \r
             if (!nodeLabel.equals(""))\r
             {\r
-                g.drawString(nodeLabel, xstart, ypos - 10);\r
+                g.drawString(nodeLabel, xstart+2, ypos - 2);\r
             }\r
 \r
             String name = (markPlaceholders && node.isPlaceholder())\r
                 ? (PLACEHOLDER + node.getName()) : node.getName();\r
-            FontMetrics fm = g.getFontMetrics(font);\r
+\r
             int charWidth = fm.stringWidth(name) + 3;\r
-            int charHeight = fm.getHeight();\r
+            int charHeight = font.getSize();\r
 \r
-            Rectangle rect = new Rectangle(xend + 20, ypos - charHeight,\r
+            Rectangle rect = new Rectangle(xend+10, ypos-charHeight/2,\r
                     charWidth, charHeight);\r
 \r
             nameHash.put((SequenceI) node.element(), rect);\r
@@ -231,12 +232,12 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
             {\r
                 g.setColor(Color.gray);\r
 \r
-                g.fillRect(xend + 10, ypos - charHeight + 3, charWidth,\r
+                g.fillRect(xend + 10, ypos-charHeight/2, charWidth,\r
                     charHeight);\r
                 g.setColor(Color.white);\r
             }\r
 \r
-            g.drawString(name, xend + 10, ypos);\r
+            g.drawString(name, xend + 10, ypos+fm.getDescent());\r
             g.setColor(Color.black);\r
         }\r
         else\r
@@ -272,8 +273,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 \r
             if (showDistances && (node.dist > 0))\r
             {\r
-                g.drawString(new Format("%5.2f").form(node.dist), xstart,\r
-                    ypos - 5);\r
+                g.drawString(new Format("%-.2f").form(node.dist).trim(), xstart+2,\r
+                    ypos - 2);\r
             }\r
         }\r
     }\r
@@ -339,7 +340,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
                 ((SequenceNode) top.right()).count;\r
         }\r
 \r
-        float chunk = (float) (height - (offy * 2)) / top.count;\r
+        float chunk = (float) (height - (offy)) / top.count;\r
 \r
         pickNode(pickBox, top, chunk, wscale, width, offx, offy);\r
     }\r
@@ -523,18 +524,15 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
     public void paintComponent(Graphics g)\r
     {\r
         super.paintComponent(g);\r
+        g.setFont(font);\r
+\r
         if(tree==null)\r
         {\r
-          g.setFont(new Font("Verdana", Font.PLAIN, 18));\r
           g.drawString("Calculating tree....", 20, getHeight()/2);\r
         }\r
         else\r
         {\r
-\r
-          font = new Font("Verdana", Font.PLAIN, fontSize);\r
-          g.setFont(font);\r
-\r
-          FontMetrics fm = g.getFontMetrics(font);\r
+          fm = g.getFontMetrics(font);\r
 \r
           if (nameHash.size() == 0)\r
           {\r
@@ -560,24 +558,15 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         }\r
     }\r
 \r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @return DOCUMENT ME!\r
-     */\r
-    public int getFontSize()\r
-    {\r
-        return fontSize;\r
-    }\r
 \r
     /**\r
      * DOCUMENT ME!\r
      *\r
      * @param fontSize DOCUMENT ME!\r
      */\r
-    public void setFontSize(int fontSize)\r
+    public void setFont(Font font)\r
     {\r
-        this.fontSize = fontSize;\r
+        this.font = font;\r
         repaint();\r
     }\r
 \r
@@ -596,7 +585,13 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         g2.setColor(Color.white);\r
         g2.fillRect(0, 0, width, height);\r
 \r
-        labelLength = g2.getFontMetrics(font).stringWidth(longestName) + 20; //20 allows for scrollbar\r
+        g2.setFont(font);\r
+\r
+        offy = font.getSize()+10;\r
+\r
+        fm = g2.getFontMetrics(font);\r
+\r
+        labelLength = fm.stringWidth(longestName) + 20; //20 allows for scrollbar\r
 \r
         float wscale = (float) (width - labelLength - (offx * 2)) / tree.getMaxHeight();\r
 \r
@@ -608,7 +603,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
                 ((SequenceNode) top.right()).count;\r
         }\r
 \r
-        float chunk = (float) (height - (offy * 2)) / top.count;\r
+        float chunk = (float) (height - (offy)) / top.count;\r
 \r
         drawNode(g2, tree.getTopNode(), chunk, wscale, width, offx, offy);\r
 \r