Return accurate RGB for transparent residues

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

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index 30560d7..7686e8a 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -21,7 +21,6 @@ package jalview.appletgui;
 \r
 import java.awt.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 \r
 public class IdCanvas\r
@@ -75,11 +74,7 @@ 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
+    String string = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());\r
 \r
     gg.drawString(string, 0,\r
                   ((i - starty) * charHeight) + ypos +\r
@@ -162,6 +157,12 @@ public class IdCanvas
       gg.setFont(av.getFont());\r
     }\r
 \r
+    if(!jalview.bin.JalviewLite.AWT1)\r
+    {\r
+      MyGraphics.AntiAlias(gg);\r
+    }\r
+\r
+\r
     //Fill in the background\r
     gg.setColor(Color.white);\r
     Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
@@ -261,11 +262,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
+        String string = av.alignment.getSequenceAt(i)\r
+            .getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());\r
+\r
         gg.drawString(string, 0,\r
                       ((i - starty) * av.charHeight) +\r
                       av.charHeight - (av.charHeight / 5));\r