X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=c2500c227f6a18c7d4c877af68013e9a3d66930b;hb=9807ea8cc4e867378c52d51b832168d4bc611d29;hp=7d283baa3519fe6ee6adb83851a6cf6df7b3aea2;hpb=893f1fefbcf73ae49776c667b110483ba26ee376;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 7d283ba..c2500c2 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -18,8 +18,6 @@
  */
 package jalview.gui;
 
-import jalview.analysis.*;
-
 import jalview.datamodel.*;
 
 import java.awt.*;
@@ -95,15 +93,9 @@ public class IdCanvas extends JPanel
             gg.setColor(Color.black);
         }
 
-        String string = s.getName();
 
-        if (av.getShowFullId())
-        {
-            string = s.getDisplayId();
-        }
-
-        gg.drawString(string, 0,
-            (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
+        gg.drawString( s.getDisplayId(av.getShowJVSuffix()),
+                      0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
     }
 
     /**
@@ -210,8 +202,10 @@ public class IdCanvas extends JPanel
       Font italic = new Font(av.getFont().getName(), Font.ITALIC,
                              av.getFont().getSize());
       gg.setFont(italic);
-      gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-            RenderingHints.VALUE_ANTIALIAS_ON);
+
+      if (av.antiAlias)
+        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                            RenderingHints.VALUE_ANTIALIAS_ON);
 
         Color currentColor = Color.white;
         Color currentTextColor = Color.black;
@@ -246,16 +240,16 @@ public class IdCanvas extends JPanel
                 for (int i = starty; i < av.alignment.getHeight(); i++)
                 {
                     SequenceI s = av.alignment.getSequenceAt(i);
+                    gg.setFont(italic);
                     drawIdString(gg, s, i, 0, ypos);
                 }
 
                 if(labels!=null)
                 {
-                  gg.setFont(av.getFont());
                   gg.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight));
                   labels.drawComponent(gg, getWidth());
                   gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));
-                  gg.setFont(italic);
+
                 }
             }
         }
@@ -292,12 +286,7 @@ public class IdCanvas extends JPanel
 
                 gg.setColor(currentTextColor);
 
-                String string = av.alignment.getSequenceAt(i).getName();
-
-                if (av.getShowFullId())
-                {
-                    string = av.alignment.getSequenceAt(i).getDisplayId();
-                }
+                String string = av.alignment.getSequenceAt(i).getDisplayId( av.getShowJVSuffix());
 
                 gg.drawString(string, 0,
                     (((i - starty) * av.charHeight) + av.charHeight) -