X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=e0b36d37a8530646f29a7ebb78d882f6bc8176b3;hb=a2497c9a753e13eeb17d33f73a697b4ad7ebdbc3;hp=417eb8c591c93b6c2c05c142bfc93823ccd1070a;hpb=7d4faec78c1f439321625557e09e574bc6211e8d;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 417eb8c..e0b36d3 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -108,7 +108,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     public int adjustPanelHeight()
     {
         // setHeight of panels
-        image = null;
         AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
         int height = 0;
 
@@ -280,7 +279,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     public void mousePressed(MouseEvent evt)
     {
 
-
         AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
         if(aa==null)
           return;
@@ -350,6 +348,9 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
         min = res;
         max = res;
 
@@ -431,6 +432,9 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
         SequenceGroup sg = av.getSelectionGroup();
 
         if (res < min)
@@ -659,6 +663,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     {
       if(av.updatingConsensus || av.updatingConservation)
       {
+        if(image==null)
+         {
+           return;
+         }
         //We'll keep a record of the old image,
         //and draw a faded image until the calculation
         //has completed
@@ -750,7 +758,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                 }
             }
 
-            if (av.updatingConsensus && aa[i].label.equals("Consensus"))
+            if (av.updatingConsensus && aa[i]==av.consensus)
             {
               y += av.charHeight;
 
@@ -1027,7 +1035,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 
                 default:
                   g.setColor(Color.gray);
-                  if(!av.wrapAlignment || endRes==av.endRes)
                   g.fillRect(lastSSX, y + 6 + iconOffset,
                              (x*av.charWidth) - lastSSX, 2);