ShowSeqFeatures selected

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

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 9581ccc..c2500c2 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -18,8 +18,6 @@
  */\r
 package jalview.gui;\r
 \r
-import jalview.analysis.*;\r
-\r
 import jalview.datamodel.*;\r
 \r
 import java.awt.*;\r
@@ -95,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
@@ -192,12 +184,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,23 +199,58 @@ 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
+\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
 \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
+          if (av.scaleAboveWrapped)\r
+            hgap += av.charHeight;\r
+\r
+          int cHeight = av.getAlignment().getHeight() * av.charHeight\r
+              + hgap\r
+              + annotationHeight;\r
+\r
             int rowSize = av.getEndRes() - av.getStartRes();\r
 \r
             // Draw the rest of the panels\r
-            for (int ypos = 2 * av.charHeight, row = av.startRes;\r
+            for (int ypos = hgap, row = av.startRes;\r
                     (ypos <= getHeight()) && (row < av.alignment.getWidth());\r
-                    ypos += av.chunkHeight, row += rowSize)\r
+                    ypos += cHeight, row += rowSize)\r
             {\r
                 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.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight));\r
+                  labels.drawComponent(gg, getWidth());\r
+                  gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));\r
+\r
+                }\r
             }\r
         }\r
         else\r
@@ -264,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