X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=dbc1c926f8343cdbee711700eecdf9a9c87109b4;hb=0d742b24efde18a6c179affad234793dc2136ae1;hp=497fc2a2e26cbd1eb552be9b772faad77c6abef4;hpb=ae282720c1bba85d9b52ebc2e85c6a9857b2c6db;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 497fc2a..dbc1c92 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -314,7 +314,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
         }
 
 
-        if (SwingUtilities.isRightMouseButton(evt))
+        if (SwingUtilities.isRightMouseButton(evt) && activeRow!=-1)
         {
             if (av.getColumnSelection() == null)
             {
@@ -667,6 +667,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
             return;
         }
 
+
         AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
 
         int x = 0, y = 0;
@@ -689,6 +690,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                 continue;
             }
 
+
             lastSS = ' ';
             lastSSX = 0;
 
@@ -706,6 +708,28 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                 }
             }
 
+            if (av.updatingConsensus && aa[i].label.equals("Consensus"))
+            {
+              g.setColor(Color.darkGray);
+              g.drawString("Recalculating Consensus....", 20, y - 5);
+              y += av.charHeight;
+              continue;
+            }
+            else if (av.updatingConservation && aa[i].label.equals("Conservation"))
+            {
+              g.setColor(Color.darkGray);
+              g.drawString("Recalculating Conservation.....", 20, y - 5);
+              y += av.charHeight;
+              continue;
+            }
+            else if (av.updatingConservation && aa[i].label.equals("Quality"))
+            {
+              g.setColor(Color.darkGray);
+              g.drawString("Recalculating Quality....", 20, y - 5);
+              continue;
+            }
+
+
             if (row.hasText)
             {
                 iconOffset = av.charHeight / 2 + 4;