New Class

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

diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java
index 099d1d1..560c983 100755 (executable)
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@ -44,11 +44,14 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     boolean active = false;\r
     Image image;\r
     AlignmentPanel ap;\r
+    AlignViewport av;\r
     boolean resizing = false;\r
     int oldY;\r
     int mouseX;\r
     int selectedRow = 0;\r
     int scrollOffset = 0;\r
+    Font font = new Font("Arial", Font.PLAIN, 11);\r
+\r
 \r
     /**\r
      * Creates a new AnnotationLabels object.\r
@@ -58,6 +61,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
     public AnnotationLabels(AlignmentPanel ap)\r
     {\r
         this.ap = ap;\r
+        av = ap.av;\r
 \r
         java.net.URL url = getClass().getResource("/images/idwidth.gif");\r
         Image temp = null;\r
@@ -88,6 +92,11 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         addMouseMotionListener(this);\r
     }\r
 \r
+    public AnnotationLabels(AlignViewport av)\r
+    {\r
+      this.av = av;\r
+    }\r
+\r
     /**\r
      * DOCUMENT ME!\r
      *\r
@@ -325,7 +334,7 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         {\r
           pop.addSeparator();\r
           final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem(\r
-              "Ignore gaps in calculation",\r
+              "Ignore Gaps In Consensus",\r
               ap.av.getIgnoreGapsConsensus());\r
           cbmi.addActionListener(new ActionListener()\r
               {public void actionPerformed(ActionEvent e)\r
@@ -346,13 +355,19 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      *\r
      * @param g1 DOCUMENT ME!\r
      */\r
-    public void paintComponent(Graphics g1)\r
+    public void paintComponent(Graphics g)\r
     {\r
-        Graphics2D g = (Graphics2D) g1;\r
-        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
+\r
+        int width = getWidth();\r
+        if(width==0)\r
+         width = ap.calculateIdWidth().width + 4;\r
+\r
+       Graphics2D g2 = (Graphics2D) g;\r
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
             RenderingHints.VALUE_ANTIALIAS_ON);\r
 \r
-        drawComponent(g);\r
+       drawComponent(g2, width);\r
+\r
     }\r
 \r
     /**\r
@@ -360,8 +375,13 @@ public class AnnotationLabels extends JPanel implements MouseListener,
      *\r
      * @param g DOCUMENT ME!\r
      */\r
-    public void drawComponent(Graphics2D g)\r
+    public void drawComponent(Graphics g, int width)\r
     {\r
+        if(av.getFont().getSize()<10)\r
+          g.setFont(new Font("Arial", Font.PLAIN, av.getFont().getSize()-1));\r
+        else\r
+          g.setFont(font);\r
+\r
         FontMetrics fm = g.getFontMetrics(g.getFont());\r
         g.setColor(Color.white);\r
         g.fillRect(0, 0, getWidth(), getHeight());\r
@@ -369,12 +389,10 @@ public class AnnotationLabels extends JPanel implements MouseListener,
         g.translate(0, scrollOffset);\r
         g.setColor(Color.black);\r
 \r
-        AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation();\r
+        AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
         int y = g.getFont().getSize();\r
         int x = 0;\r
-        int width = getWidth();\r
-        if(width==0)\r
-         width = ap.calculateIdWidth().width + 4;\r
+\r
 \r
         if (aa != null)\r
         {\r
@@ -387,14 +405,14 @@ public class AnnotationLabels extends JPanel implements MouseListener,
 \r
                 x = width - fm.stringWidth(aa[i].label) - 3;\r
 \r
-                if (aa[i].isGraph)\r
+                if (aa[i].graph>0)\r
                 {\r
                     y += (aa[i].height / 3);\r
                 }\r
 \r
                 g.drawString(aa[i].label, x, y);\r
 \r
-                if (aa[i].isGraph)\r
+                if (aa[i].graph>0)\r
                 {\r
                     y += ((2 * aa[i].height) / 3);\r
                 }\r