Show labels in wrapped view

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

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 2951c14..7d283ba 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -192,12 +192,7 @@ public class IdCanvas extends JPanel
         //Fill in the background\r
         gg.setColor(Color.white);\r
         gg.fillRect(0, 0, getWidth(), imgHeight);\r
-        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
-            RenderingHints.VALUE_ANTIALIAS_ON);\r
 \r
-        Font italic = new Font(av.getFont().getName(), Font.ITALIC,\r
-                av.getFont().getSize());\r
-        gg.setFont(italic);\r
 \r
         drawIds(av.getStartSeq(), av.endSeq);\r
 \r
@@ -212,17 +207,25 @@ public class IdCanvas extends JPanel
      */\r
     void drawIds(int starty, int endy)\r
     {\r
+      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
         Color currentColor = Color.white;\r
         Color currentTextColor = Color.black;\r
 \r
         if (av.getWrapAlignment())\r
         {\r
           int annotationHeight = 0;\r
+          AnnotationLabels labels = null;\r
 \r
           if(av.showAnnotation)\r
           {\r
             AnnotationPanel ap = new AnnotationPanel(av);\r
             annotationHeight = ap.adjustPanelHeight();\r
+            labels = new AnnotationLabels(av);\r
           }\r
 \r
           int hgap = av.charHeight;\r
@@ -245,6 +248,15 @@ public class IdCanvas extends JPanel
                     SequenceI s = av.alignment.getSequenceAt(i);\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
         else\r