X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=d3b56bea723690c97915ba89278711467ed02302;hb=75c30f2d281938dd7b78bbf5dd28bef31fd19a70;hp=30152ccc711ac7d4a3b96ba2e75d72b6063a74b8;hpb=4e842e62451b0c2001740216fbeb2f68b01f6da8;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 30152cc..d3b56be 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -53,7 +53,7 @@ public class IdCanvas extends JPanel
     {
         setLayout(new BorderLayout());
         this.av = av;
-        PaintRefresher.Register(this, av.alignment);
+        PaintRefresher.Register(this, av.getSequenceSetId());
     }
 
     /**
@@ -331,12 +331,32 @@ public class IdCanvas extends JPanel
 
     void drawMarker(int i, int starty, int yoffset)
     {
-      int hiddenIndex = av.adjustForHiddenSeqs(i);
-      int lastIndex = av.adjustForHiddenSeqs(i - 1);
-      int nextIndex = av.adjustForHiddenSeqs(i + 1);
+
+      SequenceI [] hseqs = av.alignment.getHiddenSequences().hiddenSequences;
+      //Use this method here instead of calling hiddenSeq adjust
+      //3 times.
+      int hSize = hseqs.length;
+
+      int hiddenIndex = i;
+      int lastIndex = i - 1;
+      int nextIndex = i + 1;
+
+      for(int j=0; j<hSize; j++)
+      {
+        if (hseqs[j] != null)
+        {
+          if(j-1<hiddenIndex)
+            hiddenIndex++;
+          if(j-1<lastIndex)
+            lastIndex++;
+          if(j-1<nextIndex)
+            nextIndex++;
+        }
+      }
 
       boolean below = (hiddenIndex > lastIndex + 1);
-      boolean above = (nextIndex>hiddenIndex+1);
+      boolean above = (nextIndex > hiddenIndex+1);
+
 
         gg.setColor(Color.blue);
         if(below)
@@ -375,7 +395,9 @@ public class IdCanvas extends JPanel
       Font bold = new Font(av.getFont().getName(), Font.BOLD,
                            av.getFont().getSize());
 
-      if (av.alignment.getSequenceAt(i).getHiddenSequences() != null)
+
+      if (av.alignment.getSequenceAt(i)!=null
+          && av.alignment.getSequenceAt(i).getHiddenSequences() != null)
         gg.setFont(bold);
       else
         gg.setFont(italic);