Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes

diff --git a/src/jalview/analysis/AAFrequency.java b/src/jalview/analysis/AAFrequency.java
index 0e055e4..ffa413b 100755 (executable)
--- a/src/jalview/analysis/AAFrequency.java
+++ b/src/jalview/analysis/AAFrequency.java
@@ -328,11 +328,12 @@ public class AAFrequency
         return;
       }
 
-      final int gapped = profile.getGapped();
+      final int gapped = profile.getNonGapped();
 
       String description = String.valueOf(gapped);
 
-      consensus.annotations[i] = new Annotation("", description, '0',
+      consensus.annotations[i] = new Annotation(description, description,
+              '\0',
               gapped);
     }
   }

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index da05a09..0cca5b4 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -1911,7 +1911,8 @@ public abstract class AlignmentViewport implements AlignViewportI,
       consensus = new AlignmentAnnotation("Consensus", "PID",
               new Annotation[1], 0f, 100f, AlignmentAnnotation.BAR_GRAPH);
       initConsensus(consensus);
-      gapcounts = new AlignmentAnnotation("Gaps", "Number of Gaps",
+      gapcounts = new AlignmentAnnotation("Occupancy",
+              "Number of aligned positions",
               new Annotation[1], 0f, alignment.getHeight(),
               AlignmentAnnotation.BAR_GRAPH);
       initGapCounts(gapcounts);