From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 2 Jun 2017 15:58:12 +0000 (+0100)
Subject: Merge branch 'features/JAL-2228_featureSetCounts_minRangeTweak' into develop
X-Git-Tag: Release_2_10_2~3^2~43
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ff07c60c2844135e9a74085cca143fc604513a50;hp=016ed9a4ca7f1d961c7e9fa06345ad3e75d989c5;p=jalview.git

Merge branch 'features/JAL-2228_featureSetCounts_minRangeTweak' into develop
---

diff --git a/src/jalview/workers/ColumnCounterSetWorker.java b/src/jalview/workers/ColumnCounterSetWorker.java
index 6c5707d..b6b64fc 100644
--- a/src/jalview/workers/ColumnCounterSetWorker.java
+++ b/src/jalview/workers/ColumnCounterSetWorker.java
@@ -182,19 +182,19 @@ class ColumnCounterSetWorker extends AlignCalcWorker
     for (int anrow = 0; anrow < rows; anrow++)
     {
       Annotation[] anns = new Annotation[width];
+      long rmax = 0;
       /*
-       * add non-zero counts as annotations
+       * add counts as annotations. zeros are needed since select-by-annotation ignores empty annotation positions
        */
       for (int i = 0; i < counts.length; i++)
       {
         int count = counts[i][anrow];
-        if (count > 0)
-        {
-          Color color = ColorUtils.getGraduatedColour(count, 0, minColour,
+
+        Color color = ColorUtils.getGraduatedColour(count, 0, minColour,
                   max[anrow], maxColour);
           String str = String.valueOf(count);
           anns[i] = new Annotation(str, str, '0', count, color);
-        }
+          rmax = Long.max(count, rmax);
       }
 
       /*
@@ -212,7 +212,8 @@ class ColumnCounterSetWorker extends AlignCalcWorker
       ann.scaleColLabel = true;
       ann.graph = AlignmentAnnotation.BAR_GRAPH;
       ann.annotations = anns;
-      setGraphMinMax(ann, anns);
+      ann.graphMin = 0f; // minimum always zero count
+      ann.graphMax = rmax; // maximum count from loop over feature columns
       ann.validateRangeAndDisplay();
       if (!ourAnnots.contains(ann))
       {