Less args, faster rendering

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

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 9b1f10d..c2500c2 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -93,15 +93,9 @@ public class IdCanvas extends JPanel
             gg.setColor(Color.black);\r
         }\r
 \r
-        String string = s.getName();\r
 \r
-        if (av.getShowFullId())\r
-        {\r
-            string = s.getDisplayId();\r
-        }\r
-\r
-        gg.drawString(string, 0,\r
-            (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));\r
+        gg.drawString( s.getDisplayId(av.getShowJVSuffix()),\r
+                      0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));\r
     }\r
 \r
     /**\r
@@ -208,8 +202,10 @@ public class IdCanvas extends JPanel
       Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
                              av.getFont().getSize());\r
       gg.setFont(italic);\r
-      gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-            RenderingHints.VALUE_ANTIALIAS_ON);\r
+\r
+      if (av.antiAlias)\r
+        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
+                            RenderingHints.VALUE_ANTIALIAS_ON);\r
 \r
         Color currentColor = Color.white;\r
         Color currentTextColor = Color.black;\r
@@ -244,16 +240,16 @@ public class IdCanvas extends JPanel
                 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, getWidth());\r
                   gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));\r
-                  gg.setFont(italic);\r
+\r
                 }\r
             }\r
         }\r
@@ -290,12 +286,7 @@ public class IdCanvas extends JPanel
 \r
                 gg.setColor(currentTextColor);\r
 \r
-                String string = av.alignment.getSequenceAt(i).getName();\r
-\r
-                if (av.getShowFullId())\r
-                {\r
-                    string = av.alignment.getSequenceAt(i).getDisplayId();\r
-                }\r
+                String string = av.alignment.getSequenceAt(i).getDisplayId( av.getShowJVSuffix());\r
 \r
                 gg.drawString(string, 0,\r
                     (((i - starty) * av.charHeight) + av.charHeight) -\r