Hidden representatives moved from sequence to viewport

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 12ae05c..4047ac8 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -714,18 +714,19 @@ public class AlignmentPanel extends GAlignmentPanel
     pg.setFont(new Font(av.getFont().getName(),\r
                         Font.ITALIC,\r
                         av.getFont().getSize()));\r
+    SequenceI seq;\r
     for (int i = startSeq; i < endSeq; i++)\r
     {\r
+      seq = av.getAlignment().getSequenceAt(i);\r
       if ( (av.getSelectionGroup() != null) &&\r
-          av.getSelectionGroup().getSequences(false).contains(\r
-              av.getAlignment().getSequenceAt(i)))\r
+          av.getSelectionGroup().getSequences(null).contains(seq))\r
       {\r
         currentColor = Color.gray;\r
         currentTextColor = Color.black;\r
       }\r
       else\r
       {\r
-        currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
+        currentColor = av.getSequenceColour(seq);\r
         currentTextColor = Color.black;\r
       }\r
 \r
@@ -735,10 +736,17 @@ public class AlignmentPanel extends GAlignmentPanel
 \r
       pg.setColor(currentTextColor);\r
 \r
-      String string = av.getAlignment().getSequenceAt(i).getDisplayId\r
-          ( av.getShowJVSuffix());\r
+      int xPos = 0;\r
+      if (av.rightAlignIds)\r
+      {\r
+        fm = pg.getFontMetrics();\r
+        xPos = idWidth - fm.stringWidth(\r
+            seq.getDisplayId(av.getShowJVSuffix())\r
+            ) - 4;\r
+      }\r
 \r
-      pg.drawString(string, 0,\r
+      pg.drawString(seq.getDisplayId( av.getShowJVSuffix()),\r
+                    xPos,\r
                     ( ( (i - startSeq) * av.charHeight) + av.getCharHeight()) -\r
                     (av.getCharHeight() / 5));\r
     }\r
@@ -829,8 +837,13 @@ public class AlignmentPanel extends GAlignmentPanel
       {\r
         SequenceI s = av.alignment.getSequenceAt(i);\r
         String string = s.getDisplayId( av.getShowJVSuffix());\r
-\r
-        pg.drawString(string, 0,\r
+        int xPos = 0;\r
+        if (av.rightAlignIds)\r
+        {\r
+          FontMetrics fm = getFontMetrics(italic);\r
+          xPos = idWidth - fm.stringWidth( string ) - 4;\r
+        }\r
+        pg.drawString(string, xPos,\r
                       ( (i * av.charHeight) + ypos + av.charHeight) -\r
                       (av.charHeight / 5));\r
       }\r