X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=dbc1c926f8343cdbee711700eecdf9a9c87109b4;hb=52c2c3879d5dc5e7b4ba7916f1ea964f83551f95;hp=8bed8e2aacf707880781b13d6ef8c5c17a40bbf4;hpb=38fac06c61046ef7eac2c362148e9d1df7d49ec0;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 8bed8e2..dbc1c92 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.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
@@ -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)
             {
@@ -418,8 +418,8 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       if(graphStretch>-1)
       {
         av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight += graphStretchY - evt.getY();
-        if(av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight <10)
-          av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight = 10;
+        if(av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight <0)
+          av.alignment.getAlignmentAnnotation()[graphStretch].graphHeight = 0;
         graphStretchY = evt.getY();
         adjustPanelHeight();
         ap.repaint();
@@ -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;
@@ -952,7 +976,7 @@ public class AnnotationPanel extends JPanel implements MouseListener,
               }
           }
 
-            if (row.graph>0)
+            if (row.graph>0 && row.graphHeight>0)
             {
                 if(row.graph == AlignmentAnnotation.LINE_GRAPH )
                 {