annotation label font size change in applet.

[jalview.git] / src / jalview / appletgui / IdCanvas.java

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index a277adb..f7f1b20 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -59,7 +59,7 @@ public class IdCanvas
       gg.setColor(Color.white);\r
     }\r
     else if (av.getSelectionGroup() != null &&\r
-             av.getSelectionGroup().sequences.contains(s))\r
+             av.getSelectionGroup().getSequences(false).contains(s))\r
     {\r
       gg.setColor(Color.lightGray);\r
       gg.fillRect(0, ((i - starty) * charHeight) + ypos,\r
@@ -74,13 +74,8 @@ public class IdCanvas
       gg.setColor(Color.black);\r
     }\r
 \r
-    String string = s.getName();\r
-    if (av.getShowFullId())\r
-    {\r
-      string = s.getDisplayId();\r
-    }\r
 \r
-    gg.drawString(string, 0,\r
+    gg.drawString( s.getDisplayId(av.getShowJVSuffix()), 0,\r
                   ((i - starty) * charHeight) + ypos +\r
                   charHeight - (charHeight / 5));\r
 \r
@@ -209,16 +204,15 @@ public class IdCanvas
             for (int i = starty; i < av.alignment.getHeight(); i++)\r
             {\r
                 SequenceI s = av.alignment.getSequenceAt(i);\r
+                gg.setFont(italic);\r
                 drawIdString(gg, s, i, 0, ypos);\r
             }\r
 \r
             if(labels!=null)\r
             {\r
-              gg.setFont(av.getFont());\r
               gg.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight));\r
               labels.drawComponent(gg, getSize().width);\r
               gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));\r
-              gg.setFont(italic);\r
             }\r
         }\r
 \r
@@ -240,7 +234,7 @@ public class IdCanvas
         }\r
         else if (av.getSelectionGroup() != null\r
                  &&\r
-                 av.getSelectionGroup().sequences.contains(av.alignment.\r
+                 av.getSelectionGroup().getSequences(false).contains(av.alignment.\r
             getSequenceAt(i)))\r
         {\r
           currentColor = Color.lightGray;\r
@@ -260,12 +254,9 @@ public class IdCanvas
                     av.charHeight);\r
 \r
         gg.setColor(currentTextColor);\r
-        String string = av.alignment.getSequenceAt(i).getName();\r
-        if (av.getShowFullId())\r
-        {\r
-          string = av.alignment.getSequenceAt(i).getDisplayId();\r
-        }\r
-        gg.drawString(string, 0,\r
+\r
+        gg.drawString(av.alignment.getSequenceAt(i)\r
+            .getDisplayId(av.getShowJVSuffix()), 0,\r
                       ((i - starty) * av.charHeight) +\r
                       av.charHeight - (av.charHeight / 5));\r
       }\r